From 32def036f01ae6b583aae6a931472640ea4c3672 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 29 Oct 2024 12:56:39 +0000 Subject: [PATCH] Took out domainname from configs --- bin/convertdomain | 1 - lib/authelia.sh | 1 - lib/autodiscover.sh | 1 - lib/baserow.sh | 1 - lib/bookstack.sh | 1 - lib/caddy.sh | 1 - lib/calcom.sh | 1 - lib/castopod.sh | 1 - lib/collabora.sh | 1 - lib/connector.sh | 1 - lib/coturn.sh | 1 - lib/dashboard.sh | 1 - lib/discourse.sh | 2 -- lib/element.sh | 1 - lib/espocrm.sh | 1 - lib/freescout.sh | 1 - lib/gitea.sh | 1 - lib/jitsi.sh | 1 - lib/jitsiopenid.sh | 1 - lib/ldap.sh | 1 - lib/listmonk.sh | 1 - lib/mail.sh | 1 - lib/matrix.sh | 1 - lib/matrixsignal.sh | 1 - lib/matrixslack.sh | 1 - lib/matrixwhatsapp.sh | 1 - lib/msp.sh | 1 - lib/nextcloud.sh | 1 - lib/nginx.sh | 1 - lib/panel.sh | 1 - lib/pdns.sh | 1 - lib/pdnsadmin.sh | 1 - lib/pdnsmysql.sh | 1 - lib/pdnsstatic.sh | 1 - lib/postgresql.sh | 1 - lib/proxy.sh | 1 - lib/redis.sh | 1 - lib/roundcube.sh | 1 - lib/traefik.sh | 1 - lib/vaultwarden.sh | 1 - lib/wireguard.sh | 1 - lib/wordpress.sh | 1 - 42 files changed, 43 deletions(-) diff --git a/bin/convertdomain b/bin/convertdomain index 4e962c1..cdd83f2 100755 --- a/bin/convertdomain +++ b/bin/convertdomain @@ -931,7 +931,6 @@ services: image: espocrm/espocrm:\${IMAGE_VERSION} container_name: espocrm hostname: espocrm.$DOMAIN_NEW - domainname: $DOMAIN_NEW restart: always networks: core: diff --git a/lib/authelia.sh b/lib/authelia.sh index 8072831..7a1ef6b 100644 --- a/lib/authelia.sh +++ b/lib/authelia.sh @@ -21,7 +21,6 @@ services: image: authelia/authelia:\${IMAGE_VERSION} container_name: authelia hostname: authelia.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/autodiscover.sh b/lib/autodiscover.sh index cf17849..81dd555 100644 --- a/lib/autodiscover.sh +++ b/lib/autodiscover.sh @@ -21,7 +21,6 @@ services: image: monogramm/autodiscover-email-settings:\${IMAGE_VERSION} container_name: autodiscover hostname: autodiscover.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/baserow.sh b/lib/baserow.sh index d65c74d..960f0ff 100644 --- a/lib/baserow.sh +++ b/lib/baserow.sh @@ -22,7 +22,6 @@ services: image: baserow/baserow:\${IMAGE_VERSION} container_name: baserow hostname: baserow.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/bookstack.sh b/lib/bookstack.sh index d9044b4..bb708bf 100644 --- a/lib/bookstack.sh +++ b/lib/bookstack.sh @@ -19,7 +19,6 @@ services: image: lscr.io/linuxserver/bookstack:\${IMAGE_VERSION} container_name: bookstack hostname: bookstack.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/caddy.sh b/lib/caddy.sh index 382f4eb..f55a5a1 100644 --- a/lib/caddy.sh +++ b/lib/caddy.sh @@ -22,7 +22,6 @@ services: image: federatedcomputer/caddy:\${IMAGE_VERSION} container_name: caddy hostname: caddy.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/calcom.sh b/lib/calcom.sh index 2149c54..8b7a353 100644 --- a/lib/calcom.sh +++ b/lib/calcom.sh @@ -24,7 +24,6 @@ services: image: federatedcomputer/calcom:\${IMAGE_VERSION} container_name: calcom hostname: calcom.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/castopod.sh b/lib/castopod.sh index 7e91390..14d58d8 100644 --- a/lib/castopod.sh +++ b/lib/castopod.sh @@ -21,7 +21,6 @@ services: image: castopod/castopod:\${IMAGE_VERSION} container_name: castopod hostname: castopod.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/collabora.sh b/lib/collabora.sh index b6a183f..f964c0f 100644 --- a/lib/collabora.sh +++ b/lib/collabora.sh @@ -23,7 +23,6 @@ services: image: collabora/code:\${IMAGE_VERSION} container_name: collabora hostname: collabora.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/connector.sh b/lib/connector.sh index 619d562..0fec1f9 100644 --- a/lib/connector.sh +++ b/lib/connector.sh @@ -25,7 +25,6 @@ services: image: federatedcomputer/web-connector:\${IMAGE_VERSION} container_name: connector hostname: connector.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/coturn.sh b/lib/coturn.sh index beffd0f..f1f6a07 100644 --- a/lib/coturn.sh +++ b/lib/coturn.sh @@ -21,7 +21,6 @@ services: image: coturn/coturn:\${IMAGE_VERSION} container_name: coturn hostname: coturn.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/dashboard.sh b/lib/dashboard.sh index 7ccaebe..e0fad75 100644 --- a/lib/dashboard.sh +++ b/lib/dashboard.sh @@ -20,7 +20,6 @@ services: image: federatedcomputer/dashboard:\${IMAGE_VERSION} container_name: dashboard hostname: dashboard.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/discourse.sh b/lib/discourse.sh index 0c8806c..333e43c 100644 --- a/lib/discourse.sh +++ b/lib/discourse.sh @@ -20,7 +20,6 @@ services: image: docker.io/bitnami/discourse:\${IMAGE_VERSION} container_name: discourse hostname: discourse.$DOMAIN - domainname: $DOMAIN restart: always networks: core: @@ -39,7 +38,6 @@ services: image: docker.io/bitnami/discourse:\${IMAGE_VERSION} container_name: discoursesidekiq hostname: discoursesidekiq.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/element.sh b/lib/element.sh index 75cd4dc..066a94e 100644 --- a/lib/element.sh +++ b/lib/element.sh @@ -19,7 +19,6 @@ services: image: vectorim/element-web:\${IMAGE_VERSION} container_name: element hostname: element.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/espocrm.sh b/lib/espocrm.sh index 944ed1e..3abad61 100644 --- a/lib/espocrm.sh +++ b/lib/espocrm.sh @@ -20,7 +20,6 @@ services: image: espocrm/espocrm:\${IMAGE_VERSION} container_name: espocrm hostname: espocrm.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/freescout.sh b/lib/freescout.sh index 345ac37..24838fb 100644 --- a/lib/freescout.sh +++ b/lib/freescout.sh @@ -20,7 +20,6 @@ services: image: ghcr.io/tiredofit/docker-freescout:\${IMAGE_VERSION} container_name: freescout hostname: freescout.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/gitea.sh b/lib/gitea.sh index 0353120..8f9c36b 100644 --- a/lib/gitea.sh +++ b/lib/gitea.sh @@ -23,7 +23,6 @@ services: image: gitea/gitea:\${IMAGE_VERSION} container_name: gitea hostname: gitea.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/jitsi.sh b/lib/jitsi.sh index 8690062..0c42294 100644 --- a/lib/jitsi.sh +++ b/lib/jitsi.sh @@ -790,7 +790,6 @@ services: image: mod242/jitsi-go-openid:\${IMAGE_VERSION} container_name: jitsiopenid hostname: jitsiopenid.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/jitsiopenid.sh b/lib/jitsiopenid.sh index 524b953..c4e6a05 100644 --- a/lib/jitsiopenid.sh +++ b/lib/jitsiopenid.sh @@ -21,7 +21,6 @@ services: image: mod242/jitsi-go-openid:\${IMAGE_VERSION} container_name: jitsiopenid hostname: jitsiopenid.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/ldap.sh b/lib/ldap.sh index d4fb0c6..8bf51b1 100644 --- a/lib/ldap.sh +++ b/lib/ldap.sh @@ -26,7 +26,6 @@ services: image: osixia/openldap:\${IMAGE_VERSION} container_name: ldap hostname: ldap.$DOMAIN - domainname: $DOMAIN restart: always working_dir: /root networks: diff --git a/lib/listmonk.sh b/lib/listmonk.sh index 46bd278..b7af9c7 100644 --- a/lib/listmonk.sh +++ b/lib/listmonk.sh @@ -22,7 +22,6 @@ services: image: listmonk/listmonk:\${IMAGE_VERSION} container_name: listmonk hostname: listmonk.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/mail.sh b/lib/mail.sh index cc692fe..0f5000c 100644 --- a/lib/mail.sh +++ b/lib/mail.sh @@ -28,7 +28,6 @@ services: image: docker.io/mailserver/docker-mailserver:\${IMAGE_VERSION} container_name: mail hostname: mail.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/matrix.sh b/lib/matrix.sh index 6b5fbae..422a382 100644 --- a/lib/matrix.sh +++ b/lib/matrix.sh @@ -25,7 +25,6 @@ services: image: matrixdotorg/synapse:\${IMAGE_VERSION} container_name: matrix hostname: matrix.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/matrixsignal.sh b/lib/matrixsignal.sh index 9411217..32c8ff8 100644 --- a/lib/matrixsignal.sh +++ b/lib/matrixsignal.sh @@ -19,7 +19,6 @@ services: image: dock.mau.dev/mautrix/signal:\${IMAGE_VERSION} container_name: matrixsignal hostname: matrixsignal.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/matrixslack.sh b/lib/matrixslack.sh index b13fa75..168460c 100644 --- a/lib/matrixslack.sh +++ b/lib/matrixslack.sh @@ -19,7 +19,6 @@ services: image: dock.mau.dev/mautrix/slack:\${IMAGE_VERSION} container_name: matrixslack hostname: matrixslack.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/matrixwhatsapp.sh b/lib/matrixwhatsapp.sh index 58ebce8..5512438 100644 --- a/lib/matrixwhatsapp.sh +++ b/lib/matrixwhatsapp.sh @@ -19,7 +19,6 @@ services: image: dock.mau.dev/mautrix/whatsapp:\${IMAGE_VERSION} container_name: matrixwhatsapp hostname: matrixwhatsapp.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/msp.sh b/lib/msp.sh index bfa2509..ae8f3bf 100644 --- a/lib/msp.sh +++ b/lib/msp.sh @@ -22,7 +22,6 @@ services: image: thebells1111/federated-msp:\${IMAGE_VERSION} container_name: msp hostname: msp.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/nextcloud.sh b/lib/nextcloud.sh index d01e910..c8826c0 100644 --- a/lib/nextcloud.sh +++ b/lib/nextcloud.sh @@ -26,7 +26,6 @@ services: image: nextcloud:\${IMAGE_VERSION} container_name: nextcloud hostname: nextcloud.$DOMAIN - domainname: $DOMAIN restart: always # working_dir: /var/www/html networks: diff --git a/lib/nginx.sh b/lib/nginx.sh index b8634c4..a3917fd 100644 --- a/lib/nginx.sh +++ b/lib/nginx.sh @@ -20,7 +20,6 @@ services: image: nginx:latest container_name: nginx hostname: nginx.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/panel.sh b/lib/panel.sh index b3d7b58..2f59c12 100644 --- a/lib/panel.sh +++ b/lib/panel.sh @@ -19,7 +19,6 @@ services: image: wheelybird/ldap-user-manager:\${IMAGE_VERSION} container_name: panel hostname: panel.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/pdns.sh b/lib/pdns.sh index c04c381..3ba0919 100644 --- a/lib/pdns.sh +++ b/lib/pdns.sh @@ -19,7 +19,6 @@ services: image: pschiffe/pdns-mysql:\${IMAGE_VERSION} container_name: pdns hostname: pdns.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/pdnsadmin.sh b/lib/pdnsadmin.sh index 7dc97e1..258cf04 100644 --- a/lib/pdnsadmin.sh +++ b/lib/pdnsadmin.sh @@ -19,7 +19,6 @@ services: image: pschiffe/pdns-admin-uwsgi\${IMAGE_VERSION} container_name: pdnsadmin hostname: pdnsadmin.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/pdnsmysql.sh b/lib/pdnsmysql.sh index 6e60ff0..b18286c 100644 --- a/lib/pdnsmysql.sh +++ b/lib/pdnsmysql.sh @@ -19,7 +19,6 @@ services: image: mariadb:\${IMAGE_VERSION} container_name: pdnsmysql hostname: pdnsmysql.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/pdnsstatic.sh b/lib/pdnsstatic.sh index aabeab1..6a01460 100644 --- a/lib/pdnsstatic.sh +++ b/lib/pdnsstatic.sh @@ -30,7 +30,6 @@ services: image: pschiffe/pdns-admin-static\${IMAGE_VERSION} container_name: pdns-static hostname: pdns-static.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/postgresql.sh b/lib/postgresql.sh index bff2e37..243000d 100644 --- a/lib/postgresql.sh +++ b/lib/postgresql.sh @@ -23,7 +23,6 @@ services: image: postgres:\${IMAGE_VERSION} container_name: postgresql hostname: postgresql.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/proxy.sh b/lib/proxy.sh index 89bb173..b8f24a4 100644 --- a/lib/proxy.sh +++ b/lib/proxy.sh @@ -32,7 +32,6 @@ services: image: jwilder/nginx-proxy:\${IMAGE_VERSION} container_name: proxy hostname: proxy.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/redis.sh b/lib/redis.sh index eef840c..bae8bd6 100644 --- a/lib/redis.sh +++ b/lib/redis.sh @@ -20,7 +20,6 @@ services: image: bitnami/redis:\${IMAGE_VERSION} container_name: redis hostname: redis.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/roundcube.sh b/lib/roundcube.sh index 3ad1ae8..4db1247 100644 --- a/lib/roundcube.sh +++ b/lib/roundcube.sh @@ -19,7 +19,6 @@ services: image: roundcube/roundcubemail:\${IMAGE_VERSION} container_name: roundcube hostname: roundcube.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/traefik.sh b/lib/traefik.sh index 37a5369..544870a 100644 --- a/lib/traefik.sh +++ b/lib/traefik.sh @@ -21,7 +21,6 @@ services: image: traefik:\${IMAGE_VERSION} container_name: traefik hostname: traefik.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/vaultwarden.sh b/lib/vaultwarden.sh index e32949e..f3f326d 100644 --- a/lib/vaultwarden.sh +++ b/lib/vaultwarden.sh @@ -21,7 +21,6 @@ services: image: vaultwarden/server:\${IMAGE_VERSION} container_name: vaultwarden hostname: vaultwarden.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/wireguard.sh b/lib/wireguard.sh index c387d59..aac77de 100644 --- a/lib/wireguard.sh +++ b/lib/wireguard.sh @@ -19,7 +19,6 @@ services: image: linuxserver/wireguard:\${IMAGE_VERSION} container_name: wireguard hostname: wireguard.$DOMAIN - domainname: $DOMAIN restart: always networks: core: diff --git a/lib/wordpress.sh b/lib/wordpress.sh index 8f2f88c..0b510dd 100644 --- a/lib/wordpress.sh +++ b/lib/wordpress.sh @@ -23,7 +23,6 @@ services: image: bitnami/wordpress:\${IMAGE_VERSION} container_name: wordpress hostname: wordpress.$DOMAIN - domainname: $DOMAIN restart: always networks: core: