vagrant: Merge db init .sql scripts in to reset-db.sql

This makes reprovisioning idempotent.
gratipay · Nov 17, 2014 · 2055853 · 2055853
1 parent 81d650f
commit 2055853
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/scripts/create_db.sql b/scripts/create_db.sql
diff --git a/scripts/create_test_db.sql b/scripts/create_test_db.sql
diff --git a/scripts/reset-db.sql b/scripts/reset-db.sql
@@ -0,0 +1,7 @@
+DROP DATABASE IF EXISTS "gratipay-test";
+DROP DATABASE IF EXISTS gratipay;
+DROP ROLE IF EXISTS gratipay;
+
+CREATE ROLE gratipay LOGIN PASSWORD 'gratipay' SUPERUSER;
+CREATE DATABASE gratipay WITH OWNER = gratipay;
+CREATE DATABASE "gratipay-test" WITH OWNER = gratipay;
diff --git a/scripts/vagrant-setup.sh b/scripts/vagrant-setup.sh
@@ -7,8 +7,7 @@ sudo sh -c "echo 'cd /vagrant' > /etc/profile.d/login-directory.sh"
 
 # Configure Postgres (using system user 'postgres' run command
 # 'psql' with PostreSQL user 'postgres` to quietly execute scripts)
-sudo -u postgres psql -U postgres -qf /vagrant/scripts/create_db.sql
-sudo -u postgres psql -U postgres -qf /vagrant/scripts/create_test_db.sql
+sudo -u postgres psql -U postgres -qf /vagrant/scripts/reset-db.sql
 
 # Set up the environment, the database, and run Gratipay
 cd /vagrant && make clean env schema data