From 289fa1655641b392b8218cac2e871ec59fb503e7 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Tue, 11 Sep 2018 21:00:01 +0200
Subject: [PATCH] revoke from postgres removed (user postgres doesn't have to
exist)
---
.gitlab-ci.yml | 24 +++++++++----------
.../main/resources/db/migration/V1__base.sql | 10 ++++----
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3f993faecb..853cadee6a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ test_frontend:
test_backend:
image: maven:latest
services:
- - postgres:latest
+ - postgres:9.6
stage: test
script:
- apt-get update
@@ -30,20 +30,20 @@ test_backend:
- export DISPLAY=:99
#connection to the db
- mkdir /etc/minerva/
-# - echo "database.uri=jdbc:postgresql://$POSTGRES_PORT_5432_TCP_ADDR:5432/map_viewer" >>/etc/minerva/test-db.properties
-# - echo "database.username=map_viewer" >>/etc/minerva/test-db.properties
-# - echo "database.password=123qweasdzxc">>/etc/minerva/test-db.properties
-
- - apt-get install -y postgresql sudo
- - service postgresql start
- - sudo -u postgres createuser -s map_viewer
- - sudo -u postgres createdb map_viewer -O map_viewer
- - sudo -u postgres psql -c "ALTER USER map_viewer WITH PASSWORD '123qweasdzxc';"
- - echo "database.uri=jdbc:postgresql://127.0.0.1:5432/map_viewer" >>/etc/minerva/test-db.properties
+ - echo "database.uri=jdbc:postgresql://$POSTGRES_PORT_5432_TCP_ADDR:5432/map_viewer" >>/etc/minerva/test-db.properties
- echo "database.username=map_viewer" >>/etc/minerva/test-db.properties
- echo "database.password=123qweasdzxc">>/etc/minerva/test-db.properties
+
+# - apt-get install -y postgresql sudo
+# - service postgresql start
+# - sudo -u postgres createuser -s map_viewer
+# - sudo -u postgres createdb map_viewer -O map_viewer
+# - sudo -u postgres psql -c "ALTER USER map_viewer WITH PASSWORD '123qweasdzxc';"
+# - echo "database.uri=jdbc:postgresql://127.0.0.1:5432/map_viewer" >>/etc/minerva/test-db.properties
+# - echo "database.username=map_viewer" >>/etc/minerva/test-db.properties
+# - echo "database.password=123qweasdzxc">>/etc/minerva/test-db.properties
#exclude frontend (we need node for that)
- - mvn test -pl annotation,CellDesigner-plugin,commons,converter,converter-graphics,converter-CellDesigner,converter-SBGNML,converter-sbml,model,model-command,pathvisio,persist,reactome,rest-api,web
+ - mvn test -pl annotation,CellDesigner-plugin,commons,converter,converter-graphics,converter-CellDesigner,converter-SBGNML,converter-sbml,model,model-command,pathvisio,persist,reactome,rest-api,service,web
build_war:
diff --git a/persist/src/main/resources/db/migration/V1__base.sql b/persist/src/main/resources/db/migration/V1__base.sql
index 9644b601c5..5d01f754d8 100644
--- a/persist/src/main/resources/db/migration/V1__base.sql
+++ b/persist/src/main/resources/db/migration/V1__base.sql
@@ -3059,11 +3059,11 @@ ALTER TABLE ONLY feedback
-- Dependencies: 7
-- Name: public; Type: ACL; Schema: -; Owner: postgres
--
-
-REVOKE ALL ON SCHEMA public FROM PUBLIC;
-REVOKE ALL ON SCHEMA public FROM postgres;
-GRANT ALL ON SCHEMA public TO postgres;
-GRANT ALL ON SCHEMA public TO PUBLIC;
+--
+--REVOKE ALL ON SCHEMA public FROM PUBLIC;
+--REVOKE ALL ON SCHEMA public FROM postgres;
+--GRANT ALL ON SCHEMA public TO postgres;
+--GRANT ALL ON SCHEMA public TO PUBLIC;
-- Completed on 2017-09-21 13:13:48
--
GitLab