diff --git a/pica-etherpad/.gitignore b/pica-etherpad/.gitignore index 60a6571a1a81ce92a84120f8bcdc72f29bd34028..6ed03d19e8e6153d28b93ac16492eb3dbd9dc77c 100644 --- a/pica-etherpad/.gitignore +++ b/pica-etherpad/.gitignore @@ -1,2 +1,2 @@ -etherpad-app.secrets -etherpad-db.secrets +secrets/etherpad-app.secrets +secrets/etherpad-db.secrets diff --git a/pica-etherpad/docker-compose.yml b/pica-etherpad/docker-compose.yml index 50ceafa8320cbf977b8cd68b9a31a6de71ba0188..f38be1fa06e2946235723f81e19e79460ce87fdd 100755 --- a/pica-etherpad/docker-compose.yml +++ b/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 diff --git a/pica-etherpad/secrets/etherpad-app.secrets.example b/pica-etherpad/secrets/etherpad-app.secrets.example new file mode 100644 index 0000000000000000000000000000000000000000..6785737bb78205af0b95bd34db917bcb712ea336 --- /dev/null +++ b/pica-etherpad/secrets/etherpad-app.secrets.example @@ -0,0 +1,5 @@ +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.example b/pica-etherpad/secrets/etherpad-db.secrets.example new file mode 100644 index 0000000000000000000000000000000000000000..a95ba3b8b9cbfca123557b9f8d8473cef2b3a193 --- /dev/null +++ b/pica-etherpad/secrets/etherpad-db.secrets.example @@ -0,0 +1,4 @@ +MYSQL_ROOT_PASSWORD=password +MYSQL_USER=user +MYSQL_PASSWORD=password +MYSQL_DATABASE=database \ No newline at end of file