From b3a435f1de079927ce23349f70f7b26cae612440 Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 21 Mar 2021 14:51:32 +0100 Subject: [PATCH 01/25] Remove unsued databases --- docker-compose.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ea06ca6..54a8486 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,22 +2,6 @@ version: "3" services: - ################################################## - # DATABASES # - ################################################## - - mongo: - image: mongo:4.2 - restart: always - volumes: - - ./mongo_data:/data/db - - redis: - image: redis:5.0 - restart: always - volumes: - - ./redis_data:/data - riot: build: riot restart: always From 651b402e644788d6be42a4cf3f96f3d37405d1b1 Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 21 Mar 2021 14:52:09 +0100 Subject: [PATCH 02/25] Remove local postgres --- docker-compose.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 54a8486..4f477f3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -55,19 +55,6 @@ services: environment: - "DISCORD_WEBHOOK=${PROMETHEUS_DISCORD_WEBHOOK}" - postgres: - # Don't upgrade PostgreSQL by simply changing the version number - # You need to migrate the Database to the new PostgreSQL version - # When creating for the first time, - # you need to create codimd and cas users and databases. - image: postgres:9.6-alpine - restart: always - environment: - - POSTGRES_USER=postgres - - "POSTGRES_PASSWD=${POSTGRES_PASSWD}" - volumes: - - ./postgres_data:/var/lib/postgresql/data - codimd: build: codimd restart: always From 801ad60a702bb06e9af3a22744805e8a9361bd6e Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 21 Mar 2021 14:54:08 +0100 Subject: [PATCH 03/25] Uncomment Django CAS --- docker-compose.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 4f477f3..f0b57fa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -74,17 +74,17 @@ services: volumes: - "/var/run/docker.sock:/var/run/docker.sock:ro" -# cas: -# build: django-cas-server -# restart: always -# environment: -# DJANGO_DB_PASSWORD: "${DJANGO_CAS_DB_PASSWORD}" -# DJANGO_SECRET_KEY: "${DJANGO_CAS_SECRET_KEY}" -# DJANGO_CAS_LDAP_PASSWORD: "${DJANGO_CAS_LDAP_PASSWORD}" -# ports: -# - "8085:8000" -# depends_on: -# - postgres + cas: + build: django-cas-server + restart: always + environment: + DJANGO_DB_PASSWORD: "${DJANGO_CAS_DB_PASSWORD}" + DJANGO_SECRET_KEY: "${DJANGO_CAS_SECRET_KEY}" + DJANGO_CAS_LDAP_PASSWORD: "${DJANGO_CAS_LDAP_PASSWORD}" + ports: + - "8085:8000" + depends_on: + - postgres statping: image: statping/statping:v0.90.74 From f3eabbe97f12f2590735eb43a312a6f2ba6737a0 Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 21 Mar 2021 14:54:31 +0100 Subject: [PATCH 04/25] Django CAS no longer relies on local postgres --- docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f0b57fa..21fd21c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -83,8 +83,6 @@ services: DJANGO_CAS_LDAP_PASSWORD: "${DJANGO_CAS_LDAP_PASSWORD}" ports: - "8085:8000" - depends_on: - - postgres statping: image: statping/statping:v0.90.74 From 60af6a7ccace1458bda0e9ccf9f400d0541bd4a8 Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 21 Mar 2021 14:56:22 +0100 Subject: [PATCH 05/25] Correct the mail --- django-cas-server/cas/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django-cas-server/cas/settings.py b/django-cas-server/cas/settings.py index 313ada1..d383225 100644 --- a/django-cas-server/cas/settings.py +++ b/django-cas-server/cas/settings.py @@ -27,10 +27,10 @@ DEBUG = os.getenv('DJANGO_DEBUG', False) ALLOWED_HOSTS = [os.getenv('DJANGO_HOST')] -# Suivi des erreurs sur root@ +# Suivi des erreurs sur la ML monitoring EMAIL_SUBJECT_PREFIX = "[CAS] " ADMINS = ( - ('Intranet', 'root@crans.org'), + ('Intranet', 'monitoring.aurore@lists.crans.org'), ) # Application definition From 717e8bff65f7b6a236951e4473bf37e92328f0c0 Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 21 Mar 2021 14:58:38 +0100 Subject: [PATCH 06/25] Django CAS add LDAP requirement --- django-cas-server/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/django-cas-server/requirements.txt b/django-cas-server/requirements.txt index 5ac7318..7ee3d09 100644 --- a/django-cas-server/requirements.txt +++ b/django-cas-server/requirements.txt @@ -1,4 +1,5 @@ django-cas-server gunicorn +ldap3 psycopg2 whitenoise From 84b3e4ba48024cd5efdb609443c485f401339739 Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 21 Mar 2021 15:00:57 +0100 Subject: [PATCH 07/25] Django CAS fix urls --- django-cas-server/cas/urls.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django-cas-server/cas/urls.py b/django-cas-server/cas/urls.py index f182d34..52393fb 100644 --- a/django-cas-server/cas/urls.py +++ b/django-cas-server/cas/urls.py @@ -17,7 +17,7 @@ from django.conf.urls import include, url from django.contrib import admin urlpatterns = [ - url(r'^admin/', admin.site.urls), - url(r'^', include('cas_server.urls', namespace="cas_server")), + url(r'admin/', admin.site.urls), + url(r'', include('cas_server.urls', namespace="cas_server")), ] From 9691edcff06f5d668462e4f702076d15fdd8560d Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 21 Mar 2021 15:02:45 +0100 Subject: [PATCH 08/25] Rename HedgeDoc and Element to match new names --- docker-compose.yml | 8 ++++---- {riot => element}/Dockerfile | 0 {riot => element}/bg.jpg | Bin {riot => element}/config.json | 0 {codimd => hedgedoc}/Dockerfile | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename {riot => element}/Dockerfile (100%) rename {riot => element}/bg.jpg (100%) rename {riot => element}/config.json (100%) rename {codimd => hedgedoc}/Dockerfile (100%) diff --git a/docker-compose.yml b/docker-compose.yml index 21fd21c..ee77e20 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,8 +2,8 @@ version: "3" services: - riot: - build: riot + element: + build: element restart: always ports: - 8080:80 @@ -55,8 +55,8 @@ services: environment: - "DISCORD_WEBHOOK=${PROMETHEUS_DISCORD_WEBHOOK}" - codimd: - build: codimd + hedgedoc: + build: hedgedoc restart: always environment: - "CMD_DB_URL=${CODIMD_DB_URL}" diff --git a/riot/Dockerfile b/element/Dockerfile similarity index 100% rename from riot/Dockerfile rename to element/Dockerfile diff --git a/riot/bg.jpg b/element/bg.jpg similarity index 100% rename from riot/bg.jpg rename to element/bg.jpg diff --git a/riot/config.json b/element/config.json similarity index 100% rename from riot/config.json rename to element/config.json diff --git a/codimd/Dockerfile b/hedgedoc/Dockerfile similarity index 100% rename from codimd/Dockerfile rename to hedgedoc/Dockerfile From c1c930915aff7abca7ce3e5bd5f32b7b729a79c2 Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 21 Mar 2021 15:04:09 +0100 Subject: [PATCH 09/25] Update element and add assets --- element/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/element/Dockerfile b/element/Dockerfile index 4077b10..7b48707 100644 --- a/element/Dockerfile +++ b/element/Dockerfile @@ -1,5 +1,6 @@ -FROM vectorim/element-web:v1.7.22 +FROM vectorim/element-web:v1.7.23 # Customize instance settings and background COPY config.json /app/config.json -COPY bg.jpg /app/bg.jpg +COPY background.jpg /app/background.jpg +COPY logo.png /app/logo.png From 8b80acff75537994a23ab7504c4dee05bb3b41ef Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 21 Mar 2021 15:06:31 +0100 Subject: [PATCH 10/25] Add new assets to config and link lists --- element/config.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/element/config.json b/element/config.json index df22db5..796ce03 100644 --- a/element/config.json +++ b/element/config.json @@ -14,7 +14,12 @@ "disable_3pid_login": true, "brand": "Riot", "branding": { - "welcomeBackgroundUrl": "/bg.jpg" + "welcomeBackgroundUrl": "/background.jpg", + "authHeaderLogoUrl": :"/logo.png", + "authFooterLinks": [ + {"text": "Site Web", "url": "https://auro.re"}, + {"text": "Intranet", "url": "https://intranet.auro.re"}, + {"text": "Email support", "url": "mailto:support.aurore@lists.crans.org"} }, "integrations_ui_url": "", "integrations_rest_url": "", From 399e6fd4f4afa274475762e02e0df82347216046 Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 21 Mar 2021 15:07:22 +0100 Subject: [PATCH 11/25] Use the default matrix.to permalinks and because auro.re permalinks are broken --- element/config.json | 1 - 1 file changed, 1 deletion(-) diff --git a/element/config.json b/element/config.json index 796ce03..51faecb 100644 --- a/element/config.json +++ b/element/config.json @@ -49,7 +49,6 @@ }, "welcomeUserId": "@riot-bot:matrix.org", "piwik": false, - "permalinkPrefix": "https://auro.re", "enable_presence_by_hs_url": { "https://matrix.org": false }, From c6bf038e558f56bd0ee92bf0a35775d875e678f3 Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 21 Mar 2021 15:07:44 +0100 Subject: [PATCH 12/25] Enable presence on other HS --- element/config.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/element/config.json b/element/config.json index 51faecb..fc1e8f0 100644 --- a/element/config.json +++ b/element/config.json @@ -49,9 +49,6 @@ }, "welcomeUserId": "@riot-bot:matrix.org", "piwik": false, - "enable_presence_by_hs_url": { - "https://matrix.org": false - }, "settingDefaults": { "breadcrumbs": true }, From 2ed7e8d748057874a3dc20ce89aea9de6bae9526 Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 21 Mar 2021 15:08:45 +0100 Subject: [PATCH 13/25] Move asset to a more suitable name --- element/{bg.jpg => background.jpg} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename element/{bg.jpg => background.jpg} (100%) diff --git a/element/bg.jpg b/element/background.jpg similarity index 100% rename from element/bg.jpg rename to element/background.jpg From 0acd0664b7e84c12e65e33f14ec7add2e2f04bfb Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 21 Mar 2021 15:10:43 +0100 Subject: [PATCH 14/25] Add Auore logo asset --- element/logo.png | Bin 0 -> 16956 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 element/logo.png diff --git a/element/logo.png b/element/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..4c967a587c5443f90b85c85aecfea7589446698f GIT binary patch literal 16956 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 C`3+J4 literal 0 HcmV?d00001 From 049f59ce52eae1c3ef0024eb2aba130ad435669c Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 21 Mar 2021 15:11:26 +0100 Subject: [PATCH 15/25] Drop sharelatex --- sharelatex/Dockerfile | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 sharelatex/Dockerfile diff --git a/sharelatex/Dockerfile b/sharelatex/Dockerfile deleted file mode 100644 index c2b313c..0000000 --- a/sharelatex/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM sharelatex/sharelatex:2.2.0 - -ENV SHARELATEX_APP_NAME="ShareLaTeX Aurore" -ENV SHARELATEX_MONGO_URL=mongodb://mongo/sharelatex -ENV SHARELATEX_REDIS_HOST=redis -ENV REDIS_HOST=redis -ENV ENABLED_LINKED_FILE_TYPES=url,project_file -ENV SHARELATEX_SITE_URL=https://sharelatex.auro.re -ENV SHARELATEX_ADMIN_EMAIL=root@localhost From 7efbda4a7c377f80f05d9d9b9332d1fbdcdfef4b Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 21 Mar 2021 15:47:46 +0100 Subject: [PATCH 16/25] Add kanboard --- docker-compose.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index ee77e20..7144a75 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -93,3 +93,27 @@ services: - ./statping_data:/app environment: DB_CONN: sqlite + + kanboard: + image: kanboard/kanboard:v1.2.18 + port: + - 8088:80 + volumes: + - ./kanboard_data:/var/www/app/data + - ./kanboard_plugins:/var/www/app/plugins + environnements: + - "LDAP_AUTH=true" + - "LDAP_SERVER=ldap://10.128.0.149" + - "LDAP_BIND_TYPE=proxy" + - "LDAP_USERNAME=cn=kanboard,ou=service-users,dc=auro,dc=re" + - "LDAP_PASSWORD=${KANBOARD_LDAP_PASSWORD}" + - "LDAP_USER_BASE_DN=cn=Utilisateurs,dc=auro,dc=re" + - "LDAP_USER_FILTER=(&(objectClass=posixAccount)(uid=%s))" + - "LDAP_GROUP_PROVIDER=false" + - "DB_DRIVER=postgres" + - "DB_HOSTNAME=10.128.0.96" + - "DB_USERNAME=kanboard" + - "DB_PASSWORD=${KANBOARD_DB_PASSWORD}" + - "DB_NAME=kanboard" + - "ENABLE_XFRAME=false" + - "DEBUG=false" From 39b826bd6a69714e7d43c81ca35a89fd82d67d40 Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 21 Mar 2021 15:51:50 +0100 Subject: [PATCH 17/25] Add kanbot --- .gitmodules | 3 +++ docker-compose.yml | 6 ++++++ kanbot | 1 + 3 files changed, 10 insertions(+) create mode 100644 .gitmodules create mode 160000 kanbot diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..3923045 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "kanbot"] + path = kanbot + url = https://gitea.auro.re/aurore/kanbot diff --git a/docker-compose.yml b/docker-compose.yml index 7144a75..dce820a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -117,3 +117,9 @@ services: - "DB_NAME=kanboard" - "ENABLE_XFRAME=false" - "DEBUG=false" + + kanbot: + build: kanbot + restart: always + volumes: + - ./kanbot_config/config.yaml:/var/www/kanbot/config.yaml:ro diff --git a/kanbot b/kanbot new file mode 160000 index 0000000..95cabfb --- /dev/null +++ b/kanbot @@ -0,0 +1 @@ +Subproject commit 95cabfb36d34da267c79ef671231710697493364 From bf3068bc757ae4d5b4aa19bc9dc29167d354ae50 Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 21 Mar 2021 16:02:50 +0100 Subject: [PATCH 18/25] Update ENV example --- env.example | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/env.example b/env.example index 7ef4d89..7e23067 100644 --- a/env.example +++ b/env.example @@ -3,3 +3,11 @@ ETHERPAD_POSTGRES_PASSWD=CHANGE ME GRAFANA_LDAP_BIND_PASSWD=CHANGE ME PROMETHEUS_DISCORD_WEBHOOK=CHANGE ME CODIMD_LDAP_BINDCREDENTIALS=CHANGE ME +PROMETHEUS_DISCORD_WEBHOOK=CHANGE ME +DJANGO_CAS_DB_PASSWORD=CHANGE ME +DJANGO_CAS_SECRET_KEY=CHANGE ME +DJANGO_CAS_LDAP_PASSWORD=CHANGE ME +CODIMD_DB_URL=CHANGE ME +KANBOARD_LDAP_PASSWORD=CHANGE ME +STATPING_DB_PASSWD=CHANGE ME +KANBOARD_DB_PASSWORD=CHANGE ME From 9bcf2a2a8190130a60178297fa3c17b4d043357d Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 21 Mar 2021 17:38:12 +0100 Subject: [PATCH 19/25] reorder the services in port order --- docker-compose.yml | 88 +++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index dce820a..c0097e8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,21 +8,16 @@ services: ports: - 8080:80 - privatebin: - image: privatebin/nginx-fpm-alpine:1.3.4 - restart: always - volumes: - - ./privatebin_data:/srv/data - ports: - - 8083:8080 - - etherpad: - build: etherpad + hedgedoc: + build: hedgedoc restart: always environment: - - "POSTGRES_PASSWORD=${ETHERPAD_POSTGRES_PASSWD}" + - "CMD_DB_URL=${CODIMD_DB_URL}" + - "CMD_LDAP_BINDCREDENTIALS=${CODIMD_LDAP_BINDCREDENTIALS}" ports: - - 8084:9001 + - "8081:3000" + volumes: + - ./codimd_uploads_data:/hedgedoc/public/uploads grafana: build: grafana @@ -34,45 +29,21 @@ services: ports: - 8082:3000 - matrix-appservice-discord: - image: halfshot/matrix-appservice-discord:v1.0.0 + privatebin: + image: privatebin/nginx-fpm-alpine:1.3.4 restart: always volumes: - - ./matrix-appservice-discord_data:/data - - ./matrix-appservice-discord_data/discord.db:/discord.db - ports: - - 9005:9005 - - prometheus-alertmanager: - build: prometheus-alertmanager - restart: always + - ./privatebin_data:/srv/data ports: - - 9093:9093 - - prometheus-alertmanager-discord: - build: prometheus-alertmanager-discord - restart: always - environment: - - "DISCORD_WEBHOOK=${PROMETHEUS_DISCORD_WEBHOOK}" + - 8083:8080 - hedgedoc: - build: hedgedoc + etherpad: + build: etherpad restart: always environment: - - "CMD_DB_URL=${CODIMD_DB_URL}" - - "CMD_LDAP_BINDCREDENTIALS=${CODIMD_LDAP_BINDCREDENTIALS}" - ports: - - "8081:3000" - volumes: - - ./codimd_uploads_data:/hedgedoc/public/uploads - - docker_exporter: - image: prometheusnet/docker_exporter - restart: always + - "POSTGRES_PASSWORD=${ETHERPAD_POSTGRES_PASSWD}" ports: - - "8087:9417" - volumes: - - "/var/run/docker.sock:/var/run/docker.sock:ro" + - 8084:9001 cas: build: django-cas-server @@ -94,6 +65,14 @@ services: environment: DB_CONN: sqlite + docker_exporter: + image: prometheusnet/docker_exporter + restart: always + ports: + - "8087:9417" + volumes: + - "/var/run/docker.sock:/var/run/docker.sock:ro" + kanboard: image: kanboard/kanboard:v1.2.18 port: @@ -123,3 +102,24 @@ services: restart: always volumes: - ./kanbot_config/config.yaml:/var/www/kanbot/config.yaml:ro + + matrix-appservice-discord: + image: halfshot/matrix-appservice-discord:v1.0.0 + restart: always + volumes: + - ./matrix-appservice-discord_data:/data + - ./matrix-appservice-discord_data/discord.db:/discord.db + ports: + - 9005:9005 + + prometheus-alertmanager: + build: prometheus-alertmanager + restart: always + ports: + - 9093:9093 + + prometheus-alertmanager-discord: + build: prometheus-alertmanager-discord + restart: always + environment: + - "DISCORD_WEBHOOK=${PROMETHEUS_DISCORD_WEBHOOK}" From e0e6c16e8815447a959a55cbd7ccde2bd173a467 Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 21 Mar 2021 17:39:08 +0100 Subject: [PATCH 20/25] Add Kanboard to README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6575940..7b3805f 100644 --- a/README.md +++ b/README.md @@ -21,3 +21,4 @@ tout en vérifiant qu'il n'est lisible que par root. * 8085 -> Django CAS server (cas) * 8086 -> ShareLaTeX * 8087 -> Docker exporter + * 8088 -> Kanboard From fde82dee5433225a80f5deea8e7376d78131133a Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 21 Mar 2021 17:39:56 +0100 Subject: [PATCH 21/25] Update README with newer info --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7b3805f..6175903 100644 --- a/README.md +++ b/README.md @@ -13,12 +13,12 @@ tout en vérifiant qu'il n'est lisible que par root. ## Map des ports - * 8080 -> Riot Web (chat) + * 8080 -> Element Web (chat) * 8081 -> CodiMD * 8082 -> Grafana * 8083 -> PrivateBin (paste) * 8084 -> EtherPad (pad) * 8085 -> Django CAS server (cas) - * 8086 -> ShareLaTeX + * 8086 -> Statping (status page) * 8087 -> Docker exporter * 8088 -> Kanboard From 1ebed0c641d1a5eb838f5295e176cff9d219c284 Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 21 Mar 2021 17:41:54 +0100 Subject: [PATCH 22/25] Fix syntax error --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index c0097e8..21e1266 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -75,7 +75,7 @@ services: kanboard: image: kanboard/kanboard:v1.2.18 - port: + ports: - 8088:80 volumes: - ./kanboard_data:/var/www/app/data From 626b179945256f36b5f8f32c966af6e25ad5149b Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sun, 21 Mar 2021 17:42:28 +0100 Subject: [PATCH 23/25] Fix syntax error --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 21e1266..fe192c2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -80,7 +80,7 @@ services: volumes: - ./kanboard_data:/var/www/app/data - ./kanboard_plugins:/var/www/app/plugins - environnements: + environment: - "LDAP_AUTH=true" - "LDAP_SERVER=ldap://10.128.0.149" - "LDAP_BIND_TYPE=proxy" From b0485962de4f3cb0835705b0adab49d2c9eab3e2 Mon Sep 17 00:00:00 2001 From: Jeltz Date: Sun, 21 Mar 2021 17:52:41 +0100 Subject: [PATCH 24/25] Declare environment variables using YAML syntax --- docker-compose.yml | 66 ++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index fe192c2..68f01a4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,4 @@ +--- version: "3" services: @@ -12,18 +13,18 @@ services: build: hedgedoc restart: always environment: - - "CMD_DB_URL=${CODIMD_DB_URL}" - - "CMD_LDAP_BINDCREDENTIALS=${CODIMD_LDAP_BINDCREDENTIALS}" - ports: - - "8081:3000" + CMD_DB_URL: "${CODIMD_DB_URL}" + CMD_LDAP_BINDCREDENTIALS: "${CODIMD_LDAP_BINDCREDENTIALS}" volumes: - ./codimd_uploads_data:/hedgedoc/public/uploads + ports: + - 8081:3000 grafana: build: grafana restart: always environment: - - "ENV_PASSWORD=${GRAFANA_LDAP_BIND_PASSWD}" + ENV_PASSWORD: "${GRAFANA_LDAP_BIND_PASSWD}" volumes: - ./grafana_data:/var/lib/grafana ports: @@ -41,7 +42,7 @@ services: build: etherpad restart: always environment: - - "POSTGRES_PASSWORD=${ETHERPAD_POSTGRES_PASSWD}" + POSTGRES_PASSWORD: "${ETHERPAD_POSTGRES_PASSWD}" ports: - 8084:9001 @@ -53,49 +54,49 @@ services: DJANGO_SECRET_KEY: "${DJANGO_CAS_SECRET_KEY}" DJANGO_CAS_LDAP_PASSWORD: "${DJANGO_CAS_LDAP_PASSWORD}" ports: - - "8085:8000" + - 8085:8000 statping: image: statping/statping:v0.90.74 restart: always - ports: - - 8086:8080 - volumes: - - ./statping_data:/app environment: DB_CONN: sqlite + volumes: + - ./statping_data:/app + ports: + - 8086:8080 docker_exporter: image: prometheusnet/docker_exporter restart: always + volumes: + - /var/run/docker.sock:/var/run/docker.sock:ro ports: - "8087:9417" - volumes: - - "/var/run/docker.sock:/var/run/docker.sock:ro" kanboard: image: kanboard/kanboard:v1.2.18 - ports: - - 8088:80 + environment: + LDAP_AUTH: "true" + LDAP_SERVER: ldap://10.128.0.149 + LDAP_BIND_TYPE: proxy + LDAP_USERNAME: "cn=kanboard,ou=service-users,dc=auro,dc=re" + LDAP_PASSWORD: "${KANBOARD_LDAP_PASSWORD}" + LDAP_USER_BASE_DN: "cn=Utilisateurs,dc=auro,dc=re" + LDAP_USER_FILTER: "(&(objectClass=posixAccount)(uid=%s))" + LDAP_GROUP_PROVIDER: "false" + DB_DRIVER: postgres + DB_HOSTNAME: 10.128.0.96 + DB_NAME: kanboard + DB_USERNAME: kanboard + DB_PASSWORD: "${KANBOARD_DB_PASSWORD}" + ENABLE_XFRAME: "false" + DEBUG: "false" volumes: - ./kanboard_data:/var/www/app/data - ./kanboard_plugins:/var/www/app/plugins - environment: - - "LDAP_AUTH=true" - - "LDAP_SERVER=ldap://10.128.0.149" - - "LDAP_BIND_TYPE=proxy" - - "LDAP_USERNAME=cn=kanboard,ou=service-users,dc=auro,dc=re" - - "LDAP_PASSWORD=${KANBOARD_LDAP_PASSWORD}" - - "LDAP_USER_BASE_DN=cn=Utilisateurs,dc=auro,dc=re" - - "LDAP_USER_FILTER=(&(objectClass=posixAccount)(uid=%s))" - - "LDAP_GROUP_PROVIDER=false" - - "DB_DRIVER=postgres" - - "DB_HOSTNAME=10.128.0.96" - - "DB_USERNAME=kanboard" - - "DB_PASSWORD=${KANBOARD_DB_PASSWORD}" - - "DB_NAME=kanboard" - - "ENABLE_XFRAME=false" - - "DEBUG=false" + ports: + - 8088:80 kanbot: build: kanbot @@ -122,4 +123,5 @@ services: build: prometheus-alertmanager-discord restart: always environment: - - "DISCORD_WEBHOOK=${PROMETHEUS_DISCORD_WEBHOOK}" + DISCORD_WEBHOOK: "${PROMETHEUS_DISCORD_WEBHOOK}" +... From e3f5e474c5f9f9f143018f09ace76bd36078d30e Mon Sep 17 00:00:00 2001 From: Jeltz Date: Sun, 21 Mar 2021 17:56:07 +0100 Subject: [PATCH 25/25] Cleanup environment variables names --- docker-compose.yml | 4 ++-- env.example | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 68f01a4..90fd166 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,7 +24,7 @@ services: build: grafana restart: always environment: - ENV_PASSWORD: "${GRAFANA_LDAP_BIND_PASSWD}" + ENV_PASSWORD: "${GRAFANA_LDAP_PASSWORD}" volumes: - ./grafana_data:/var/lib/grafana ports: @@ -42,7 +42,7 @@ services: build: etherpad restart: always environment: - POSTGRES_PASSWORD: "${ETHERPAD_POSTGRES_PASSWD}" + POSTGRES_PASSWORD: "${ETHERPAD_DB_PASSWORD}" ports: - 8084:9001 diff --git a/env.example b/env.example index 7e23067..a0bef33 100644 --- a/env.example +++ b/env.example @@ -1,13 +1,11 @@ # Copy this as .env and make it only readable by root -ETHERPAD_POSTGRES_PASSWD=CHANGE ME -GRAFANA_LDAP_BIND_PASSWD=CHANGE ME +ETHERPAD_DB_PASSWORD=CHANGE ME +GRAFANA_LDAP_PASSWORD=CHANGE ME PROMETHEUS_DISCORD_WEBHOOK=CHANGE ME CODIMD_LDAP_BINDCREDENTIALS=CHANGE ME -PROMETHEUS_DISCORD_WEBHOOK=CHANGE ME DJANGO_CAS_DB_PASSWORD=CHANGE ME DJANGO_CAS_SECRET_KEY=CHANGE ME DJANGO_CAS_LDAP_PASSWORD=CHANGE ME CODIMD_DB_URL=CHANGE ME KANBOARD_LDAP_PASSWORD=CHANGE ME -STATPING_DB_PASSWD=CHANGE ME KANBOARD_DB_PASSWORD=CHANGE ME