From 5f6e4a3714d2a458960cbe158a6787c9bb06946b Mon Sep 17 00:00:00 2001
From: Igor Witz <igor.witz@etu.utc.fr>
Date: Tue, 14 May 2019 11:02:49 +0200
Subject: [PATCH] Update pica-etherpad/secrets/etherpad-db.secrets.example,
 .gitlab-ci.yml,
 pica-etherpad/secrets/encrypted-variables-test/etherpad-app/ETHERPAD_ADMIN_PASSWORD,
 pica-etherpad/secrets/encrypted-variables-test/etherpad-app/ETHERPAD_DB_NAME,
 pica-etherpad/secrets/encrypted-variables-test/etherpad-app/ETHERPAD_DB_USER,
 pica-etherpad/secrets/encrypted-variables-test/etherpad-app/ETHERPAD_DB_PASSWORD,
 pica-etherpad/secrets/encrypted-variables-test/etherpad-app/MYSQL_PORT_3306_TCP_ADDR,
 pica-etherpad/secrets/encrypted-variables-test/etherpad-db/MYSQL_ROOT_PASSWORD,
 pica-etherpad/secrets/encrypted-variables-test/etherpad-db/MYSQL_USER,
 pica-etherpad/secrets/encrypted-variables-test/etherpad-db/MYSQL_PASSWORD,
 pica-etherpad/secrets/encrypted-variables-test/etherpad-db/MYSQL_DATABASE
 files Deleted pica-etherpad/secrets/etherpad-app.secrets.production,
 pica-etherpad/secrets/etherpad-app.secrets.test,
 pica-etherpad/secrets/etherpad-db.secrets.production,
 pica-etherpad/secrets/etherpad-db.secrets.test files

---
 .gitlab-ci.yml                                               | 3 ++-
 .../etherpad-app/ETHERPAD_ADMIN_PASSWORD                     | 0
 .../encrypted-variables-test/etherpad-app/ETHERPAD_DB_NAME   | 0
 .../etherpad-app/ETHERPAD_DB_PASSWORD                        | 0
 .../encrypted-variables-test/etherpad-app/ETHERPAD_DB_USER   | 0
 .../etherpad-app/MYSQL_PORT_3306_TCP_ADDR                    | 0
 .../encrypted-variables-test/etherpad-db/MYSQL_DATABASE      | 0
 .../encrypted-variables-test/etherpad-db/MYSQL_PASSWORD      | 0
 .../encrypted-variables-test/etherpad-db/MYSQL_ROOT_PASSWORD | 0
 .../secrets/encrypted-variables-test/etherpad-db/MYSQL_USER  | 0
 pica-etherpad/secrets/etherpad-app.secrets.production        | 5 -----
 pica-etherpad/secrets/etherpad-app.secrets.test              | 5 -----
 ...pad-db.secrets.production => etherpad-db.secrets.example} | 0
 pica-etherpad/secrets/etherpad-db.secrets.test               | 4 ----
 14 files changed, 2 insertions(+), 15 deletions(-)
 create mode 100644 pica-etherpad/secrets/encrypted-variables-test/etherpad-app/ETHERPAD_ADMIN_PASSWORD
 create mode 100644 pica-etherpad/secrets/encrypted-variables-test/etherpad-app/ETHERPAD_DB_NAME
 create mode 100644 pica-etherpad/secrets/encrypted-variables-test/etherpad-app/ETHERPAD_DB_PASSWORD
 create mode 100644 pica-etherpad/secrets/encrypted-variables-test/etherpad-app/ETHERPAD_DB_USER
 create mode 100644 pica-etherpad/secrets/encrypted-variables-test/etherpad-app/MYSQL_PORT_3306_TCP_ADDR
 create mode 100644 pica-etherpad/secrets/encrypted-variables-test/etherpad-db/MYSQL_DATABASE
 create mode 100644 pica-etherpad/secrets/encrypted-variables-test/etherpad-db/MYSQL_PASSWORD
 create mode 100644 pica-etherpad/secrets/encrypted-variables-test/etherpad-db/MYSQL_ROOT_PASSWORD
 create mode 100644 pica-etherpad/secrets/encrypted-variables-test/etherpad-db/MYSQL_USER
 delete mode 100644 pica-etherpad/secrets/etherpad-app.secrets.production
 delete mode 100644 pica-etherpad/secrets/etherpad-app.secrets.test
 rename pica-etherpad/secrets/{etherpad-db.secrets.production => etherpad-db.secrets.example} (100%)
 delete mode 100644 pica-etherpad/secrets/etherpad-db.secrets.test

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ba0b52f9..38e8b6bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,6 +27,7 @@ metabuild:
         refs:
             - master
             - dev-ci
+    when: manual
         
 # build the container that was modified
 build:
@@ -92,7 +93,7 @@ docker-bench-security:
         # remove links to external networks to be able to start the container locally 
         - sed -i -e '/networks/,+3d' $MODIFIED_IMAGE/docker-compose.yml
         # if secrets.example files exist, remove the .example extension to be able to start the container
