diff --git a/dockers/cloud/docker-compose.yml b/dockers/cloud/docker-compose.yml index 5b624aa..1093bb7 100644 --- a/dockers/cloud/docker-compose.yml +++ b/dockers/cloud/docker-compose.yml @@ -35,6 +35,10 @@ services: - SMTP_HOST=${smtpHost} - SMTP_PORT=25 - MAIL_DOMAIN=${domain} + # labels: + # - "traefik.enable=true" + # - "traefik.http.routers.${nextcloudServName}.rule=Host(`${cloudHost}.${domain}`)" + # - "traefik.docker.network=cloudNet" db: image: mariadb:10.5 diff --git a/dockers/collabora/docker-compose.yml b/dockers/collabora/docker-compose.yml index 59d96cc..d2a0f71 100644 --- a/dockers/collabora/docker-compose.yml +++ b/dockers/collabora/docker-compose.yml @@ -28,6 +28,11 @@ services: - /etc/timezone:/etc/timezone:ro networks: collaboraNet: + # labels: + # - "traefik.enable=true" + # - "traefik.http.routers.${officeServName}-admin.rule=Host(`${officeHost}.${domain}`) && PathPrefix(`/(c|l)ool/adminws`)" + # - "traefik.http.routers.${officeServName}-admin.middlewares=test-adminipwhitelist@file" + # - "traefik.http.routers.${officeServName}.rule=Host(`${officeHost}.${domain}`) && ! PathPrefix(`/(c|l)ool/adminws`)" networks: collaboraNet: diff --git a/dockers/dokuwiki/docker-compose.yml b/dockers/dokuwiki/docker-compose.yml index 9e94e6f..a3006ff 100644 --- a/dockers/dokuwiki/docker-compose.yml +++ b/dockers/dokuwiki/docker-compose.yml @@ -5,11 +5,11 @@ services: dokuwiki: image: mprasil/dokuwiki container_name: ${dokuwikiServName} - restart: ${restartPolicy} + restart: ${restartPolicy} # ports: # - 8087:80 networks: - - dokuwikiNet + - dokuwikiNet - postfixNet external_links: - ${smtpServName}:${smtpHost}.${domain} @@ -19,6 +19,10 @@ services: - "dokuwikiPlugins:/dokuwiki/lib/plugins" - "dokuwikiLibtpl:/dokuwiki/lib/tpl" - "dokuwikiLogs:/var/log" + # labels: + # - "traefik.enable=true" + # - "traefik.http.routers.${dokuwikiServName}.rule=Host(`${dokuwikiHost}.${domain}`)" + # - "traefik.docker.network=dokuwikiNet" volumes: dokuwikiData: diff --git a/dockers/ethercalc/docker-compose.yml b/dockers/ethercalc/docker-compose.yml index 0db2563..b5ba9d6 100644 --- a/dockers/ethercalc/docker-compose.yml +++ b/dockers/ethercalc/docker-compose.yml @@ -14,6 +14,9 @@ services: links: - redis:redis restart: ${restartPolicy} + # labels: + # - "traefik.enable=true" + # - "traefik.http.routers.${ethercalcServName}.rule=Host(`${calcHost}.${domain}`)" redis: image: redis diff --git a/dockers/framadate/docker-compose.yml b/dockers/framadate/docker-compose.yml index eaab81f..66e281e 100644 --- a/dockers/framadate/docker-compose.yml +++ b/dockers/framadate/docker-compose.yml @@ -22,6 +22,12 @@ services: - dateConfig:/var/framadate/app/inc - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro + # labels: + # - "traefik.enable=true" + # - "traefik.http.routers.${framadateServName}-admin.rule=Host(`${dateHost}.${domain}`) && PathPrefix(`/admin`)" + # - "traefik.http.routers.${framadateServName}-admin.middlewares=test-adminipwhitelist@file" + # - "traefik.http.routers.${framadateServName}.rule=Host(`${dateHost}.${domain}`)" + # - "traefik.docker.network=framadateNet" db: image: mariadb:10.5 diff --git a/dockers/garradin/docker-compose.yml b/dockers/garradin/docker-compose.yml index 6052ac6..15e0c88 100644 --- a/dockers/garradin/docker-compose.yml +++ b/dockers/garradin/docker-compose.yml @@ -10,7 +10,7 @@ services: - ./config/garradin.conf:/etc/apache2/sites-available/000-default.conf - ./config/config.local.php:/usr/share/garradin/config.local.php - ./config/factory_cron.sh:/usr/share/garradin/factory_cron.sh -# - ./config/cron.php:/usr/share/garradin/scripts/cron.php +# - ./config/cron.php:/usr/share/garradin/scripts/cron.php - assoUsers:/usr/share/garradin/users - /etc/localtime:/etc/localtime:ro @@ -22,6 +22,10 @@ services: - postfixNet external_links: - ${smtpServName}:${smtpHost}.${domain} + # labels: + # - "traefik.enable=true" + # - "traefik.http.routers.${garradinServName}.rule=Host(`${garHost}.${domain}`)" + # - "traefik.docker.network=garradinNet" volumes: assoUsers: diff --git a/dockers/gitea/docker-compose.yml b/dockers/gitea/docker-compose.yml index 07e0bad..f0202c9 100644 --- a/dockers/gitea/docker-compose.yml +++ b/dockers/gitea/docker-compose.yml @@ -21,23 +21,29 @@ services: environment: - USER_UID=1000 - USER_GID=1000 + # labels: + # - "traefik.enable=true" + # - "traefik.http.routers.${gitServName}.rule=Host(`${gitHost}.${domain}`)" + # - "traefik.http.services.${gitServName}.loadbalancer.server.port=3000" + # - "traefik.docker.network=giteaNet" + db: image: mariadb:10.5 container_name: ${gitDBName} - restart: ${restartPolicy} + restart: ${restartPolicy} env_file: - ../../secret/env-${gitDBName} volumes: - gitDB:/var/lib/mysql - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro + - /etc/localtime:/etc/localtime:ro networks: - giteaNet volumes: gitDB: gitData: - + networks: giteaNet: external: true diff --git a/dockers/jirafeau/docker-compose.yml b/dockers/jirafeau/docker-compose.yml index 868cbcd..f19eaa5 100644 --- a/dockers/jirafeau/docker-compose.yml +++ b/dockers/jirafeau/docker-compose.yml @@ -24,6 +24,12 @@ services: - ./config/config.local.php:/var/jirafeau/lib/config.local.php - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro + # labels: + # - "traefik.enable=true" + # - "traefik.http.routers.${jirafeauServName}-admin.rule=Host(`${fileHost}.${domain}`) && PathPrefix(`/admin.php`)" + # - "traefik.http.routers.${jirafeauServName}-admin.middlewares=test-adminipwhitelist@file" + # - "traefik.http.routers.${jirafeauServName}.rule=Host(`${fileHost}.${domain}`) && ! PathPrefix(`/admin.php`)" + # - "traefik.docker.network=jirafeauNet" volumes: fileData: diff --git a/dockers/ldap/docker-compose.yml b/dockers/ldap/docker-compose.yml index 8ceccad..3f6c86b 100644 --- a/dockers/ldap/docker-compose.yml +++ b/dockers/ldap/docker-compose.yml @@ -29,6 +29,10 @@ services: - configSSP:/var/www/conf/ - icons:/var/www/html/images/ - lang:/var/www/lang/ + # labels: + # - "traefik.enable=true" + # - "traefik.http.routers.${ldapUIName}.rule=Host(`${ldapUIHost}.${domain}`)" + # - "traefik.docker.network=ldapNet" ldap: image: docker.io/bitnami/openldap:2.6 diff --git a/dockers/mattermost/docker-compose.yml b/dockers/mattermost/docker-compose.yml index 4acd9a8..126d37e 100644 --- a/dockers/mattermost/docker-compose.yml +++ b/dockers/mattermost/docker-compose.yml @@ -31,6 +31,8 @@ services: - db links: - db + expose: + - ${matterPort} # ports: # - 8089:80 networks: @@ -38,6 +40,11 @@ services: - postfixNet external_links: - ${smtpServName}:${smtpHost}.${domain} + # labels: + # - "traefik.enable=true" + # - "traefik.http.routers.${mattermostServName}.rule=Host(`${matterHost}.${domain}`)" + # - "traefik.http.services.${mattermostServName}.loadbalancer.server.port=${matterPort}" + # - "traefik.docker.network=mattermostNet" db: image: mariadb:10.5 diff --git a/dockers/mobilizon/docker-compose.yml b/dockers/mobilizon/docker-compose.yml index 1a4eb53..6952183 100644 --- a/dockers/mobilizon/docker-compose.yml +++ b/dockers/mobilizon/docker-compose.yml @@ -15,7 +15,8 @@ services: - MOBILIZON_LDAP_HOST=ldap - MOBILIZON_LDAP_BASE=ou=users,${ldap_root} - MOBILIZON_LDAP_UID=cn - + expose: + - 80 volumes: - mobilizonUploads:/var/lib/mobilizon/uploads - ${PWD}/config.exs:/etc/mobilizon/config.exs:ro @@ -24,6 +25,11 @@ services: - mobilizonNet - postfixNet - ldapNet + # labels: + # - "traefik.enable=true" + # - "traefik.http.routers.${mobilizonServName}.rule=Host(`${mobilizonHost}.${domain}`)" + # - "traefik.http.services.${mobilizonServName}.loadbalancer.server.port=80" + # - "traefik.docker.network=mobilizonNet" db: image: postgis/postgis:13-3.1 diff --git a/dockers/quotas/docker-compose.yml b/dockers/quotas/docker-compose.yml index 069a268..3b8dcea 100644 --- a/dockers/quotas/docker-compose.yml +++ b/dockers/quotas/docker-compose.yml @@ -16,6 +16,10 @@ services: - db env_file: - ../../secret/env-${quotasDBName} + # labels: + # - "traefik.enable=true" + # - "traefik.http.routers.${quotasServName}.rule=Host(`${quotaHost}.${domain}`)" + db: image: mariadb:10.5 diff --git a/dockers/roundcube/docker-compose.yml b/dockers/roundcube/docker-compose.yml index 3502bc7..e3a7bc4 100644 --- a/dockers/roundcube/docker-compose.yml +++ b/dockers/roundcube/docker-compose.yml @@ -24,7 +24,11 @@ services: - ROUNDCUBEMAIL_DEFAULT_PORT=993 - ROUNDCUBEMAIL_SMTP_PORT=25 env_file: - - ../../secret/env-${roundcubeServName} + - ../../secret/env-${roundcubeServName} + # labels: + # - "traefik.enable=true" + # - "traefik.http.routers.${roundcubeServName}.rule=Host(`${webmailHost}.${domain}`)" + # - "traefik.docker.network=roundcubeNet" db: image: mariadb:10.5 diff --git a/dockers/vaultwarden/docker-compose.yml b/dockers/vaultwarden/docker-compose.yml index a1f5b6e..dc6dac6 100644 --- a/dockers/vaultwarden/docker-compose.yml +++ b/dockers/vaultwarden/docker-compose.yml @@ -28,6 +28,10 @@ services: - ./templates:/data/templates - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro + # labels: + # - "traefik.enable=true" + # - "traefik.http.routers.${vaultwardenServName}.rule=Host(`${vaultwardenHost}.${domain}`)" + # - "traefik.docker.network=vaultwardenNet" db: image: mariadb:10.5 diff --git a/dockers/web/docker-compose.yml b/dockers/web/docker-compose.yml index cfb56e3..c19a893 100644 --- a/dockers/web/docker-compose.yml +++ b/dockers/web/docker-compose.yml @@ -13,11 +13,14 @@ services: - config:/etc/nginx/ - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro + # labels: + # - "traefik.enable=true" + # - "traefik.http.routers.web.rule=Host(`${domain}`,`www.${domain}`)" volumes: html: config: - + networks: webNet: external: true