Fixed

1.	Remove the text on the Create a website tab that says “ignore” really can just delete whole line
2.	Database records for SSL need to be deleted from database when switching from Static to Dynamic (If you make a cert request, switch and switch again it shows the prior request. It should be defaulted again)
3.	Instant alias should ignore global dns rules

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/DnsServers/DnsServerController.cs

@@ -47,10 +47,10 @@ namespace WebsitePanel.EnterpriseServer
 
         public static int AddZone(int packageId, int serviceId, string zoneName)
         {
-            return AddZone(packageId, serviceId, zoneName, true);
+            return AddZone(packageId, serviceId, zoneName, true, false);
         }
 
-        public static int AddZone(int packageId, int serviceId, string zoneName, bool addPackageItem)
+        public static int AddZone(int packageId, int serviceId, string zoneName, bool addPackageItem, bool ignoreGlobalDNSRecords)
         {
             // get DNS provider
             DNSServer dns = GetDNSServer(serviceId);
@@ -148,13 +148,17 @@ namespace WebsitePanel.EnterpriseServer
                     zoneRecords.Add(ns);
                 }
 
-                // add all other records
+                if (!ignoreGlobalDNSRecords)
-                zoneRecords.AddRange(BuildDnsResourceRecords(records, "", zoneName, ""));
+                {
+                    // add all other records
+                    zoneRecords.AddRange(BuildDnsResourceRecords(records, "", zoneName, ""));
+                }
 
                 // add zone records
                 dns.AddZoneRecords(zoneName, zoneRecords.ToArray());
 
 
+
                 // add secondary zones
                 foreach (int secondaryId in secondaryServiceIds)
                 {
@@ -443,7 +447,7 @@ namespace WebsitePanel.EnterpriseServer
             if (!dns.ZoneExists(itemName))
             {
                 // create primary and secondary zones
-                AddZone(packageId, serviceId, itemName, false);
+                AddZone(packageId, serviceId, itemName, false, false);
 
                 // restore records
                 XmlSerializer serializer = new XmlSerializer(typeof(DnsRecord));

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Servers/ServerController.cs

@@ -1852,7 +1852,7 @@ namespace WebsitePanel.EnterpriseServer
                     int serviceId = PackageController.GetPackageServiceId(packageId, ResourceGroups.Dns);
                     if (serviceId > 0)
                     {
-                        zoneItemId = DnsServerController.AddZone(packageId, serviceId, domainName);
+                        zoneItemId = DnsServerController.AddZone(packageId, serviceId, domainName, true, isInstantAlias);
                     }
 
                     if (zoneItemId < 0)

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebServers/WebServerController.cs

@@ -642,7 +642,15 @@ namespace WebsitePanel.EnterpriseServer
                 DomainInfo ZoneInfo = ServerController.GetDomain(domain.ZoneName);
 
                 if (ZoneInfo == null)
-                    throw new Exception("failed to retrieve parent zone");
+                    throw new Exception("Parent zone not found");
+
+                //cleanup certificates
+                List<SSLCertificate> certificates = GetCertificatesForSite(siteItemId);
+                foreach (SSLCertificate c in certificates)
+                {
+                    DeleteCertificate(siteItemId, c);
+                }
+
                 
                 List<DomainInfo> pointers = GetWebSitePointers(siteItemId);
                 foreach (DomainInfo pointer in pointers)

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config

@@ -5,11 +5,11 @@
   </configSections>
   <!-- Connection strings -->
   <connectionStrings>
-    <add name="EnterpriseServer" connectionString="server=(local)\SQLEXPRESS;database=WebsitePanel_dev;uid=sa;pwd=Password12" providerName="System.Data.SqlClient" />
+    <add name="EnterpriseServer" connectionString="server=HSTPROV01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=aj7ep6fyhmw3b5qeth7c;" />
   </connectionStrings>
   <appSettings>
     <!-- Encryption util settings -->
-    <add key="WebsitePanel.CryptoKey" value="1234567890" />
+    <add key="WebsitePanel.CryptoKey" value="3x7eqt7zabc5n5afs6dg" />
     <!-- A1D4KDHUE83NKHddF -->
     <add key="WebsitePanel.EncryptionEnabled" value="true" />
     <!-- Web Applications -->

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/App_LocalResources/WebSitesAddSite.ascx.resx

@@ -142,7 +142,7 @@
     <value>If you need your web site to be accessible via dedicated IP address or you are planning to enable SSL for your site you should choose "Dedicated IP" option; otherwise leave this settings by default. In order to create IP-based site you need to purchase IP address from your host.</value>
   </data>
   <data name="lblIPHelp2.Text" xml:space="preserve">
-    <value>Note: A Zone Template is often defined by your host and contains additional Web Site Pointers to create when creating a new Web Site. Static record definitions  such as 'www' conflicts when creating an additional Web Site in the same Domain. &lt;/p&gt;Do not check  the option to include the Zone Template and create the new Web Site with this Web Site Pointer only. </value>
+    <value> </value>
   </data>
   <data name="rbDedicatedIP.Text" xml:space="preserve">
     <value>Dedicated</value>