Mercurial > gemma
changeset 407:cffd144c99ea
merge
| author | Thomas Junk <thomas.junk@intevation.de> |
|---|---|
| date | Wed, 15 Aug 2018 15:14:47 +0200 |
| parents | 40e7ab3df32c (current diff) c08593afdd02 (diff) |
| children | ac23905e64b1 d428db60fad1 |
| files | |
| diffstat | 3 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/example_conf.toml Wed Aug 15 15:14:23 2018 +0200 +++ b/example_conf.toml Wed Aug 15 15:14:47 2018 +0200 @@ -1,5 +1,5 @@ dbhost = "gemma_db" -service-user = "paul" +service-user = "gemma_service" service-password = "pw2Reset4" host = "0.0.0.0" sessions = "/tmp/gemma_session.data"
--- a/schema/Dockerfile Wed Aug 15 15:14:23 2018 +0200 +++ b/schema/Dockerfile Wed Aug 15 15:14:47 2018 +0200 @@ -31,7 +31,7 @@ COPY *.sql *.sh ./ COPY demo-data ./demo-data/ RUN $PGBIN/pg_ctl start -wo "--config_file=$PGCONF" && \ - ./install-db.sh --demo && \ + ./install-db.sh --demo --servicepw "pw2Reset4" && \ $PGBIN/pg_ctl stop -m smart # Set the default command to run when starting the container
--- a/schema/demo-data/roles.sql Wed Aug 15 15:14:23 2018 +0200 +++ b/schema/demo-data/roles.sql Wed Aug 15 15:14:47 2018 +0200 @@ -1,6 +1,7 @@ -- System Administrator -CREATE ROLE sophie IN ROLE sys_admin LOGIN PASSWORD 'so2Phie3'; +CREATE ROLE sophie IN ROLE sys_admin LOGIN PASSWORD 'so2Phie4'; CREATE ROLE "Dipl.-Inform. Stefan-Albert Zimmermann" IN ROLE sys_admin LOGIN PASSWORD 'zi2Mmer3'; +CREATE ROLE "Dipl.-Inform.Stefan-AlbertZimmermann" IN ROLE sys_admin LOGIN PASSWORD 'zi2Mmer3'; -- Water Way Administrators CREATE ROLE lucian IN ROLE waterway_admin LOGIN PASSWORD 'lu2Cian3'; @@ -12,6 +13,7 @@ -- Water Way Users CREATE ROLE oana IN ROLE waterway_user LOGIN PASSWORD 'oa2Na2'; CREATE ROLE "Johanna Pichler" IN ROLE waterway_user LOGIN PASSWORD 'jo2Han3'; +CREATE ROLE "JohannaPichler" IN ROLE waterway_user LOGIN PASSWORD 'jo2Han3'; CREATE ROLE "Katharina Gruber" IN ROLE waterway_user LOGIN PASSWORD 'ka2Tha3'; CREATE ROLE "Maximilian Wimmer" IN ROLE waterway_user LOGIN PASSWORD 'ma2Xim3'; CREATE ROLE "Ivo Marković" IN ROLE waterway_user LOGIN PASSWORD 'iv2Oma3'; @@ -22,6 +24,7 @@ CREATE ROLE "Gabriela Gheorghe" IN ROLE waterway_user LOGIN PASSWORD 'ga2Bri3'; CREATE ROLE "Marina Stoica" IN ROLE waterway_user LOGIN PASSWORD 'ma2Rin3'; CREATE ROLE "Борис Даманиов" IN ROLE waterway_user LOGIN PASSWORD 'bo2Ris3'; +CREATE ROLE "БорисДаманиов" IN ROLE waterway_user LOGIN PASSWORD 'bo2Ris3'; CREATE ROLE "Фидан Дубарова" IN ROLE waterway_user LOGIN PASSWORD 'fi2Dan3'; CREATE ROLE "Дипл. Инж. Константин Ясенов" IN ROLE waterway_user LOGIN PASSWORD 'ko2Nst3'; CREATE ROLE "Люба Ходкивич" IN ROLE waterway_user LOGIN PASSWORD 'Lj2Uba3';