From 266fc579f2e822cf2531d455c350853eeaf84488 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Thu, 19 Jul 2018 16:01:54 -0400
Subject: [PATCH] cleanup installer. break apart update script

---
 util/Setup/AppSettingsBuilder.cs              | 23 -------------------
 .../2018-06-11_00_WebVaultUpdates.sql         | 10 --------
 .../2018-07-19_00_UserPremiumIndex.sql        |  9 ++++++++
 util/Setup/Program.cs                         | 10 ++------
 util/Setup/Setup.csproj                       |  2 ++
 5 files changed, 13 insertions(+), 41 deletions(-)
 delete mode 100644 util/Setup/AppSettingsBuilder.cs
 create mode 100644 util/Setup/DbScripts/2018-07-19_00_UserPremiumIndex.sql

diff --git a/util/Setup/AppSettingsBuilder.cs b/util/Setup/AppSettingsBuilder.cs
deleted file mode 100644
index aff150291a..0000000000
--- a/util/Setup/AppSettingsBuilder.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using System.IO;
-
-namespace Bit.Setup
-{
-    public class AppSettingsBuilder
-    {
-        public void Build()
-        {
-            Console.WriteLine("Building app settings.");
-            Directory.CreateDirectory("/bitwarden/web/");
-            using(var sw = File.CreateText("/bitwarden/web/settings.js"))
-            {
-                sw.Write($@"var bitwardenAppSettings = {{
-    iconsUri: ""/icons"",
-    stripeKey: null,
-    braintreeKey: null,
-    selfHosted: true
-}};");
-            }
-        }
-    }
-}
diff --git a/util/Setup/DbScripts/2018-06-11_00_WebVaultUpdates.sql b/util/Setup/DbScripts/2018-06-11_00_WebVaultUpdates.sql
index 15fcbbbe6f..c027eb81f0 100644
--- a/util/Setup/DbScripts/2018-06-11_00_WebVaultUpdates.sql
+++ b/util/Setup/DbScripts/2018-06-11_00_WebVaultUpdates.sql
@@ -7,16 +7,6 @@ BEGIN
 END
 GO
 
-IF NOT EXISTS (
-    SELECT * FROM sys.indexes  WHERE [Name]='IX_User_Premium_PremiumExpirationDate_RenewalReminderDate'
-    AND object_id = OBJECT_ID('[dbo].[User]')
-)
-BEGIN
-    CREATE NONCLUSTERED INDEX [IX_User_Premium_PremiumExpirationDate_RenewalReminderDate]
-        ON [dbo].[User]([Premium] ASC, [PremiumExpirationDate] ASC, [RenewalReminderDate] ASC)
-END
-GO
-
 IF OBJECT_ID('[dbo].[User_Create]') IS NOT NULL
 BEGIN
     DROP PROCEDURE [dbo].[User_Create]
diff --git a/util/Setup/DbScripts/2018-07-19_00_UserPremiumIndex.sql b/util/Setup/DbScripts/2018-07-19_00_UserPremiumIndex.sql
new file mode 100644
index 0000000000..c4a18f1cf6
--- /dev/null
+++ b/util/Setup/DbScripts/2018-07-19_00_UserPremiumIndex.sql
@@ -0,0 +1,9 @@
+IF NOT EXISTS (
+    SELECT * FROM sys.indexes  WHERE [Name]='IX_User_Premium_PremiumExpirationDate_RenewalReminderDate'
+    AND object_id = OBJECT_ID('[dbo].[User]')
+)
+BEGIN
+    CREATE NONCLUSTERED INDEX [IX_User_Premium_PremiumExpirationDate_RenewalReminderDate]
+        ON [dbo].[User]([Premium] ASC, [PremiumExpirationDate] ASC, [RenewalReminderDate] ASC)
+END
+GO
diff --git a/util/Setup/Program.cs b/util/Setup/Program.cs
index a744e8a3b1..747b1a68a2 100644
--- a/util/Setup/Program.cs
+++ b/util/Setup/Program.cs
@@ -189,9 +189,6 @@ namespace Bit.Setup
             };
             environmentFileBuilder.BuildForInstaller();
 
-            var appSettingsBuilder = new AppSettingsBuilder();
-            appSettingsBuilder.Build();
-
             var appIdBuilder = new AppIdBuilder(url);
             appIdBuilder.Build();
 
@@ -255,7 +252,7 @@ namespace Bit.Setup
                     .JournalToSqlTable("dbo", "Migration")
                     .WithScriptsAndCodeEmbeddedInAssembly(Assembly.GetExecutingAssembly(),
                         s => s.Contains($".DbScripts.") && !s.Contains(".Archive."))
-                    .WithTransaction()
+                    .WithTransactionPerScript()
                     .WithExecutionTimeout(new TimeSpan(0, 5, 0))
                     .LogToConsole()
                     .Build();
@@ -272,7 +269,7 @@ namespace Bit.Setup
             }
             catch(SqlException e)
             {
-                if(e.Message.Contains("Server is in script upgrade mode") && attempt < 3)
+                if(e.Message.Contains("Server is in script upgrade mode") && attempt < 10)
                 {
                     var nextAttempt = attempt + 1;
                     Console.WriteLine("Database is in script upgrade mode. " +
@@ -351,9 +348,6 @@ namespace Bit.Setup
             var nginxBuilder = new NginxConfigBuilder(domain, url);
             nginxBuilder.BuildForUpdater();
 
-            var appSettingsBuilder = new AppSettingsBuilder();
-            appSettingsBuilder.Build();
-
             var appIdBuilder = new AppIdBuilder(url);
             appIdBuilder.Build();
 
diff --git a/util/Setup/Setup.csproj b/util/Setup/Setup.csproj
index e7fc950459..541e5cbbaf 100644
--- a/util/Setup/Setup.csproj
+++ b/util/Setup/Setup.csproj
@@ -11,9 +11,11 @@
     <None Remove="DbScripts\2018-04-02_00_Org2fa.sql" />
     <None Remove="DbScripts\2018-04-24_00_CipherQueryTuning.sql" />
     <None Remove="DbScripts\2018-06-11_00_WebVaultUpdates.sql" />
+    <None Remove="DbScripts\2018-07-19_00_UserPremiumIndex.sql" />
   </ItemGroup>
 
   <ItemGroup>
+    <EmbeddedResource Include="DbScripts\2018-07-19_00_UserPremiumIndex.sql" />
     <EmbeddedResource Include="DbScripts\2018-06-11_00_WebVaultUpdates.sql" />
     <EmbeddedResource Include="DbScripts\2018-04-24_00_CipherQueryTuning.sql" />
     <EmbeddedResource Include="DbScripts\2018-04-02_00_Org2fa.sql" />