From 0200086e6f07878331cabaf7909050523867bf78 Mon Sep 17 00:00:00 2001 From: feodor_fitsner Date: Mon, 10 Sep 2012 13:00:35 -0700 Subject: [PATCH] IIS 8 support in installer --- .../Common/Global.cs | 4 ++-- .../Common/Utils.cs | 2 +- .../ServiceComponentNotFoundException.cs | 2 -- .../Sources/WebsitePanel.Installer/App.config | 1 - .../WebsitePanel.Installer/Updater.exe | Bin 198144 -> 199168 bytes .../Actions/ServerActionManager.cs | 12 +++++----- .../Actions/StandaloneServerActionManager.cs | 2 +- .../WebsitePanel.Setup/Common/Global.cs | 6 ++--- .../WebsitePanel.Setup/Common/Utils.cs | 4 ++-- .../Wizard/ConfigurationCheckPage.cs | 2 +- .../Wizard/ExpressInstallPage.cs | 22 +++++++++--------- .../Wizard/UninstallPage.cs | 2 +- .../WebsitePanel.Setup/Wizard/WebPage.cs | 2 +- 13 files changed, 29 insertions(+), 32 deletions(-) diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Common/Global.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Common/Global.cs index 95d2900a..9aba71c8 100644 --- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Common/Global.cs +++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Common/Global.cs @@ -135,7 +135,7 @@ namespace WebsitePanel.Installer.Common { get { - if (IISVersion.Major == 7) + if (IISVersion.Major >= 7) { return new string[] { "IIS_IUSRS" }; } @@ -167,7 +167,7 @@ namespace WebsitePanel.Installer.Common { get { - if (IISVersion.Major == 7) + if (IISVersion.Major >= 7) { return new string[] { "IIS_IUSRS" }; } diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Common/Utils.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Common/Utils.cs index cd036dd1..17eec103 100644 --- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Common/Utils.cs +++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/Common/Utils.cs @@ -284,7 +284,7 @@ namespace WebsitePanel.Installer.Common return; //ignore win64 check on IIS7 - if (Global.IISVersion.Major == 7) + if (Global.IISVersion.Major >= 7) return; if (!IIS32Enabled()) diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/ServiceComponentNotFoundException.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/ServiceComponentNotFoundException.cs index d0f2ab78..a684d1dc 100644 --- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/ServiceComponentNotFoundException.cs +++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer.Core/ServiceComponentNotFoundException.cs @@ -7,8 +7,6 @@ namespace WebsitePanel.Installer.Core { class ServiceComponentNotFoundException : Exception { - private string p; - public ServiceComponentNotFoundException(string p) : base(p) { diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer/App.config b/WebsitePanel.Installer/Sources/WebsitePanel.Installer/App.config index 6d720948..18e7f2ee 100644 --- a/WebsitePanel.Installer/Sources/WebsitePanel.Installer/App.config +++ b/WebsitePanel.Installer/Sources/WebsitePanel.Installer/App.config @@ -5,7 +5,6 @@ - diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe b/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe index d8a686af6056c46666c7574033ec53133c2533ba..d0cbdc57dca50e743d33260c87162f953f881f08 100644 GIT binary patch delta 30110 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 delta 29104 zcma*Q2Vhgx`~QE=xoMgXO4F6mv`x~LbT82(^*o-nDNMp2b?fyM;x{)m!m!zrQQ4kkoh^dTi<9hTWNHZPRf!0H*}pG1if z+yGi;x{nc8P zY=c6G7D($h0eZ)?!UV#mLMN!S>WUBmTPTn3?v9=BuVEUkyIiWxpH~(u5H|SP8hr1n zfl@mWtEY9>YLt}FXa7#Ab+xOC=6P8#Y_oEwr`EF~90IRK zfY>5IGNB8IV&$W#j$%5c2YG*;k0K(>4KJ;i4I-*Dp&W7^s!p_CI6P6z2K}Ty4;BKw zoev$rUr-ns2)$elpC|~!OrpU_?qnf^)sQ%7gwjnyMJial+=E8sy#T)P&0!7;6CjD_ zD{?;y>gaMapDq=N5Ybzc1=E9!@AywNm4;7awOS+9sdb`ez8pIjY((vzvH>gG%;TBb z^Lh4{F^2N7gI8rG@t3QoBcV`T2=nR*woZ&!tYRi?yfgUR*HqY`Ud=ozI#Z&~g1#bZ zkBSZu?(M0mu!Af9ym+2>rzR8H2+^TKJR8yCjuv;>;ucg93m!KZ_c*?lCt%PBf0bOQ zznj(#i}hD$w1tddD)EB--L>v2UBx&kQ0p$&f%gSWK6kkm{wlQ?G$Naij+<5$Hh4r| zbw67)q{Qh3xnLbXJ`cMLM4Ovzb5m?E{={FS)%?%CgMpq#U^#;f;1ds@ z*6@L*!(4$EcfdYC+QFv?KDazJR$)>_cs4`*7Krn@eD-yt&2@8+n<1+`Q8@iGp7z1maH<Hps7Qkp6)ixTd5m8I(~eJA&rCBo6>iCyPbLqY2gcU- zsYu88G48tFUheAoWB@HDA6uF@aTN0tbcp+Ol99)tgtzoxq+%pqAS4%b^@k zrv8suF+A~`LME&S&@yPBN@*ky;+VmDn=O|E`Sm07ndJ0rWn#8GFtVvITT~VK7=#f~ zRkVSi)Z8mblwD!oVIC6-z*bS{iavfNgBHUiRFa!_!!U&Po&Y23S<&8QHdb_Sg@Ya{r@$q

2(!d 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 7); // if (!String.IsNullOrEmpty(userDomain)) { @@ -377,7 +377,7 @@ namespace WebsitePanel.Setup.Actions var identity = GetWebIdentity(vars); var componentId = vars.ComponentId; var iisVersion = vars.IISVersion; - var iis7 = (iisVersion.Major == 7); + var iis7 = (iisVersion.Major >= 7); var poolExists = false; // @@ -447,7 +447,7 @@ namespace WebsitePanel.Setup.Actions { var appPoolName = String.Format(AppPoolNameFormatString, vars.ComponentFullName); var iisVersion = vars.IISVersion; - var iis7 = (iisVersion.Major == 7); + var iis7 = (iisVersion.Major >= 7); var poolExists = false; // Log.WriteStart(LogStartUninstallMessage); @@ -507,7 +507,7 @@ namespace WebsitePanel.Setup.Actions var domain = vars.WebSiteDomain; var contentPath = vars.InstallationFolder; var iisVersion = vars.IISVersion; - var iis7 = (iisVersion.Major == 7); + var iis7 = (iisVersion.Major >= 7); var userName = CreateWebApplicationPoolAction.GetWebIdentity(vars); var userPassword = vars.UserPassword; var appPool = vars.WebApplicationPoolName; @@ -593,7 +593,7 @@ namespace WebsitePanel.Setup.Actions void IUninstallAction.Run(SetupVariables vars) { var iisVersion = vars.IISVersion; - var iis7 = (iisVersion.Major == 7); + var iis7 = (iisVersion.Major >= 7); var siteId = vars.WebSiteId; // try @@ -963,7 +963,7 @@ namespace WebsitePanel.Setup.Actions void IInstallAction.Run(SetupVariables vars) { - if (vars.IISVersion.Major == 7) + if (vars.IISVersion.Major >= 7) { ChangeAspNetVersionOnIis7(vars); } diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Actions/StandaloneServerActionManager.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Actions/StandaloneServerActionManager.cs index 13cffc2b..f50bcf66 100644 --- a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Actions/StandaloneServerActionManager.cs +++ b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Actions/StandaloneServerActionManager.cs @@ -316,7 +316,7 @@ namespace WebsitePanel.Setup.Actions serviceInfo.Comments = string.Empty; //check IIS version - if (ServerSetup.IISVersion.Major == 7) + if (ServerSetup.IISVersion.Major >= 7) { serviceInfo.ProviderId = 101; } diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Common/Global.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Common/Global.cs index 22556149..52affc1e 100644 --- a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Common/Global.cs +++ b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Common/Global.cs @@ -114,7 +114,7 @@ namespace WebsitePanel.Setup { get { - if (IISVersion.Major == 7) + if (IISVersion.Major >= 7) { return new string[] { "AD:Domain Admins", "SID:" + SystemSID.ADMINISTRATORS, "IIS_IUSRS" }; } @@ -146,7 +146,7 @@ namespace WebsitePanel.Setup { get { - if (IISVersion.Major == 7) + if (IISVersion.Major >= 7) { return new string[] { "IIS_IUSRS" }; } @@ -178,7 +178,7 @@ namespace WebsitePanel.Setup { get { - if (IISVersion.Major == 7) + if (IISVersion.Major >= 7) { return new string[] { "IIS_IUSRS" }; } diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Common/Utils.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Common/Utils.cs index 5d00203b..e4e4cfb8 100644 --- a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Common/Utils.cs +++ b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Common/Utils.cs @@ -561,7 +561,7 @@ namespace WebsitePanel.Setup // By default we fallback to the corresponding tool version based on the platform bitness var util = Environment.Is64BitOperatingSystem ? AspNet40RegistrationToolx64 : AspNet40RegistrationToolx86; // Choose appropriate tool version for IIS 7 - if (setupVariables.IISVersion.Major == 7 && setupVariables.SetupAction == SetupActions.Update) + if (setupVariables.IISVersion.Major >= 7 && setupVariables.SetupAction == SetupActions.Update) { // Evaluate app pool settings on x64 platform only when update is running if (Environment.Is64BitOperatingSystem == true) @@ -747,7 +747,7 @@ namespace WebsitePanel.Setup public static void OpenFirewallPort(string name, string port, Version iisVersion) { - bool iis7 = (iisVersion.Major == 7); + bool iis7 = (iisVersion.Major >= 7); if (iis7) { //TODO: Add IIS7 support diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/ConfigurationCheckPage.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/ConfigurationCheckPage.cs index 6f49d5b7..5b30d56a 100644 --- a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/ConfigurationCheckPage.cs +++ b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/ConfigurationCheckPage.cs @@ -397,7 +397,7 @@ namespace WebsitePanel.Setup private bool SiteBindingsExist(SetupVariables setupVariables) { - bool iis7 = (setupVariables.IISVersion.Major == 7); + bool iis7 = (setupVariables.IISVersion.Major >= 7); string ip = setupVariables.WebSiteIP; string port = setupVariables.WebSitePort; string domain = setupVariables.WebSiteDomain; diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/ExpressInstallPage.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/ExpressInstallPage.cs index 93bd3bae..be97f333 100644 --- a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/ExpressInstallPage.cs +++ b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/ExpressInstallPage.cs @@ -362,7 +362,7 @@ namespace WebsitePanel.Setup XmlDocument doc = new XmlDocument(); doc.Load(webConfigPath); // do Windows 2008 platform-specific changes - bool iis7 = (Wizard.SetupVariables.IISVersion.Major == 7); + bool iis7 = (Wizard.SetupVariables.IISVersion.Major >= 7); // #region Do IIS 7 and IIS 6 specific web.config file changes if (iis7) @@ -776,7 +776,7 @@ namespace WebsitePanel.Setup serviceInfo.Comments = string.Empty; //check IIS version - if (Wizard.SetupVariables.IISVersion.Major == 7) + if (Wizard.SetupVariables.IISVersion.Major >= 7) { serviceInfo.ProviderId = 101; } @@ -1610,7 +1610,7 @@ namespace WebsitePanel.Setup return; Version iisVersion = Wizard.SetupVariables.IISVersion; - bool iis7 = (iisVersion.Major == 7); + bool iis7 = (iisVersion.Major >= 7); Log.WriteStart("Stopping IIS Application Pool"); Log.WriteInfo(string.Format("Stopping \"{0}\"", appPool)); @@ -1645,7 +1645,7 @@ namespace WebsitePanel.Setup return; Version iisVersion = Wizard.SetupVariables.IISVersion; - bool iis7 = (iisVersion.Major == 7); + bool iis7 = (iisVersion.Major >= 7); Log.WriteStart("Starting IIS Application Pool"); Log.WriteInfo(string.Format("Starting \"{0}\"", appPool)); @@ -2256,7 +2256,7 @@ namespace WebsitePanel.Setup string domain = Wizard.SetupVariables.WebSiteDomain; bool update = Wizard.SetupVariables.UpdateWebSite; Version iisVersion = Wizard.SetupVariables.IISVersion; - bool iis7 = (iisVersion.Major == 7); + bool iis7 = (iisVersion.Major >= 7); if (!update) return; @@ -2696,7 +2696,7 @@ namespace WebsitePanel.Setup string identity = userName; string netbiosDomain = userDomain; Version iisVersion = Wizard.SetupVariables.IISVersion; - bool iis7 = (iisVersion.Major == 7); + bool iis7 = (iisVersion.Major >= 7); try { @@ -2860,7 +2860,7 @@ namespace WebsitePanel.Setup Log.WriteStart("Creating web site"); Log.WriteInfo(string.Format("Creating web site \"{0}\" ( IP: {1}, Port: {2}, Domain: {3} )", siteName, ip, port, domain)); Version iisVersion = Wizard.SetupVariables.IISVersion; - bool iis7 = (iisVersion.Major == 7); + bool iis7 = (iisVersion.Major >= 7); //check for existing site string oldSiteId = iis7 ? WebUtils.GetIIS7SiteIdByBinding(ip, port, domain) : WebUtils.GetSiteIdByBinding(ip, port, domain); @@ -3018,7 +3018,7 @@ namespace WebsitePanel.Setup SetProgressText("Creating local account..."); string componentId = Wizard.SetupVariables.ComponentId; Version iisVersion = Wizard.SetupVariables.IISVersion; - bool poolExists = ( iisVersion.Major == 7) ? + bool poolExists = (iisVersion.Major >= 7) ? WebUtils.IIS7ApplicationPoolExists(name) : WebUtils.ApplicationPoolExists(name); @@ -3027,7 +3027,7 @@ namespace WebsitePanel.Setup //update app pool Log.WriteStart("Updating application pool"); Log.WriteInfo(string.Format("Updating application pool \"{0}\"", name)); - if ( iisVersion.Major == 7) + if (iisVersion.Major >= 7) WebUtils.UpdateIIS7ApplicationPool(name, userName, userPassword); else WebUtils.UpdateApplicationPool(name, userName, userPassword); @@ -3047,13 +3047,13 @@ namespace WebsitePanel.Setup // create app pool Log.WriteStart("Creating application pool"); Log.WriteInfo(string.Format("Creating application pool \"{0}\"", name)); - if (iisVersion.Major == 7) + if (iisVersion.Major >= 7) WebUtils.CreateIIS7ApplicationPool(name, userName, userPassword); else WebUtils.CreateApplicationPool(name, userName, userPassword); //register rollback action - if (iisVersion.Major == 7) + if (iisVersion.Major >= 7) RollBack.RegisterIIS7ApplicationPool(name); else RollBack.RegisterApplicationPool(name); diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/UninstallPage.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/UninstallPage.cs index 5df6124e..f9e34dfa 100644 --- a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/UninstallPage.cs +++ b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/UninstallPage.cs @@ -84,7 +84,7 @@ namespace WebsitePanel.Setup string component = Wizard.SetupVariables.ComponentFullName; string componentId = Wizard.SetupVariables.ComponentId; Version iisVersion = Wizard.SetupVariables.IISVersion; - bool iis7 = (iisVersion.Major == 7); + bool iis7 = (iisVersion.Major >= 7); try { diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/WebPage.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/WebPage.cs index 0f78c132..1f9d2579 100644 --- a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/WebPage.cs +++ b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/WebPage.cs @@ -326,7 +326,7 @@ namespace WebsitePanel.Setup return true; } } - bool iis7 = (SetupVariables.IISVersion.Major == 7); + bool iis7 = (SetupVariables.IISVersion.Major >= 7); string siteId = iis7 ? WebUtils.GetIIS7SiteIdByBinding(newIP, newPort, newDomain) : WebUtils.GetSiteIdByBinding(newIP, newPort, newDomain);