zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Installer: old to new update #5 - old to new update, wix sql fixes.

Browse source
This commit is contained in:
McMak 2015-05-21 10:48:54 +03:00
parent 68397679db
commit faee7a4315
5 changed files with 31 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

14
WebsitePanel.Installer/Sources/WebsitePanel.Setup/Actions/EntServerActionManager.cs
View file

@ -63,9 +63,6 @@ namespace WebsitePanel.Setup.Actions
void IInstallAction.Run(SetupVariables vars)
{
if (vars.ComponentExists)
return;
try
{
OnInstallProgressChanged(LogStartInstallMessage, 0);
@ -235,10 +232,7 @@ namespace WebsitePanel.Setup.Actions
{
void IInstallAction.Run(SetupVariables vars)
{
if (vars.ComponentExists)
return;
try
try
{
//
Log.WriteStart(String.Format("Creating database user {0}", vars.Database));
@ -336,9 +330,6 @@ namespace WebsitePanel.Setup.Actions
void IInstallAction.Run(SetupVariables vars)
{
if (vars.ComponentExists)
return;
try
{
Log.WriteStart("Updating serveradmin password");
@ -398,9 +389,6 @@ namespace WebsitePanel.Setup.Actions
{
void IInstallAction.Run(SetupVariables vars)
{
if (vars.ComponentExists)
return;
Log.WriteStart("Updating web.config file (connection string)");
var file = Path.Combine(vars.InstallationFolder, vars.ConfigurationFile);
vars.ConnectionString = String.Format(vars.ConnectionString, vars.DatabaseServer, vars.Database, vars.Database, vars.DatabaseUserPassword);

12
WebsitePanel.Installer/Sources/WebsitePanel.Setup/Actions/ServerActionManager.cs
View file

@ -151,8 +151,6 @@ namespace WebsitePanel.Setup.Actions
void IInstallAction.Run(SetupVariables vars)
{
if (vars.ComponentExists)
return;
// Exit with an error if Windows account with the same name already exists
if (SecurityUtils.UserExists(vars.UserDomain, vars.UserAccount))
throw new Exception(UserAccountExists);
@ -503,10 +501,7 @@ namespace WebsitePanel.Setup.Actions
void IInstallAction.Run(SetupVariables vars)
{
if (vars.ComponentExists)
return;
var siteName = vars.ComponentFullName;
var siteName = vars.ComponentFullName;
var ip = vars.WebSiteIP;
var port = vars.WebSitePort;
var domain = vars.WebSiteDomain;
@ -779,10 +774,7 @@ namespace WebsitePanel.Setup.Actions
void IInstallAction.Run(SetupVariables vars)
{
if (vars.ComponentExists)
return;
try
try
{
Begin(LogStartInstallMessage);
//