# HG changeset patch
# User Tom Gottfried <tom@intevation.de>
# Date 1531821674 -7200
# Node ID 0c08260635616051e1aa284a22642d1bb5eee8af
# Parent  3f7053e53fa6311173294387f05d477573aff806
Separate cluster and database specific commands

This allows to setup more than one database with demo data
on the same cluster by using only the script with database
specific commands.

diff -r 3f7053e53fa6 -r 0c0826063561 schema/Dockerfile
--- a/schema/Dockerfile	Fri Jul 13 14:56:32 2018 +0200
+++ b/schema/Dockerfile	Tue Jul 17 12:01:14 2018 +0200
@@ -33,7 +33,7 @@
     createdb gemma && \
     psql -f gemma.sql -d gemma && \
     psql -f auth.sql -d gemma && \
-    psql -f demo-data/users.sql -d gemma && \
+    psql -f demo-data/roles.sql -f demo-data/users.sql -d gemma && \
     psql -f demo-data/responsibility_areas.sql -d gemma && \
     $PGBIN/pg_ctl stop -m smart
 
diff -r 3f7053e53fa6 -r 0c0826063561 schema/demo-data/README
--- a/schema/demo-data/README	Fri Jul 13 14:56:32 2018 +0200
+++ b/schema/demo-data/README	Tue Jul 17 12:01:14 2018 +0200
@@ -6,7 +6,7 @@
 suitable for any kind of production use.
 
 THIS DATA CONTAINS UNSAFE AND PUBLICLY KNOWN PASSWORDS.  DO NOT
-INSTALL ON REMOTE ACCESSIBLE SYSTEMS! 
+INSTALL ON REMOTE ACCESSIBLE SYSTEMS!
 ------------------------------------------------------------------------
 
 Defined Users:
@@ -22,11 +22,12 @@
 
 Installation:
 
-We assume, you already have a database "gemma" with the Genna schema
+We assume, you already have a database "gemma" with the Gemma schema
 in place.
 
 As postgres super user ("postgres" on most default installations):
 
+  psql -f roles.sql -d gemma
   psql -f users.sql -d gemma
   psql -f responsibility_areas.sql -d gemma
 
diff -r 3f7053e53fa6 -r 0c0826063561 schema/demo-data/roles.sql
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/schema/demo-data/roles.sql	Tue Jul 17 12:01:14 2018 +0200
@@ -0,0 +1,14 @@
+BEGIN;
+
+-- System Administrator
+CREATE ROLE sophie IN ROLE sys_admin LOGIN PASSWORD 'so2Phie4';
+
+-- Water Way Administrators
+CREATE ROLE lucian IN ROLE waterway_admin LOGIN PASSWORD 'lu2Cian4';
+CREATE ROLE penka IN ROLE waterway_admin LOGIN PASSWORD 'pe2Nka3';
+
+-- Water Way Users
+CREATE ROLE oana IN ROLE waterway_user LOGIN PASSWORD 'oa2Na2';
+CREATE ROLE vanja IN ROLE waterway_user LOGIN PASSWORD 'va2Nja3';
+
+COMMIT;
diff -r 3f7053e53fa6 -r 0c0826063561 schema/demo-data/users.sql
--- a/schema/demo-data/users.sql	Fri Jul 13 14:56:32 2018 +0200
+++ b/schema/demo-data/users.sql	Tue Jul 17 12:01:14 2018 +0200
@@ -1,6 +1,7 @@
 BEGIN;
 
--- PREREQUISITES
+-- PREREQUISITES:
+-- Cluster has roles as created by roles.sql
 
 -- Setup Country Codes
 COPY gemma.countries (country_code) FROM stdin;
@@ -12,19 +13,6 @@
 BG
 \.
 
--- USERS
-
--- System Administrator
-CREATE ROLE sophie IN ROLE sys_admin LOGIN PASSWORD 'so2Phie4';
-
--- Water Way Administrators
-CREATE ROLE lucian IN ROLE waterway_admin LOGIN PASSWORD 'lu2Cian4';
-CREATE ROLE penka IN ROLE waterway_admin LOGIN PASSWORD 'pe2Nka3';
-
--- Water Way Users
-CREATE ROLE oana IN ROLE waterway_user LOGIN PASSWORD 'oa2Na2';
-CREATE ROLE vanja IN ROLE waterway_user LOGIN PASSWORD 'va2Nja3';
-
 -- Fill in Profiles
 COPY gemma.user_profiles (username, country, email_adress) FROM stdin;
 sophie	AT	sophie@example.com