Merge branch '20.04-dev' into 20.04

laravel · Oct 23, 2020 · 3374c3a · 3374c3a
2 parents 4c0037e + bbd9539
commit 3374c3a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/scripts/features/timescaledb.sh b/scripts/features/timescaledb.sh
@@ -24,12 +24,12 @@ sudo apt-get update
 
 # Now install appropriate package for PG version
 if [ -f ~/.homestead-features/wsl_user_name ]; then
-    sudo apt-get -y install timescaledb-oss-postgresql-12
+    sudo apt-get -y install timescaledb-postgresql-12
 else
-    sudo apt-get -y install timescaledb-oss-postgresql-9.6
-    sudo apt-get -y install timescaledb-oss-postgresql-10
-    sudo apt-get -y install timescaledb-oss-postgresql-11
-    sudo apt-get -y install timescaledb-oss-postgresql-12
+    sudo apt-get -y install timescaledb-postgresql-9.6
+    sudo apt-get -y install timescaledb-postgresql-10
+    sudo apt-get -y install timescaledb-postgresql-11
+    sudo apt-get -y install timescaledb-postgresql-12
 fi
 
 sudo timescaledb-tune --quiet --yes

diff --git a/scripts/homestead.rb b/scripts/homestead.rb
@@ -534,16 +534,20 @@ def self.configure(config, settings)
       end
 
       settings['databases'].each do |db|
-        config.vm.provision 'shell' do |s|
-          s.name = 'Creating MySQL Database: ' + db
-          s.path = script_dir + '/create-mysql.sh'
-          s.args = [db]
+        if enabled_databases.include? 'mysql'
+          config.vm.provision 'shell' do |s|
+            s.name = 'Creating MySQL Database: ' + db
+            s.path = script_dir + '/create-mysql.sh'
+            s.args = [db]
+          end
         end
 
-        config.vm.provision 'shell' do |s|
-          s.name = 'Creating Postgres Database: ' + db
-          s.path = script_dir + '/create-postgres.sh'
-          s.args = [db]
+        if enabled_databases.include? 'postgresql'
+          config.vm.provision 'shell' do |s|
+            s.name = 'Creating Postgres Database: ' + db
+            s.path = script_dir + '/create-postgres.sh'
+            s.args = [db]
+          end
         end
 
         if enabled_databases.include? 'mongodb'