Merge branch 'witzigor-master-patch-05335' into 'master'

Witzigor master patch 05335

See merge request picasoft/dockerfiles!11

pica-etherpad/.gitignore

-etherpad-app.secrets
-etherpad-db.secrets
+secrets/etherpad-app.secrets
+secrets/etherpad-db.secrets

pica-etherpad/docker-compose.yml

@@ -10,10 +10,9 @@ services:
         mem_limit: "2048m"
         cpus: "0.60"
         pids_limit: 1024
-        env_file: ./etherpad-app.secrets
-        ports: ['8080:8080']
+        env_file: ./secrets/etherpad-app.secrets
         labels:
-          - "traefik.frontend.rule=Host:pad.test.picasoft.net"
+          - "traefik.frontend.rule=Host:pad.picasoft.net"
           - "traefik.port=8080"
           - "traefik.enable=true"
         restart: always
@@ -28,6 +27,6 @@ services:
         pids_limit: 1024
         volumes:
           - /DATA/docker/etherpad/etherpad-db/data:/var/lib/mysql
-        env_file: ./etherpad-db.secrets
+        env_file: ./secrets/etherpad-db.secrets
         restart: always
                                                                                     

pica-etherpad/secrets/etherpad-app.secrets.example

+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

pica-etherpad/secrets/etherpad-db.secrets.example

+MYSQL_ROOT_PASSWORD=password
+MYSQL_USER=user
+MYSQL_PASSWORD=password
+MYSQL_DATABASE=database
\ No newline at end of file