-        - if [[ -d $MODIFIED_IMAGE/secrets ]]; then for i in $MODIFIED_IMAGE/secrets/*.test ; do cp $i $(echo $i| cut -d '.' -f1,2); done; fi;
+        - if [[ -d $MODIFIED_IMAGE/secrets ]]; then for i in $MODIFIED_IMAGE/secrets/*.example ; do cp $i $(echo $i| cut -d '.' -f1,2); done; fi;
         - docker volume create $CONTAINER_NAME
     script:        
         - cd $MODIFIED_IMAGE
diff --git a/pica-etherpad/secrets/encrypted-variables-test/etherpad-app/ETHERPAD_ADMIN_PASSWORD b/pica-etherpad/secrets/encrypted-variables-test/etherpad-app/ETHERPAD_ADMIN_PASSWORD
new file mode 100644
index 00000000..e69de29b
diff --git a/pica-etherpad/secrets/encrypted-variables-test/etherpad-app/ETHERPAD_DB_NAME b/pica-etherpad/secrets/encrypted-variables-test/etherpad-app/ETHERPAD_DB_NAME
new file mode 100644
index 00000000..e69de29b
diff --git a/pica-etherpad/secrets/encrypted-variables-test/etherpad-app/ETHERPAD_DB_PASSWORD b/pica-etherpad/secrets/encrypted-variables-test/etherpad-app/ETHERPAD_DB_PASSWORD
new file mode 100644
index 00000000..e69de29b
diff --git a/pica-etherpad/secrets/encrypted-variables-test/etherpad-app/ETHERPAD_DB_USER b/pica-etherpad/secrets/encrypted-variables-test/etherpad-app/ETHERPAD_DB_USER
new file mode 100644
index 00000000..e69de29b
diff --git a/pica-etherpad/secrets/encrypted-variables-test/etherpad-app/MYSQL_PORT_3306_TCP_ADDR b/pica-etherpad/secrets/encrypted-variables-test/etherpad-app/MYSQL_PORT_3306_TCP_ADDR
new file mode 100644
index 00000000..e69de29b
diff --git a/pica-etherpad/secrets/encrypted-variables-test/etherpad-db/MYSQL_DATABASE b/pica-etherpad/secrets/encrypted-variables-test/etherpad-db/MYSQL_DATABASE
new file mode 100644
index 00000000..e69de29b
diff --git a/pica-etherpad/secrets/encrypted-variables-test/etherpad-db/MYSQL_PASSWORD b/pica-etherpad/secrets/encrypted-variables-test/etherpad-db/MYSQL_PASSWORD
new file mode 100644
index 00000000..e69de29b
diff --git a/pica-etherpad/secrets/encrypted-variables-test/etherpad-db/MYSQL_ROOT_PASSWORD b/pica-etherpad/secrets/encrypted-variables-test/etherpad-db/MYSQL_ROOT_PASSWORD
new file mode 100644
index 00000000..e69de29b
diff --git a/pica-etherpad/secrets/encrypted-variables-test/etherpad-db/MYSQL_USER b/pica-etherpad/secrets/encrypted-variables-test/etherpad-db/MYSQL_USER
new file mode 100644
index 00000000..e69de29b
diff --git a/pica-etherpad/secrets/etherpad-app.secrets.production b/pica-etherpad/secrets/etherpad-app.secrets.production
deleted file mode 100644
index 6785737b..00000000
--- a/pica-etherpad/secrets/etherpad-app.secrets.production
+++ /dev/null
@@ -1,5 +0,0 @@
-ETHERPAD_ADMIN_PASSWORD=password
-ETHERPAD_DB_NAME=db_name
-ETHERPAD_DB_USER=user
-ETHERPAD_DB_PASSWORD=password
-MYSQL_PORT_3306_TCP_ADDR=mysql
\ No newline at end of file
diff --git a/pica-etherpad/secrets/etherpad-app.secrets.test b/pica-etherpad/secrets/etherpad-app.secrets.test
deleted file mode 100644
index 6785737b..00000000
--- a/pica-etherpad/secrets/etherpad-app.secrets.test
+++ /dev/null
@@ -1,5 +0,0 @@
-ETHERPAD_ADMIN_PASSWORD=password
-ETHERPAD_DB_NAME=db_name
-ETHERPAD_DB_USER=user
-ETHERPAD_DB_PASSWORD=password
-MYSQL_PORT_3306_TCP_ADDR=mysql
\ No newline at end of file
diff --git a/pica-etherpad/secrets/etherpad-db.secrets.production b/pica-etherpad/secrets/etherpad-db.secrets.example
similarity index 100%
rename from pica-etherpad/secrets/etherpad-db.secrets.production
rename to pica-etherpad/secrets/etherpad-db.secrets.example
diff --git a/pica-etherpad/secrets/etherpad-db.secrets.test b/pica-etherpad/secrets/etherpad-db.secrets.test
deleted file mode 100644
index a95ba3b8..00000000
--- a/pica-etherpad/secrets/etherpad-db.secrets.test
+++ /dev/null
@@ -1,4 +0,0 @@
-MYSQL_ROOT_PASSWORD=password
-MYSQL_USER=user
-MYSQL_PASSWORD=password
-MYSQL_DATABASE=database
\ No newline at end of file
-- 
GitLab