From 9ec16ee1dcfb710896720a7174f82be69dba6539 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 29 Oct 2024 12:55:05 +0000 Subject: [PATCH] Switched network to 192.168 and changed network name to core --- bin/convertdomain | 8 ++++---- bin/convertmmrimport | 2 +- lib/authelia.sh | 10 +++++----- lib/autodiscover.sh | 8 ++++---- lib/baserow.sh | 6 +++--- lib/bookstack.sh | 8 ++++---- lib/caddy.sh | 8 ++++---- lib/calcom.sh | 8 ++++---- lib/castopod.sh | 8 ++++---- lib/collabora.sh | 8 ++++---- lib/connector.sh | 8 ++++---- lib/coturn.sh | 8 ++++---- lib/dashboard.sh | 8 ++++---- lib/discourse.sh | 12 +++++------ lib/dns.sh | 6 +++--- lib/element.sh | 8 ++++---- lib/espocrm.sh | 8 ++++---- lib/freescout.sh | 8 ++++---- lib/functions.sh | 6 +++--- lib/gitea.sh | 8 ++++---- lib/jitsi.sh | 26 ++++++++++++------------ lib/jitsiopenid.sh | 8 ++++---- lib/ldap.sh | 8 ++++---- lib/listmonk.sh | 8 ++++---- lib/mail.sh | 10 +++++----- lib/matrix.sh | 8 ++++---- lib/matrixsignal.sh | 12 +++++------ lib/matrixslack.sh | 12 +++++------ lib/matrixwhatsapp.sh | 12 +++++------ lib/msp.sh | 8 ++++---- lib/nextcloud.sh | 10 +++++----- lib/nginx.sh | 12 +++++------ lib/panel.sh | 8 ++++---- lib/pdns.sh | 12 +++++------ lib/pdnsadmin.sh | 8 ++++---- lib/pdnsmysql.sh | 8 ++++---- lib/pdnsstatic.sh | 8 ++++---- lib/postgresql.sh | 8 ++++---- lib/proxy.sh | 8 ++++---- lib/redis.sh | 8 ++++---- lib/roundcube.sh | 8 ++++---- lib/traefik.sh | 6 +++--- lib/vaultwarden.sh | 8 ++++---- lib/wireguard.sh | 46 +++++++++++++++++++++---------------------- lib/wordpress.sh | 8 ++++---- 45 files changed, 216 insertions(+), 216 deletions(-) diff --git a/bin/convertdomain b/bin/convertdomain index b25f0be..4e962c1 100755 --- a/bin/convertdomain +++ b/bin/convertdomain @@ -709,7 +709,7 @@ convert_jitsi() { sed -i "s#DC=federatedcomputer,DC=cloud#DC=$DOMAIN_FIRST,DC=$DOMAIN_LAST#g" /federated/apps/jitsi/.env fi - start_service_convert "jitsi" "nc -z 172.99.0.25 443 &> /dev/null" + start_service_convert "jitsi" "nc -z 192.168.0.25 443 &> /dev/null" echo -ne "done." } @@ -934,8 +934,8 @@ services: domainname: $DOMAIN_NEW restart: always networks: - federated: - ipv4_address: 172.99.0.39 + core: + ipv4_address: 192.168.0.39 env_file: - ./.env volumes: @@ -947,7 +947,7 @@ services: - "traefik.http.routers.espocrm.tls.certresolver=letsencrypt" networks: - federated: + core: external: true EOF diff --git a/bin/convertmmrimport b/bin/convertmmrimport index 15977c0..b6fe54d 100755 --- a/bin/convertmmrimport +++ b/bin/convertmmrimport @@ -148,7 +148,7 @@ unzip -jo /federated/tmp/$HOSTNAME-media-$HOSTNAME.zip -d /federated/tmp/matrixm [ $? -ne 0 ] && failcheck "Couldn't unzip media files into tmp/matrixmedia" # run the matrix-media-repo:latest image and convert / import the media into our matrix server DB -docker run -v /federated/tmp/matrixmedia:/export --network=federated --rm turt2live/matrix-media-repo:latest /usr/local/bin/import_to_synapse -dbHost 172.99.0.14 -dbName matrix -dbUsername matrix -debug -directory /export -serverName $HOSTNAME -dbPassword $MATRIX_SECRET +docker run -v /federated/tmp/matrixmedia:/export --network=federated --rm turt2live/matrix-media-repo:latest /usr/local/bin/import_to_synapse -dbHost 192.168.0.14 -dbName matrix -dbUsername matrix -debug -directory /export -serverName $HOSTNAME -dbPassword $MATRIX_SECRET # Start matrix back up /federated/bin/start matrix diff --git a/lib/authelia.sh b/lib/authelia.sh index c857b29..8072831 100644 --- a/lib/authelia.sh +++ b/lib/authelia.sh @@ -24,8 +24,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.42 + core: + ipv4_address: 192.168.0.42 env_file: - ./.env volumes: @@ -41,7 +41,7 @@ services: - "traefik.http.middlewares.authelia.forwardauth.authResponseHeaders=Remote-User,Remote-Groups,Remote-Name,Remote-Email" networks: - federated: + core: external: true EOF @@ -200,13 +200,13 @@ echo -ne "done." } start_authelia() { # Start service with command to make sure it's up before proceeding - start_service "authelia" "nc -z 172.99.0.42 9091 &> /dev/null" "7" + start_service "authelia" "nc -z 192.168.0.42 9091 &> /dev/null" "7" docker exec pdns pdnsutil add-record $DOMAIN authelia A 86400 $EXTERNALIP &> /dev/null [ $? -ne 0 ] && fail "Couldn't add dns record for authelia" # If extra_hosts doesn't exist then insert extra_host configuration in pdnsadmin - [[ ! $(grep extra_hosts /federated/apps/pdnsadmin/docker-compose.yml 2>/dev/null) ]] && sed -i "/172.99.0.12/a \ extra_hosts:\n\ - \"authelia.$DOMAIN:$EXTERNALIP\"" /federated/apps/pdnsadmin/docker-compose.yml + [[ ! $(grep extra_hosts /federated/apps/pdnsadmin/docker-compose.yml 2>/dev/null) ]] && sed -i "/192.168.0.12/a \ extra_hosts:\n\ - \"authelia.$DOMAIN:$EXTERNALIP\"" /federated/apps/pdnsadmin/docker-compose.yml # Stop and start pdnsadmin for internal dns externalhosts to work /federated/bin/stop pdnsadmin diff --git a/lib/autodiscover.sh b/lib/autodiscover.sh index cc8559e..cf17849 100644 --- a/lib/autodiscover.sh +++ b/lib/autodiscover.sh @@ -24,8 +24,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.32 + core: + ipv4_address: 192.168.0.32 env_file: - ./.env labels: @@ -44,7 +44,7 @@ services: - "traefik.http.services.autodiscovernew.loadbalancer.server.port=8000" networks: - federated: + core: external: true EOF @@ -109,7 +109,7 @@ echo -ne "done." start_autodiscover() { # Start service with command to make sure it's up before proceeding - start_service "autodiscover" "nc -z 172.99.0.32 8000 &> /dev/null" "8" + start_service "autodiscover" "nc -z 192.168.0.32 8000 &> /dev/null" "8" echo -ne "done." } diff --git a/lib/baserow.sh b/lib/baserow.sh index f459857..d65c74d 100644 --- a/lib/baserow.sh +++ b/lib/baserow.sh @@ -25,8 +25,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.29 + core: + ipv4_address: 192.168.0.29 env_file: - ./.env volumes: @@ -38,7 +38,7 @@ services: - "traefik.http.routers.baserow.tls.certresolver=letsencrypt" networks: - federated: + core: external: true EOF diff --git a/lib/bookstack.sh b/lib/bookstack.sh index f5b10b6..d9044b4 100644 --- a/lib/bookstack.sh +++ b/lib/bookstack.sh @@ -22,8 +22,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.36 + core: + ipv4_address: 192.168.0.36 env_file: - ./.env volumes: @@ -35,7 +35,7 @@ services: - "traefik.http.routers.bookstack.tls.certresolver=letsencrypt" networks: - federated: + core: external: true EOF @@ -75,7 +75,7 @@ echo -ne "done.\n" } start_bookstack() { # Start service with command to make sure it's up before proceeding - start_service "bookstack" "nc -z 172.99.0.36 80 &> /dev/null" "7" + start_service "bookstack" "nc -z 192.168.0.36 80 &> /dev/null" "7" docker exec pdns pdnsutil add-record $DOMAIN bookstack A 86400 $EXTERNALIP &> /dev/null [ $? -ne 0 ] && fail "Couldn't add dns record for bookstack" diff --git a/lib/caddy.sh b/lib/caddy.sh index 245eaff..382f4eb 100644 --- a/lib/caddy.sh +++ b/lib/caddy.sh @@ -25,8 +25,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.31 + core: + ipv4_address: 192.168.0.31 extra_hosts: - "gitea.$DOMAIN:$EXTERNALIP" env_file: @@ -42,7 +42,7 @@ services: - "traefik.http.routers.caddy.tls.certresolver=letsencrypt" networks: - federated: + core: external: true EOF @@ -199,7 +199,7 @@ uninstall_caddy() { } start_caddy() { # Start service with command and retry amount to make sure it's up before proceeding - start_service "caddy" "nc -z 172.99.0.31 80 &> /dev/null" "7" + start_service "caddy" "nc -z 192.168.0.31 80 &> /dev/null" "7" echo -ne "done." } diff --git a/lib/calcom.sh b/lib/calcom.sh index 63a93e8..2149c54 100644 --- a/lib/calcom.sh +++ b/lib/calcom.sh @@ -27,8 +27,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.29 + core: + ipv4_address: 192.168.0.29 # build: # context: . # dockerfile: Dockerfile @@ -42,7 +42,7 @@ services: env_file: ./.env networks: - federated: + core: external: true EOF @@ -77,7 +77,7 @@ echo -ne "done." start_calcom() { # Start service with command to make sure it's up before proceeding - start_service "calcom" "nc -z 172.99.0.29 3000 &> /dev/null" + start_service "calcom" "nc -z 192.168.0.29 3000 &> /dev/null" kill -9 $SPINPID &> /dev/null echo -ne "done." diff --git a/lib/castopod.sh b/lib/castopod.sh index 979ce1e..7e91390 100644 --- a/lib/castopod.sh +++ b/lib/castopod.sh @@ -24,8 +24,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.33 + core: + ipv4_address: 192.168.0.33 volumes: - ./data/var/www/castopod/public/media:/var/www/castopod/public/media env_file: @@ -38,7 +38,7 @@ services: - "traefik.http.services.castopod.loadbalancer.server.port=8000" networks: - federated: + core: external: true EOF @@ -72,7 +72,7 @@ echo -ne "done." } start_castopod() { # Start service with command to make sure it's up before proceeding - start_service "castopod" "nc -z 172.99.0.33 8000 &> /dev/null" "7" + start_service "castopod" "nc -z 192.168.0.33 8000 &> /dev/null" "7" CASTOPOD_BASE_URL="https://castopod.$DOMAIN" CASTOPOD_ADMIN_USERNAME="admin@$DOMAIN" diff --git a/lib/collabora.sh b/lib/collabora.sh index 098c60a..b6a183f 100644 --- a/lib/collabora.sh +++ b/lib/collabora.sh @@ -26,8 +26,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.17 + core: + ipv4_address: 192.168.0.17 extra_hosts: - "nextcloud.$DOMAIN:$EXTERNALIP" ports: @@ -49,7 +49,7 @@ services: - "traefik.http.services.collabora.loadbalancer.server.port=9980" networks: - federated: + core: external: true EOF @@ -69,7 +69,7 @@ echo -ne "done." } start_collabora() { # Start service with command to make sure it's up before proceeding - start_service "collabora" "nc -z 172.99.0.17 9980 &> /dev/null" "25" + start_service "collabora" "nc -z 192.168.0.17 9980 &> /dev/null" "25" echo -ne "done." } diff --git a/lib/connector.sh b/lib/connector.sh index ba321e7..619d562 100644 --- a/lib/connector.sh +++ b/lib/connector.sh @@ -28,8 +28,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.27 + core: + ipv4_address: 192.168.0.27 ports: - 3000:3000 env_file: @@ -38,7 +38,7 @@ services: - ./data/source/public/downloads:/source/public/downloads networks: - federated: + core: external: true EOF @@ -81,7 +81,7 @@ start_connector() { # before we proceed RETRY="30" while [ $RETRY -gt 0 ]; do - nc -z 172.99.0.27 3000 &> /dev/null + nc -z 192.168.0.27 3000 &> /dev/null if [ $? -eq 0 ]; then break else diff --git a/lib/coturn.sh b/lib/coturn.sh index 414ca4c..beffd0f 100644 --- a/lib/coturn.sh +++ b/lib/coturn.sh @@ -24,8 +24,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.35 + core: + ipv4_address: 192.168.0.35 env_file: - ./.env volumes: @@ -38,7 +38,7 @@ services: - 3479:3479/udp networks: - federated: + core: external: true EOF @@ -77,7 +77,7 @@ echo -ne "done." } start_coturn() { # Start service with command to make sure it's up before proceeding - start_service "coturn" "nc -z 172.99.0.35 3478 &> /dev/null" "7" + start_service "coturn" "nc -z 192.168.0.35 3478 &> /dev/null" "7" echo -ne "done." } diff --git a/lib/dashboard.sh b/lib/dashboard.sh index 09a9b59..7ccaebe 100644 --- a/lib/dashboard.sh +++ b/lib/dashboard.sh @@ -23,8 +23,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.41 + core: + ipv4_address: 192.168.0.41 env_file: - ./.env labels: @@ -34,7 +34,7 @@ services: - "traefik.http.routers.dashboard.tls.certresolver=letsencrypt" networks: - federated: + core: external: true EOF @@ -63,7 +63,7 @@ echo -ne "done." } start_dashboard() { # Start service with command to make sure it's up before proceeding - start_service "dashboard" "nc -z 172.99.0.41 8080 &> /dev/null" "7" + start_service "dashboard" "nc -z 192.168.0.41 8080 &> /dev/null" "7" docker exec pdns pdnsutil add-record $DOMAIN dashboard A 86400 $EXTERNALIP &> /dev/null [ $? -ne 0 ] && fail "Couldn't add dns record for dashboard" diff --git a/lib/discourse.sh b/lib/discourse.sh index 8726b94..0c8806c 100644 --- a/lib/discourse.sh +++ b/lib/discourse.sh @@ -23,8 +23,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.43 + core: + ipv4_address: 192.168.0.43 env_file: - ./.env volumes: @@ -42,8 +42,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.44 + core: + ipv4_address: 192.168.0.44 env_file: - ./.env depends_on: @@ -53,7 +53,7 @@ services: command: /opt/bitnami/scripts/discourse-sidekiq/run.sh networks: - federated: + core: external: true EOF @@ -103,7 +103,7 @@ echo -ne "done.\n" } start_discourse() { # Start service with command to make sure it's up before proceeding - start_service "discourse" "nc -z 172.99.0.43 8080 &> /dev/null" "7" + start_service "discourse" "nc -z 192.168.0.43 8080 &> /dev/null" "7" docker exec pdns pdnsutil add-record $DOMAIN discourse A 86400 $EXTERNALIP &> /dev/null [ $? -ne 0 ] && fail "Couldn't add dns record for discourse" diff --git a/lib/dns.sh b/lib/dns.sh index df1615d..727d2e7 100644 --- a/lib/dns.sh +++ b/lib/dns.sh @@ -26,8 +26,8 @@ services: restart: always working_dir: /root networks: - federated: - ipv4_address: 172.99.0.10 + core: + ipv4_address: 192.168.0.10 volumes: - ./data/etc/bind:/etc/bind - ./data/etc/letsencrypt:/etc/letsencrypt @@ -39,7 +39,7 @@ services: command: [ "/root/dns-cert.sh" ] networks: - federated: + core: external: true EOF diff --git a/lib/element.sh b/lib/element.sh index f9da96f..75cd4dc 100644 --- a/lib/element.sh +++ b/lib/element.sh @@ -22,8 +22,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.20 + core: + ipv4_address: 192.168.0.20 volumes: - ./data/element/element-config.json:/app/config.json env_file: @@ -35,7 +35,7 @@ services: - "traefik.http.routers.element.tls.certresolver=letsencrypt" networks: - federated: + core: external: true EOF @@ -127,7 +127,7 @@ echo -ne "done." } start_element() { # Start service with command to make sure it's up before proceeding - start_service "element" "nc -z 172.99.0.20 80 &> /dev/null" "7" + start_service "element" "nc -z 192.168.0.20 80 &> /dev/null" "7" echo -ne "done." } diff --git a/lib/espocrm.sh b/lib/espocrm.sh index cc1086d..944ed1e 100644 --- a/lib/espocrm.sh +++ b/lib/espocrm.sh @@ -23,8 +23,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.39 + core: + ipv4_address: 192.168.0.39 env_file: - ./.env volumes: @@ -36,7 +36,7 @@ services: - "traefik.http.routers.espocrm.tls.certresolver=letsencrypt" networks: - federated: + core: external: true EOF @@ -90,7 +90,7 @@ echo -ne "done.\n" } start_espocrm() { # Start service with command to make sure it's up before proceeding - start_service "espocrm" "nc -z 172.99.0.39 80 &> /dev/null" "15" + start_service "espocrm" "nc -z 192.168.0.39 80 &> /dev/null" "15" docker exec pdns pdnsutil add-record $DOMAIN espocrm A 86400 $EXTERNALIP &> /dev/null [ $? -ne 0 ] && fail "Couldn't add dns record for espocrm" diff --git a/lib/freescout.sh b/lib/freescout.sh index 0bb6d82..345ac37 100644 --- a/lib/freescout.sh +++ b/lib/freescout.sh @@ -23,8 +23,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.37 + core: + ipv4_address: 192.168.0.37 env_file: - ./.env volumes: @@ -37,7 +37,7 @@ services: - "traefik.http.routers.freescout.tls.certresolver=letsencrypt" networks: - federated: + core: external: true EOF @@ -76,7 +76,7 @@ echo -ne "done.\n" } start_freescout() { # Start service with command to make sure it's up before proceeding - start_service "freescout" "nc -z 172.99.0.37 80 &> /dev/null" "7" + start_service "freescout" "nc -z 192.168.0.37 80 &> /dev/null" "7" docker exec pdns pdnsutil add-record $DOMAIN freescout A 86400 $EXTERNALIP &> /dev/null [ $? -ne 0 ] && fail "Couldn't add dns record for freescout" diff --git a/lib/functions.sh b/lib/functions.sh index 2ef28e2..548b6ec 100644 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -1717,12 +1717,12 @@ It's your computer. Let's make it work for you! EOF } config_network() { - echo -ne "\n* Configuring federated network.." + echo -ne "\n* Configuring core network.." spin & SPINPID=$! - if [ ! `docker network ls -q --filter name=federated` ]; then - docker network create --subnet 172.99.0.0/16 federated &> /dev/null + if [ ! `docker network ls -q --filter name=core` ]; then + docker network create --subnet 192.168.0.0/16 core &> /dev/null [ $? -ne 0 ] && fail "Couldn't run docker network create" fi diff --git a/lib/gitea.sh b/lib/gitea.sh index 7646a13..0353120 100644 --- a/lib/gitea.sh +++ b/lib/gitea.sh @@ -26,8 +26,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.30 + core: + ipv4_address: 192.168.0.30 extra_hosts: - "caddy.$DOMAIN:$EXTERNALIP" - "blog.$DOMAIN:$EXTERNALIP" @@ -50,7 +50,7 @@ services: - "traefik.http.services.gitea.loadbalancer.server.port=3000" networks: - federated: + core: external: true EOF @@ -274,7 +274,7 @@ uninstall_gitea() { } start_gitea() { # Start service with command to make sure it's up before proceeding - start_service "gitea" "nc -z 172.99.0.30 3000 &> /dev/null" "7" + start_service "gitea" "nc -z 192.168.0.30 3000 &> /dev/null" "7" # Copy creategitea.sh inside gitea container mv /federated/apps/gitea/data/creategitea.sh /federated/apps/gitea/data/data/creategitea.sh diff --git a/lib/jitsi.sh b/lib/jitsi.sh index 073e6c3..8690062 100644 --- a/lib/jitsi.sh +++ b/lib/jitsi.sh @@ -177,8 +177,8 @@ services: - XMPP_RECORDER_DOMAIN - XMPP_PORT networks: - federated: - ipv4_address: 172.99.0.25 + core: + ipv4_address: 192.168.0.25 # XMPP server prosody: @@ -272,8 +272,8 @@ services: - XMPP_RECORDER_DOMAIN - XMPP_PORT networks: - federated: - ipv4_address: 172.99.0.26 + core: + ipv4_address: 192.168.0.26 aliases: - xmpp.meet.jitsi - xmpp.$DOMAIN @@ -326,8 +326,8 @@ services: depends_on: - prosody networks: - federated: - ipv4_address: 172.99.0.27 + core: + ipv4_address: 192.168.0.27 # Video bridge jvb: @@ -371,11 +371,11 @@ services: depends_on: - prosody networks: - federated: - ipv4_address: 172.99.0.28 + core: + ipv4_address: 192.168.0.28 networks: - federated: + core: external: true EOF @@ -735,7 +735,7 @@ uninstall_jitsi() { } start_jitsi() { # Start service with command to make sure it's up before proceeding - start_service "jitsi" "nc -z 172.99.0.25 443 &> /dev/null" "8" + start_service "jitsi" "nc -z 192.168.0.25 443 &> /dev/null" "8" echo -ne "done." } @@ -793,8 +793,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.46 + core: + ipv4_address: 192.168.0.46 extra_hosts: - "authelia.$DOMAIN:$EXTERNALIP" env_file: @@ -811,7 +811,7 @@ services: - "traefik.http.routers.jitsiopenid.tls.certresolver=letsencrypt" networks: - federated: + core: external: true EOF diff --git a/lib/jitsiopenid.sh b/lib/jitsiopenid.sh index 092c63a..524b953 100644 --- a/lib/jitsiopenid.sh +++ b/lib/jitsiopenid.sh @@ -24,8 +24,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.46 + core: + ipv4_address: 192.168.0.46 extra_hosts: - "authelia.$DOMAIN:$EXTERNALIP" env_file: @@ -42,7 +42,7 @@ services: - "traefik.http.routers.jitsiopenid.tls.certresolver=letsencrypt" networks: - federated: + core: external: true EOF @@ -68,7 +68,7 @@ echo -ne "done." } start_jitsiopenid() { # Start service with command to make sure it's up before proceeding - start_service "jitsiopenid" "nc -z 172.99.0.46 3001 &> /dev/null" "7" + start_service "jitsiopenid" "nc -z 192.168.0.46 3001 &> /dev/null" "7" echo -ne "done." } diff --git a/lib/ldap.sh b/lib/ldap.sh index 2800dd9..d4fb0c6 100644 --- a/lib/ldap.sh +++ b/lib/ldap.sh @@ -30,8 +30,8 @@ services: restart: always working_dir: /root networks: - federated: - ipv4_address: 172.99.0.15 + core: + ipv4_address: 192.168.0.15 volumes: - ./data/var/lib/ldap:/var/lib/ldap - ./data/etc/ldap/slapd.d:/etc/ldap/slapd.d @@ -46,7 +46,7 @@ secrets: federated_ldap_password: file: ./.ldap.secret networks: - federated: + core: external: true EOF @@ -180,7 +180,7 @@ echo -ne "done." } start_ldap() { # Start service with command to make sure it's up before proceeding - start_service "ldap" "nc -z 172.99.0.15 636 &> /dev/null" "60" + start_service "ldap" "nc -z 192.168.0.15 636 &> /dev/null" "60" # Run our ldap.sh script inside the ldap container # This imports the inital LDAP configuration diff --git a/lib/listmonk.sh b/lib/listmonk.sh index d027a29..46bd278 100644 --- a/lib/listmonk.sh +++ b/lib/listmonk.sh @@ -25,8 +25,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.21 + core: + ipv4_address: 192.168.0.21 env_file: - ./.env volumes: @@ -40,7 +40,7 @@ services: - "traefik.http.routers.listmonk.tls.certresolver=letsencrypt" networks: - federated: + core: external: true EOF @@ -86,7 +86,7 @@ start_listmonk() { docker exec postgresql psql -U listmonk -c "update settings set value='[{\"host\": \"mail.$DOMAIN\", \"port\": 587, \"enabled\": true, \"password\": \"$ADMINPASS\", \"tls_type\": \"STARTTLS\", \"username\": \"fcore\", \"max_conns\": 10, \"idle_timeout\": \"15s\", \"wait_timeout\": \"5s\", \"auth_protocol\": \"login\", \"email_headers\": [], \"hello_hostname\": \"\", \"max_msg_retries\": 2, \"tls_skip_verify\": false}, {\"host\": \"smtp.gmail.com\", \"port\": 465, \"enabled\": false, \"password\": \"password\", \"tls_type\": \"TLS\", \"username\": \"username@gmail.com\", \"max_conns\": 10, \"idle_timeout\": \"15s\", \"wait_timeout\": \"5s\", \"auth_protocol\": \"login\", \"email_headers\": [], \"hello_hostname\": \"\", \"max_msg_retries\": 2, \"tls_skip_verify\": false}]' where key='smtp';" &> /dev/null # Start service with command to make sure it's up before proceeding - start_service "listmonk" "nc -z 172.99.0.21 9000 &> /dev/null" "8" + start_service "listmonk" "nc -z 192.168.0.21 9000 &> /dev/null" "8" docker exec pdns pdnsutil add-record $DOMAIN listmonk A 86400 $EXTERNALIP &> /dev/null [ $? -ne 0 ] && fail "Couldn't add dns record" diff --git a/lib/mail.sh b/lib/mail.sh index a7f9040..cc692fe 100644 --- a/lib/mail.sh +++ b/lib/mail.sh @@ -31,8 +31,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.16 + core: + ipv4_address: 192.168.0.16 ports: - "25:25" - "143:143" @@ -56,7 +56,7 @@ services: - SYS_PTRACE networks: - federated: + core: external: true EOF @@ -246,7 +246,7 @@ maxretry = 12 # "ignoreip" can be a list of IP addresses, CIDR masks or DNS hosts. Fail2ban # will not ban a host which matches an address in this list. Several addresses # can be defined using space (and/or comma) separator. -ignoreip = 127.0.0.1/8,172.99.0.0/16 +ignoreip = 127.0.0.1/8,192.168.0.0/16 # default ban action # nftables-multiport: block IP only on affected port @@ -274,7 +274,7 @@ EOF } start_mail() { # Start service with command to make sure it's up before proceeding - start_service "mail" "nc -z 172.99.0.16 25 &> /dev/null" "25" + start_service "mail" "nc -z 192.168.0.16 25 &> /dev/null" "25" # Generate the DKIM DNS key and setup docker exec mail setup config dkim diff --git a/lib/matrix.sh b/lib/matrix.sh index 9d317b8..6b5fbae 100644 --- a/lib/matrix.sh +++ b/lib/matrix.sh @@ -28,8 +28,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.19 + core: + ipv4_address: 192.168.0.19 volumes: - ./data/matrix:/data extra_hosts: @@ -43,7 +43,7 @@ services: - "traefik.http.routers.matrix.tls.certresolver=letsencrypt" networks: - federated: + core: external: true EOF @@ -127,7 +127,7 @@ echo -ne "done." } start_matrix() { # Start service with command to make sure it's up before proceeding - start_service "matrix" "nc -z 172.99.0.19 8008 &> /dev/null" "8" + start_service "matrix" "nc -z 192.168.0.19 8008 &> /dev/null" "8" # Set permissions chown -R 991:991 /federated/apps/matrix/data/matrix diff --git a/lib/matrixsignal.sh b/lib/matrixsignal.sh index 13bea51..9411217 100644 --- a/lib/matrixsignal.sh +++ b/lib/matrixsignal.sh @@ -22,8 +22,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.81 + core: + ipv4_address: 192.168.0.81 env_file: - ./.env volumes: @@ -35,7 +35,7 @@ services: - "traefik.http.routers.matrixsignal.tls.certresolver=letsencrypt" networks: - federated: + core: external: true EOF @@ -50,8 +50,8 @@ EOF chmod 600 /federated/apps/matrixsignal/.env # Change config values in config.yaml -sed -i '0,/address:.*/s//address: http:\/\/172.99.0.19:8008/' /federated/apps/matrixsignal/data/config.yaml -sed -i "s/localhost/172.99.0.81/g" /federated/apps/matrixsignal/data/config.yaml +sed -i '0,/address:.*/s//address: http:\/\/192.168.0.19:8008/' /federated/apps/matrixsignal/data/config.yaml +sed -i "s/localhost/192.168.0.81/g" /federated/apps/matrixsignal/data/config.yaml sed -i "s#domain:.*#domain: matrix.$DOMAIN#g" /federated/apps/matrixsignal/data/config.yaml sed -i "s#uri:.*#uri: postgres://matrixsignal:$MATRIXSIGNAL_SECRET@postgresql.$DOMAIN/matrixsignal?sslmode=disable#g" /federated/apps/matrixsignal/data/config.yaml sed -i "s/example.com/matrix.$DOMAIN/g" /federated/apps/matrixsignal/data/config.yaml @@ -78,7 +78,7 @@ echo -ne "done." } start_matrixsignal() { # Start service with command to make sure it's up before proceeding - start_service "matrixsignal" "nc -z 172.99.0.81 29328 &> /dev/null" "7" + start_service "matrixsignal" "nc -z 192.168.0.81 29328 &> /dev/null" "7" echo -ne "done." } diff --git a/lib/matrixslack.sh b/lib/matrixslack.sh index 076904b..b13fa75 100644 --- a/lib/matrixslack.sh +++ b/lib/matrixslack.sh @@ -22,8 +22,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.80 + core: + ipv4_address: 192.168.0.80 env_file: - ./.env volumes: @@ -35,7 +35,7 @@ services: - "traefik.http.routers.matrixslack.tls.certresolver=letsencrypt" networks: - federated: + core: external: true EOF @@ -50,8 +50,8 @@ EOF chmod 600 /federated/apps/matrixslack/.env # Change config values in config.yaml -sed -i '0,/address:.*/s//address: http:\/\/172.99.0.19:8008/' /federated/apps/matrixslack/data/config.yaml -sed -i "s/localhost/172.99.0.80/g" /federated/apps/matrixslack/data/config.yaml +sed -i '0,/address:.*/s//address: http:\/\/192.168.0.19:8008/' /federated/apps/matrixslack/data/config.yaml +sed -i "s/localhost/192.168.0.80/g" /federated/apps/matrixslack/data/config.yaml sed -i "s#domain:.*#domain: matrix.$DOMAIN#g" /federated/apps/matrixslack/data/config.yaml sed -i "s#uri:.*#uri: postgres://matrixslack:$MATRIXSLACK_SECRET@postgresql.$DOMAIN/matrixslack?sslmode=disable#g" /federated/apps/matrixslack/data/config.yaml sed -i "s/example.com/matrix.$DOMAIN/g" /federated/apps/matrixslack/data/config.yaml @@ -78,7 +78,7 @@ echo -ne "done." } start_matrixslack() { # Start service with command to make sure it's up before proceeding - start_service "matrixslack" "nc -z 172.99.0.80 29335 &> /dev/null" "7" + start_service "matrixslack" "nc -z 192.168.0.80 29335 &> /dev/null" "7" echo -ne "done." } diff --git a/lib/matrixwhatsapp.sh b/lib/matrixwhatsapp.sh index 285f38b..58ebce8 100644 --- a/lib/matrixwhatsapp.sh +++ b/lib/matrixwhatsapp.sh @@ -22,8 +22,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.82 + core: + ipv4_address: 192.168.0.82 env_file: - ./.env volumes: @@ -35,7 +35,7 @@ services: - "traefik.http.routers.matrixwhatsapp.tls.certresolver=letsencrypt" networks: - federated: + core: external: true EOF @@ -50,8 +50,8 @@ EOF chmod 600 /federated/apps/matrixwhatsapp/.env # Change config values in config.yaml -sed -i '0,/address:.*/s//address: http:\/\/172.99.0.19:8008/' /federated/apps/matrixwhatsapp/data/config.yaml -sed -i "s/localhost/172.99.0.82/g" /federated/apps/matrixwhatsapp/data/config.yaml +sed -i '0,/address:.*/s//address: http:\/\/192.168.0.19:8008/' /federated/apps/matrixwhatsapp/data/config.yaml +sed -i "s/localhost/192.168.0.82/g" /federated/apps/matrixwhatsapp/data/config.yaml sed -i "s#domain:.*#domain: matrix.$DOMAIN#g" /federated/apps/matrixwhatsapp/data/config.yaml sed -i "s#uri:.*#uri: postgres://matrixwhatsapp:$MATRIXWHATSAPP_SECRET@postgresql.$DOMAIN/matrixwhatsapp?sslmode=disable#g" /federated/apps/matrixwhatsapp/data/config.yaml sed -i "s/example.com/matrix.$DOMAIN/g" /federated/apps/matrixwhatsapp/data/config.yaml @@ -78,7 +78,7 @@ echo -ne "done." } start_matrixwhatsapp() { # Start service with command to make sure it's up before proceeding - start_service "matrixwhatsapp" "nc -z 172.99.0.81 29328 &> /dev/null" "7" + start_service "matrixwhatsapp" "nc -z 192.168.0.81 29328 &> /dev/null" "7" echo -ne "done." } diff --git a/lib/msp.sh b/lib/msp.sh index a32572d..bfa2509 100644 --- a/lib/msp.sh +++ b/lib/msp.sh @@ -25,8 +25,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.38 + core: + ipv4_address: 192.168.0.38 volumes: - ./data/var/docker/msp/credentials:/usr/src/app/msp/credentials - ./data/var/docker/msp/mspDB:/usr/src/app/msp/mspDB @@ -49,7 +49,7 @@ services: - "traefik.http.services.mspnew.loadbalancer.server.port=3000" networks: - federated: + core: external: true EOF @@ -62,7 +62,7 @@ echo -ne "done.\n" } start_msp() { # Start service with command to make sure it's up before proceeding - start_service "msp" "nc -z 172.99.0.38 3000 &> /dev/null" "7" + start_service "msp" "nc -z 192.168.0.38 3000 &> /dev/null" "7" docker exec pdns pdnsutil add-record $DOMAIN msp A 86400 $EXTERNALIP &> /dev/null [ $? -ne 0 ] && fail "Couldn't add dns record for msp" diff --git a/lib/nextcloud.sh b/lib/nextcloud.sh index bd4a933..d01e910 100644 --- a/lib/nextcloud.sh +++ b/lib/nextcloud.sh @@ -30,8 +30,8 @@ services: restart: always # working_dir: /var/www/html networks: - federated: - ipv4_address: 172.99.0.18 + core: + ipv4_address: 192.168.0.18 extra_hosts: - "collabora.$DOMAIN:$EXTERNALIP" volumes: @@ -71,7 +71,7 @@ secrets: federated_nextcloud_password: file: ./.nextcloud.secret networks: - federated: + core: external: true EOF @@ -90,7 +90,7 @@ IMAGE_VERSION=29.0.0 NEXTCLOUD_UPDATE=1 PHP_MEMORY_LIMIT=2048M PHP_UPLOAD_LIMIT=2048M -TRUSTED_PROXIES=172.99.0.0/16 +TRUSTED_PROXIES=192.168.0.0/16 NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.$DOMAIN NEXTCLOUD_ADMIN_USER=nextcloud NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/federated_nextcloud_password @@ -277,7 +277,7 @@ chmod +x /federated/apps/nextcloud/data/config.sh } start_nextcloud() { # Start service with command to make sure it's up before proceeding - start_service "nextcloud" "nc -z 172.99.0.18 80 &> /dev/null" "60" + start_service "nextcloud" "nc -z 192.168.0.18 80 &> /dev/null" "60" # Move config.sh and sidemenu config, set config.sh executable mv /federated/apps/nextcloud/data/config.sh /federated/apps/nextcloud/data/configs.json /federated/apps/nextcloud/data/var/www/html/ diff --git a/lib/nginx.sh b/lib/nginx.sh index 19061b4..b8634c4 100644 --- a/lib/nginx.sh +++ b/lib/nginx.sh @@ -23,8 +23,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.40 + core: + ipv4_address: 192.168.0.40 volumes: - ./data/etc/nginx/conf.d/matrix.conf:/etc/nginx/conf.d/matrix.conf labels: @@ -34,7 +34,7 @@ services: - "traefik.http.routers.nginx.tls.certresolver=letsencrypt" networks: - federated: + core: external: true EOF @@ -44,13 +44,13 @@ server { listen 80 default_server; server_name matrix.$DOMAIN; location / { - proxy_pass http://172.99.0.19:8008; + proxy_pass http://192.168.0.19:8008; proxy_set_header X-Forwarded-For \$remote_addr; client_max_body_size 128m; } location /_matrix { - proxy_pass http://172.99.0.19:8008; + proxy_pass http://192.168.0.19:8008; proxy_set_header X-Forwarded-For \$remote_addr; client_max_body_size 128m; } @@ -75,7 +75,7 @@ echo -ne "done." } start_nginx() { # Start service with command to make sure it's up before proceeding - start_service "nginx" "nc -z 172.99.0.40 80 &> /dev/null" "7" + start_service "nginx" "nc -z 192.168.0.40 80 &> /dev/null" "7" echo -ne "done." } diff --git a/lib/panel.sh b/lib/panel.sh index 87a8c44..b3d7b58 100644 --- a/lib/panel.sh +++ b/lib/panel.sh @@ -22,8 +22,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.23 + core: + ipv4_address: 192.168.0.23 env_file: - ./.env volumes: @@ -35,7 +35,7 @@ services: - "traefik.http.routers.panel.tls.certresolver=letsencrypt" networks: - federated: + core: external: true EOF @@ -76,7 +76,7 @@ echo -ne "done." } start_panel() { # Start service with command to make sure it's up before proceeding - start_service "panel" "nc -z 172.99.0.23 80 &> /dev/null" "7" + start_service "panel" "nc -z 192.168.0.23 80 &> /dev/null" "7" echo -ne "done." } diff --git a/lib/pdns.sh b/lib/pdns.sh index 91879e1..c04c381 100644 --- a/lib/pdns.sh +++ b/lib/pdns.sh @@ -22,8 +22,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.11 + core: + ipv4_address: 192.168.0.11 ports: - "53:53" - "53:53/udp" @@ -33,7 +33,7 @@ services: - ./data/root:/root networks: - federated: + core: external: true EOF @@ -54,7 +54,7 @@ PDNS_api=yes PDNS_api_key=$PDNS_APIKEY PDNSCONF_API_KEY=$PDNS_APIKEY PDNS_webserver=yes -PDNS_webserver-allow-from=127.0.0.1,10.0.0.0/8,172.0.0.0/8,192.0.0.0/24,172.99.0.0/16 +PDNS_webserver-allow-from=127.0.0.1,10.0.0.0/8,172.0.0.0/8,192.0.0.0/24,192.168.0.0/16 PDNS_webserver_address=0.0.0.0 PDNS_webserver_password=$PDNS_WEBSERVER_PASSWORD PDNS_version_string=anonymous @@ -62,7 +62,7 @@ PDNS_default_ttl=1500 PDNS_allow_notify_from=0.0.0.0 PDNS_allow_axfr_ips=127.0.0.1 PDNS_default_soa_content=ns1.@ hostmaster.@ 0 10800 3600 604800 3600 -PDNS_allow_dnsupdate_from=127.0.0.0/8,::1,172.99.0.0/16 +PDNS_allow_dnsupdate_from=127.0.0.0/8,::1,192.168.0.0/16 PDNS_dnsupdate=yes EOF chmod 600 /federated/apps/pdns/.env @@ -100,7 +100,7 @@ echo -ne "done." } start_pdns() { # Start service with command to make sure it's up before proceeding - start_service "pdns" "nc -z 172.99.0.11 8081 &> /dev/null" "7" + start_service "pdns" "nc -z 192.168.0.11 8081 &> /dev/null" "7" # Create DNS records for newdomain # docker exec pdns pdnsutil create-zone $DOMAIN diff --git a/lib/pdnsadmin.sh b/lib/pdnsadmin.sh index c441b3f..7dc97e1 100644 --- a/lib/pdnsadmin.sh +++ b/lib/pdnsadmin.sh @@ -22,8 +22,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.12 + core: + ipv4_address: 192.168.0.12 env_file: - ./.env volumes: @@ -35,7 +35,7 @@ services: - "traefik.http.routers.pdnsadmin.tls.certresolver=letsencrypt" networks: - federated: + core: external: true EOF @@ -91,7 +91,7 @@ echo -ne "done." } start_pdnsadmin() { # Start service with command to make sure it's up before proceeding - start_service "pdnsadmin" "nc -z 172.99.0.12 9494 &> /dev/null" "8" + start_service "pdnsadmin" "nc -z 192.168.0.12 9494 &> /dev/null" "8" # Run MySQL command to create admin user for pdns admin interface docker exec pdnsmysql bash -c "mysql -updns -p$MYSQL_PASSWORD pdns -e '$PDNS_MYSQL_COMMAND;'" diff --git a/lib/pdnsmysql.sh b/lib/pdnsmysql.sh index 3cd637a..6e60ff0 100644 --- a/lib/pdnsmysql.sh +++ b/lib/pdnsmysql.sh @@ -22,15 +22,15 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.10 + core: + ipv4_address: 192.168.0.10 env_file: - ./.env volumes: - ./data/var/lib/mysql:/var/lib/mysql networks: - federated: + core: external: true EOF @@ -50,7 +50,7 @@ echo -ne "done." } start_pdnsmysql() { # Start service with command to make sure it's up before proceeding - start_service "pdnsmysql" "nc -z 172.99.0.10 3306 &> /dev/null" "8" + start_service "pdnsmysql" "nc -z 192.168.0.10 3306 &> /dev/null" "8" echo -ne "done." } diff --git a/lib/pdnsstatic.sh b/lib/pdnsstatic.sh index 66ad834..aabeab1 100644 --- a/lib/pdnsstatic.sh +++ b/lib/pdnsstatic.sh @@ -33,8 +33,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.7 + core: + ipv4_address: 192.168.0.7 ports: - "8989:80" volumes: @@ -43,7 +43,7 @@ services: - ./.env networks: - federated: + core: external: true EOF @@ -57,7 +57,7 @@ echo -ne "done." } start_pdnsstatic() { # Start service with command to make sure it's up before proceeding - start_service "pdns-static" "nc -z 172.99.0.7 80 &> /dev/null" + start_service "pdns-static" "nc -z 192.168.0.7 80 &> /dev/null" kill -9 $SPINPID &> /dev/null echo -ne "done." diff --git a/lib/postgresql.sh b/lib/postgresql.sh index d12a5e5..bff2e37 100644 --- a/lib/postgresql.sh +++ b/lib/postgresql.sh @@ -26,8 +26,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.14 + core: + ipv4_address: 192.168.0.14 volumes: - ./data/var/lib/postgresql/server.crt:/var/lib/postgresql/server.crt - ./data/var/lib/postgresql/server.key:/var/lib/postgresql/server.key @@ -51,7 +51,7 @@ secrets: federated_psql_password: file: ./.postgresql.secret networks: - federated: + core: external: true EOF @@ -72,7 +72,7 @@ echo -ne "done." } start_postgresql() { # Start service with command to make sure it's up before proceeding - start_service "postgresql" "nc -z 172.99.0.14 5432 &> /dev/null" "18" + start_service "postgresql" "nc -z 192.168.0.14 5432 &> /dev/null" "18" # Tune PostgreSQL # if [[ "$BUNDLE" = "starter" ]]; then diff --git a/lib/proxy.sh b/lib/proxy.sh index 7ce3157..89bb173 100644 --- a/lib/proxy.sh +++ b/lib/proxy.sh @@ -35,8 +35,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.15 + core: + ipv4_address: 192.168.0.15 ports: - "80:80" - "443:443" @@ -48,7 +48,7 @@ services: - ./.env networks: - federated: + core: external: true EOF @@ -67,7 +67,7 @@ echo -ne "done." } start_proxy() { # Start service with command to make sure it's up before proceeding - start_service "proxy" "nc -z 172.99.0.15 443 &> /dev/null" + start_service "proxy" "nc -z 192.168.0.15 443 &> /dev/null" kill -9 $SPINPID &> /dev/null echo -ne "done." diff --git a/lib/redis.sh b/lib/redis.sh index ac3da10..eef840c 100644 --- a/lib/redis.sh +++ b/lib/redis.sh @@ -23,8 +23,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.45 + core: + ipv4_address: 192.168.0.45 env_file: - ./.env volumes: @@ -36,7 +36,7 @@ services: # - "traefik.http.routers.redis.tls.certresolver=letsencrypt" networks: - federated: + core: external: true EOF @@ -54,7 +54,7 @@ echo -ne "done.\n" } start_redis() { # Start service with command to make sure it's up before proceeding - start_service "redis" "nc -z 172.99.0.45 6379 &> /dev/null" "7" + start_service "redis" "nc -z 192.168.0.45 6379 &> /dev/null" "7" kill -9 $SPINPID &> /dev/null echo -ne "done.\n" diff --git a/lib/roundcube.sh b/lib/roundcube.sh index b2539e4..3ad1ae8 100644 --- a/lib/roundcube.sh +++ b/lib/roundcube.sh @@ -22,8 +22,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.47 + core: + ipv4_address: 192.168.0.47 extra_hosts: - "authelia.$DOMAIN:$EXTERNALIP" env_file: @@ -37,7 +37,7 @@ services: - "traefik.http.routers.roundcube.tls.certresolver=letsencrypt" networks: - federated: + core: external: true EOF @@ -68,7 +68,7 @@ echo -ne "done.\n" } start_roundcube() { # Start service with command to make sure it's up before proceeding - start_service "roundcube" "nc -z 172.99.0.47 80 &> /dev/null" "7" + start_service "roundcube" "nc -z 192.168.0.47 80 &> /dev/null" "7" docker exec pdns pdnsutil add-record $DOMAIN roundcube A 86400 $EXTERNALIP &> /dev/null [ $? -ne 0 ] && fail "Couldn't add dns record for roundcube" diff --git a/lib/traefik.sh b/lib/traefik.sh index 007ca59..37a5369 100644 --- a/lib/traefik.sh +++ b/lib/traefik.sh @@ -24,8 +24,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.13 + core: + ipv4_address: 192.168.0.13 command: # Tell Traefik to discover containers using the Docker API - --providers.docker=true @@ -75,7 +75,7 @@ services: - "traefik.http.middlewares.traefik-auth.basicauth.users=$TRAEFIK_HTTPAUTH_STRING" networks: - federated: + core: external: true EOF diff --git a/lib/vaultwarden.sh b/lib/vaultwarden.sh index 39907dd..e32949e 100644 --- a/lib/vaultwarden.sh +++ b/lib/vaultwarden.sh @@ -24,8 +24,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.22 + core: + ipv4_address: 192.168.0.22 env_file: - ./.env volumes: @@ -37,7 +37,7 @@ services: - "traefik.http.routers.vaultwarden.tls.certresolver=letsencrypt" networks: - federated: + core: external: true EOF @@ -69,7 +69,7 @@ echo -ne "done." } start_vaultwarden() { # Start service with command to make sure it's up before proceeding - start_service "vaultwarden" "nc -z 172.99.0.22 80 &> /dev/null" "8" + start_service "vaultwarden" "nc -z 192.168.0.22 80 &> /dev/null" "8" docker exec pdns pdnsutil add-record $DOMAIN vaultwarden A 86400 $EXTERNALIP &> /dev/null [ $? -ne 0 ] && fail "Couldn't add dns record" diff --git a/lib/wireguard.sh b/lib/wireguard.sh index 82d9078..c387d59 100644 --- a/lib/wireguard.sh +++ b/lib/wireguard.sh @@ -22,8 +22,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.24 + core: + ipv4_address: 192.168.0.24 ports: - 51820:51820/udp volumes: @@ -39,7 +39,7 @@ services: - net.ipv4.conf.all.src_valid_mark=1 networks: - federated: + core: external: true EOF @@ -51,7 +51,7 @@ SERVERURL=wireguard.$DOMAIN SERVERPORT=51820 PEERS=1 PEERDNS=auto -ALLOWEDIPS=0.0.0.0/0,::/0,172.99.0.0/16,192.160.0.0/16,10.13.13.1/32 +ALLOWEDIPS=0.0.0.0/0,::/0,192.168.0.0/16,192.160.0.0/16,10.13.13.1/32 LOG_CONFS=true EOF chmod 600 /federated/apps/wireguard/.env @@ -59,24 +59,24 @@ chmod 600 /federated/apps/wireguard/.env cat > /federated/apps/wireguard/data/config/coredns/Corefile < /dev/null" "8" + start_service "wireguard" "nc -uvz 192.168.0.24 51820 &> /dev/null" "8" echo -ne "done." } diff --git a/lib/wordpress.sh b/lib/wordpress.sh index c252e75..8f2f88c 100644 --- a/lib/wordpress.sh +++ b/lib/wordpress.sh @@ -26,8 +26,8 @@ services: domainname: $DOMAIN restart: always networks: - federated: - ipv4_address: 172.99.0.34 + core: + ipv4_address: 192.168.0.34 env_file: - ./.env extra_hosts: @@ -44,7 +44,7 @@ services: - "traefik.http.services.wordpress.loadbalancer.server.port=8080" networks: - federated: + core: external: true EOF @@ -82,7 +82,7 @@ echo -ne "done.\n" } start_wordpress() { # Start service with command to make sure it's up before proceeding - start_service "wordpress" "nc -z 172.99.0.34 8080 &> /dev/null" "7" + start_service "wordpress" "nc -z 192.168.0.34 8080 &> /dev/null" "7" chmod -R 755 /federated/apps/wordpress/data/bitnami/wordpress/wp-content chmod 740 /federated/apps/wordpress/data/bitnami/wordpress/wp-config.php