From ac2e41e2575aa09698b2560004a13674911d079f Mon Sep 17 00:00:00 2001 From: Raine Date: Wed, 10 Jan 2024 01:06:09 +0100 Subject: [PATCH 01/10] feat: firezone --- servers/apoc/docker-compose.d/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/apoc/docker-compose.d/docker-compose.yml b/servers/apoc/docker-compose.d/docker-compose.yml index ba05f0b..220765a 100644 --- a/servers/apoc/docker-compose.d/docker-compose.yml +++ b/servers/apoc/docker-compose.d/docker-compose.yml @@ -7,7 +7,7 @@ services: build: custom/nginx environment: CERTBOT_EMAIL: "webmaster@ixvd.net" - CERTBOT_DOMAINS: "apoc.ixvd.net,mail.ixvd.net,git.ixvd.net,my.ixvd.net,ci.ixvd.net,baikal.ixvd.net,pg.ixvd.net,snipe.ixvd.net" + CERTBOT_DOMAINS: "apoc.ixvd.net,mail.ixvd.net,git.ixvd.net,my.ixvd.net,ci.ixvd.net,baikal.ixvd.net,pg.ixvd.net,snipe.ixvd.net,fz.ixvd.net" volumes: - /srv/certbot/data:/etc/letsencrypt - /srv/certbot/other/www:/var/www/certbot From 9dbfdeeb7add6249b79e3f9db21671b20bae3ebd Mon Sep 17 00:00:00 2001 From: Raine Date: Wed, 10 Jan 2024 01:06:29 +0100 Subject: [PATCH 02/10] feat: firezone yml --- .../custom/nginx/conf.d/firezone.conf | 13 ++++ .../docker-compose.firezone.yml | 66 +++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 servers/apoc/docker-compose.d/custom/nginx/conf.d/firezone.conf create mode 100644 servers/apoc/docker-compose.d/docker-compose.firezone.yml diff --git a/servers/apoc/docker-compose.d/custom/nginx/conf.d/firezone.conf b/servers/apoc/docker-compose.d/custom/nginx/conf.d/firezone.conf new file mode 100644 index 0000000..6f70dc2 --- /dev/null +++ b/servers/apoc/docker-compose.d/custom/nginx/conf.d/firezone.conf @@ -0,0 +1,13 @@ +server { + listen 80; + server_name fz.ixvd.net; + + location / { + proxy_pass http://firezone:13000; + } + + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } +} diff --git a/servers/apoc/docker-compose.d/docker-compose.firezone.yml b/servers/apoc/docker-compose.d/docker-compose.firezone.yml new file mode 100644 index 0000000..ee08656 --- /dev/null +++ b/servers/apoc/docker-compose.d/docker-compose.firezone.yml @@ -0,0 +1,66 @@ +version: '2.2' +# Example compose file for production deployment on Linux. +# +# Note: This file is meant to serve as a template. Please modify it +# according to your needs. Read more about Docker Compose: +# +# https://docs.docker.com/compose/compose-file/ +# +# +x-deploy: &default-deploy + restart_policy: + condition: unless-stopped + delay: 5s + window: 120s + update_config: + order: start-first + +services: + firezone: + image: firezone/firezone:${VERSION:-latest} + ports: + - 51820:51820/udp + environment: + EXTERNAL_URL: "https://fz.ixvd.net/" + DATABASE_HOST: "fz-postgres" + DATABASE_USER: "firezone" + DATABASE_PASSWORD: "firezone" + env_file: + - /etc/ixvd/secrets/env/firezone.env + volumes: + - /srv/firezone/config:/var/firezone + cap_add: + - NET_ADMIN + - SYS_MODULE + sysctls: + - net.ipv6.conf.all.disable_ipv6=0 + - net.ipv4.ip_forward=1 + - net.ipv6.conf.all.forwarding=1 + depends_on: + - postgres + networks: + proxy: + fz-internal: + ipv4_address: 172.25.0.10 + ipv6_address: fcff:3990:3990::99 + + fz-postgres: + image: postgres:15 + volumes: + - /srv/firezone/data:/var/lib/postgresql/data + environment: + POSTGRES_DB: firezone + POSTGRES_USER: firezone + POSTGRES_PASSWORD: firezone + networks: + - fz-internal + +networks: + fz-internal: + enable_ipv6: true + driver: bridge + ipam: + config: + - subnet: 172.19.0.0/16 + - subnet: fcff:3990:3990::/64 + gateway: fcff:3990:3990::1 From 62037c24959a1f235878fbda1584fa0f6c96749d Mon Sep 17 00:00:00 2001 From: Raine Date: Wed, 10 Jan 2024 01:10:32 +0100 Subject: [PATCH 03/10] fix: firezone network --- servers/apoc/docker-compose.d/docker-compose.firezone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/servers/apoc/docker-compose.d/docker-compose.firezone.yml b/servers/apoc/docker-compose.d/docker-compose.firezone.yml index ee08656..a673ed5 100644 --- a/servers/apoc/docker-compose.d/docker-compose.firezone.yml +++ b/servers/apoc/docker-compose.d/docker-compose.firezone.yml @@ -41,7 +41,7 @@ services: networks: proxy: fz-internal: - ipv4_address: 172.25.0.10 + ipv4_address: 172.90.0.10 ipv6_address: fcff:3990:3990::99 fz-postgres: @@ -61,6 +61,6 @@ networks: driver: bridge ipam: config: - - subnet: 172.19.0.0/16 + - subnet: 172.90.0.0/16 - subnet: fcff:3990:3990::/64 gateway: fcff:3990:3990::1 From 890b90a7c2ab84cb057cefe0d6394c73fe02deef Mon Sep 17 00:00:00 2001 From: Raine Date: Wed, 10 Jan 2024 01:20:54 +0100 Subject: [PATCH 04/10] fix: firezone websocket --- .../apoc/docker-compose.d/custom/nginx/conf.d/firezone.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/servers/apoc/docker-compose.d/custom/nginx/conf.d/firezone.conf b/servers/apoc/docker-compose.d/custom/nginx/conf.d/firezone.conf index 6f70dc2..cca6512 100644 --- a/servers/apoc/docker-compose.d/custom/nginx/conf.d/firezone.conf +++ b/servers/apoc/docker-compose.d/custom/nginx/conf.d/firezone.conf @@ -3,7 +3,13 @@ server { server_name fz.ixvd.net; location / { + proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $host; + proxy_set_header Connection $http_connection; + proxy_set_header Upgrade $http_upgrade proxy_pass http://firezone:13000; + client_max_body_size 0; } error_page 500 502 503 504 /50x.html; From 23813ac048be259fed7fa1793996a4261d89da2e Mon Sep 17 00:00:00 2001 From: Raine Date: Wed, 10 Jan 2024 01:22:35 +0100 Subject: [PATCH 05/10] fix: forgot ; --- servers/apoc/docker-compose.d/custom/nginx/conf.d/firezone.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/apoc/docker-compose.d/custom/nginx/conf.d/firezone.conf b/servers/apoc/docker-compose.d/custom/nginx/conf.d/firezone.conf index cca6512..3d4cb05 100644 --- a/servers/apoc/docker-compose.d/custom/nginx/conf.d/firezone.conf +++ b/servers/apoc/docker-compose.d/custom/nginx/conf.d/firezone.conf @@ -7,7 +7,7 @@ server { proxy_set_header X-Forwarded-Proto https; proxy_set_header Host $host; proxy_set_header Connection $http_connection; - proxy_set_header Upgrade $http_upgrade + proxy_set_header Upgrade $http_upgrade; proxy_pass http://firezone:13000; client_max_body_size 0; } From b5cec5cf4c75bfeb612d23b79486c6c92031c27a Mon Sep 17 00:00:00 2001 From: Raine Date: Wed, 10 Jan 2024 01:24:38 +0100 Subject: [PATCH 06/10] fix: firezone websocket --- .../custom/nginx/conf.d/firezone.conf | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/servers/apoc/docker-compose.d/custom/nginx/conf.d/firezone.conf b/servers/apoc/docker-compose.d/custom/nginx/conf.d/firezone.conf index 3d4cb05..ceaa04f 100644 --- a/servers/apoc/docker-compose.d/custom/nginx/conf.d/firezone.conf +++ b/servers/apoc/docker-compose.d/custom/nginx/conf.d/firezone.conf @@ -2,12 +2,20 @@ server { listen 80; server_name fz.ixvd.net; + location /live/websocket { + proxy_pass http://firezone:13000; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection upgrade; + } + location / { proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-Proto https; proxy_set_header Host $host; - proxy_set_header Connection $http_connection; - proxy_set_header Upgrade $http_upgrade; proxy_pass http://firezone:13000; client_max_body_size 0; } From 959721388e2b2ed7996335444978d06fb388276c Mon Sep 17 00:00:00 2001 From: Raine Date: Fri, 9 Feb 2024 14:53:41 +0100 Subject: [PATCH 07/10] feat: diagnostic tool --- tools/diagnostics/domain-lookup.sh | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100755 tools/diagnostics/domain-lookup.sh diff --git a/tools/diagnostics/domain-lookup.sh b/tools/diagnostics/domain-lookup.sh new file mode 100755 index 0000000..4497bac --- /dev/null +++ b/tools/diagnostics/domain-lookup.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +for target in $@; do + ip=$(dig $target +short) + printf "%-20s -> %20s (%s)\n" "$target" "$(dig -x $ip +short)" "$ip" +done From 759852140a722f9194e7050f18a8a545c469f0d5 Mon Sep 17 00:00:00 2001 From: Raine Date: Sat, 10 Feb 2024 13:48:19 +0100 Subject: [PATCH 08/10] feat: diagnostic tool; load percentage --- tools/diagnostics/load-percentage.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100755 tools/diagnostics/load-percentage.sh diff --git a/tools/diagnostics/load-percentage.sh b/tools/diagnostics/load-percentage.sh new file mode 100755 index 0000000..7a1fd60 --- /dev/null +++ b/tools/diagnostics/load-percentage.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +argi=1 + +while getopts '5qh' opt; do + case $opt in + 5) argi=2 ;; + q) argi=3 ;; + h) echo "-5 = 5 minutes, -q = a quarter (15 min)"; exit ;; + \?) exit 1 ;; + esac +done +shift $((OPTIND-1)) + +LOADVAL=$(awk "{ print \$$argi; }" < /proc/loadavg) +NUMCPUS=$(getconf _NPROCESSORS_ONLN) +echo "$LOADVAL * 100 / $NUMCPUS" | bc + From 83a548ca8ff6402a1db9a6c957e05055e89685a4 Mon Sep 17 00:00:00 2001 From: Raine Date: Fri, 29 Mar 2024 16:45:06 +0100 Subject: [PATCH 09/10] feat: nebulosus tmp solution Signed-off-by: Raine --- .idea/.gitignore | 8 +++++ .idea/misc.xml | 10 ++++++ .idea/modules.xml | 8 +++++ .idea/neb.iml | 9 +++++ .idea/vcs.xml | 6 ++++ .woodpecker/images.yml | 6 ++++ images/nginx/Dockerfile | 16 +++++++++ images/nginx/conf.d/default.conf | 17 +++++++++ images/nginx/content/index.html | 24 +++++++++++++ images/nginx/entrypoint.sh | 28 +++++++++++++++ .../custom/nginx/conf.d/nebulosus.conf | 8 +++++ .../docker-compose.nebulosus.yml | 8 +++++ .../docker-compose.d/docker-compose.yml | 4 +-- .../docker-compose.d/custom/nginx/Dockerfile | 13 ------- .../custom/nginx/conf.d/default.conf | 21 ----------- .../custom/nginx/content/index.html | 26 -------------- .../custom/nginx/entrypoint.sh | 28 --------------- .../docker-compose.d/custom/nginx/nginx.conf | 35 ------------------- .../skel/docker-compose.d/docker-compose.yml | 3 +- skel/etc/ixvd/skel-sum.txt | 2 +- 20 files changed, 153 insertions(+), 127 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/neb.iml create mode 100644 .idea/vcs.xml create mode 100644 .woodpecker/images.yml create mode 100644 images/nginx/Dockerfile create mode 100644 images/nginx/conf.d/default.conf create mode 100644 images/nginx/content/index.html create mode 100755 images/nginx/entrypoint.sh create mode 100644 servers/keymaker/docker-compose.d/custom/nginx/conf.d/nebulosus.conf create mode 100644 servers/keymaker/docker-compose.d/docker-compose.nebulosus.yml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..947ef84 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..391a425 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/neb.iml b/.idea/neb.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/neb.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.woodpecker/images.yml b/.woodpecker/images.yml new file mode 100644 index 0000000..91a691f --- /dev/null +++ b/.woodpecker/images.yml @@ -0,0 +1,6 @@ +when: + event: + - push + - manual + - tag + \ No newline at end of file diff --git a/images/nginx/Dockerfile b/images/nginx/Dockerfile new file mode 100644 index 0000000..3e3af88 --- /dev/null +++ b/images/nginx/Dockerfile @@ -0,0 +1,16 @@ +FROM nginx:alpine + +RUN apk add \ + certbot \ + certbot-nginx + +COPY content /usr/share/nginx/html +COPY conf.d/ /etc/nginx/conf.d/ +COPY nginx.conf /etc/nginx/nginx.conf + +VOLUME /etc/nginx/conf.d/ +VOLUME /usr/share/nginx/html/ + +COPY entrypoint.sh /entrypoint +ENTRYPOINT [ "sh", "/entrypoint" ] +CMD [ "nginx", "-g", "daemon off;" ] \ No newline at end of file diff --git a/images/nginx/conf.d/default.conf b/images/nginx/conf.d/default.conf new file mode 100644 index 0000000..3b5746c --- /dev/null +++ b/images/nginx/conf.d/default.conf @@ -0,0 +1,17 @@ +server { + listen 80; + server_name _; + + # SSL is managed by certbot, no need for a ssl listen; it will be generated automagically! + + # default html page + location / { + root /usr/share/nginx/html; + index index.html index.htm; + } + + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } +} diff --git a/images/nginx/content/index.html b/images/nginx/content/index.html new file mode 100644 index 0000000..4a98c86 --- /dev/null +++ b/images/nginx/content/index.html @@ -0,0 +1,24 @@ + + + + + Welcome to nginx! + + + + +

Welcome to nginx!

+ This is the default page, so the admin was likely too lazy too remove it. + + + \ No newline at end of file diff --git a/images/nginx/entrypoint.sh b/images/nginx/entrypoint.sh new file mode 100755 index 0000000..b28582b --- /dev/null +++ b/images/nginx/entrypoint.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +trap exit TERM + +if [ -n "${CERTBOT_DOMAINS}" ]; then + echo "registering..." + if ! certbot show_account; then + certbot register -n \ + --agree-tos \ + -m "${CERTBOT_EMAIL}" + fi + + for d in $(echo "${CERTBOT_DOMAINS}" | sed 's/,/ /g'); do + echo "requesting for $d..." + certbot --nginx -n --keep -d "$d" + done + + while :; do + echo "renewing domains..." + certbot --nginx --keep -n renew + sleep 12h & + wait $! + done & +else + echo "skipping certbot due to no domains!" +fi & + +exec "$@" \ No newline at end of file diff --git a/servers/keymaker/docker-compose.d/custom/nginx/conf.d/nebulosus.conf b/servers/keymaker/docker-compose.d/custom/nginx/conf.d/nebulosus.conf new file mode 100644 index 0000000..de69d59 --- /dev/null +++ b/servers/keymaker/docker-compose.d/custom/nginx/conf.d/nebulosus.conf @@ -0,0 +1,8 @@ +server { + listen 80; + server_name nebulosus.nl; + + # SSL is managed by certbot, no need for a ssl listen; it will be generated automagically! + + proxy_pass http://site; +} diff --git a/servers/keymaker/docker-compose.d/docker-compose.nebulosus.yml b/servers/keymaker/docker-compose.d/docker-compose.nebulosus.yml new file mode 100644 index 0000000..1f69786 --- /dev/null +++ b/servers/keymaker/docker-compose.d/docker-compose.nebulosus.yml @@ -0,0 +1,8 @@ +version: '2.2' + + +services: + site: + image: git.ixvd.net/nebulosus/web + networks: + - proxy diff --git a/servers/keymaker/docker-compose.d/docker-compose.yml b/servers/keymaker/docker-compose.d/docker-compose.yml index 1518226..ea306c6 100644 --- a/servers/keymaker/docker-compose.d/docker-compose.yml +++ b/servers/keymaker/docker-compose.d/docker-compose.yml @@ -7,7 +7,7 @@ services: build: custom/nginx environment: CERTBOT_EMAIL: "webmaster@ixvd.net" - CERTBOT_DOMAINS: "keymaker.ixvd.net,ixvd.net,via.ixvd.net,cdn.ixvd.net,park.ixvd.net" + CERTBOT_DOMAINS: "keymaker.ixvd.net,ixvd.net,via.ixvd.net,cdn.ixvd.net,park.ixvd.net,nebulosus.nl" volumes: - /srv/certbot/data:/etc/letsencrypt - /srv/certbot/other/www:/var/www/certbot @@ -30,4 +30,4 @@ networks: external: true internal: external: true - \ No newline at end of file + diff --git a/servers/skel/docker-compose.d/custom/nginx/Dockerfile b/servers/skel/docker-compose.d/custom/nginx/Dockerfile index 6bb5b49..e69de29 100644 --- a/servers/skel/docker-compose.d/custom/nginx/Dockerfile +++ b/servers/skel/docker-compose.d/custom/nginx/Dockerfile @@ -1,13 +0,0 @@ -FROM nginx:alpine - -RUN apk add \ - certbot \ - certbot-nginx - -COPY content /usr/share/nginx/html -COPY conf.d/ /etc/nginx/conf.d/ -COPY nginx.conf /etc/nginx/nginx.conf - -COPY entrypoint.sh /entrypoint -ENTRYPOINT [ "sh", "/entrypoint" ] -CMD [ "nginx", "-g", "daemon off;" ] \ No newline at end of file diff --git a/servers/skel/docker-compose.d/custom/nginx/conf.d/default.conf b/servers/skel/docker-compose.d/custom/nginx/conf.d/default.conf index 18f1f8d..e69de29 100644 --- a/servers/skel/docker-compose.d/custom/nginx/conf.d/default.conf +++ b/servers/skel/docker-compose.d/custom/nginx/conf.d/default.conf @@ -1,21 +0,0 @@ -server { - listen 80; - server_name localhost; - - # SSL is managed by certbot, no need for a ssl listen; it will be generated automagically! - - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - - # default html page - location / { - root /usr/share/nginx/html; - index index.html index.htm; - } - - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /usr/share/nginx/html; - } -} diff --git a/servers/skel/docker-compose.d/custom/nginx/content/index.html b/servers/skel/docker-compose.d/custom/nginx/content/index.html index c66cf70..e69de29 100644 --- a/servers/skel/docker-compose.d/custom/nginx/content/index.html +++ b/servers/skel/docker-compose.d/custom/nginx/content/index.html @@ -1,26 +0,0 @@ - - - - - Welcome to nginx! - - - - -

Welcome to nginx!

-
- If you're seeing this, it means the admin was too lazy to remove this page.
- Expected something here? contact the admin: webmaster@ixvd.net - - - \ No newline at end of file diff --git a/servers/skel/docker-compose.d/custom/nginx/entrypoint.sh b/servers/skel/docker-compose.d/custom/nginx/entrypoint.sh index df5fa5c..e69de29 100755 --- a/servers/skel/docker-compose.d/custom/nginx/entrypoint.sh +++ b/servers/skel/docker-compose.d/custom/nginx/entrypoint.sh @@ -1,28 +0,0 @@ -#!/bin/sh - -trap exit TERM - -if [ -n "${CERTBOT_DOMAINS}" ]; then - echo "registering..." - if ! certbot show_account; then - certbot register -n \ - --agree-tos \ - -m "${CERTBOT_EMAIL}" - fi - - for d in $(echo "${CERTBOT_DOMAINS}" | sed 's/,/ /g'); do - echo "requesting for $d..." - certbot --nginx -n --keep -d "$d" - done - - while :; do - echo "renewing domains..." - certbot --nginx --keep -n renew - sleep 12h & - wait $! - done & -else - echo "skipping certbot due to no domains!" -fi & - -exec "$@" \ No newline at end of file diff --git a/servers/skel/docker-compose.d/custom/nginx/nginx.conf b/servers/skel/docker-compose.d/custom/nginx/nginx.conf index 2f54d99..e69de29 100644 --- a/servers/skel/docker-compose.d/custom/nginx/nginx.conf +++ b/servers/skel/docker-compose.d/custom/nginx/nginx.conf @@ -1,35 +0,0 @@ - -user nginx; -worker_processes auto; - -error_log /var/log/nginx/error.log notice; -pid /var/run/nginx.pid; - - -events { - worker_connections 1024; -} - - -http { - include /etc/nginx/mime.types; - default_type application/octet-stream; - - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - # docker resolver and quad9; - resolver 127.0.0.11 9.9.9.9 ipv6=off; - - access_log /var/log/nginx/access.log main; - - sendfile on; - #tcp_nopush on; - - keepalive_timeout 65; - - #gzip on; - - include /etc/nginx/conf.d/*.conf; -} diff --git a/servers/skel/docker-compose.d/docker-compose.yml b/servers/skel/docker-compose.d/docker-compose.yml index 159ffe1..abcc778 100644 --- a/servers/skel/docker-compose.d/docker-compose.yml +++ b/servers/skel/docker-compose.d/docker-compose.yml @@ -4,7 +4,8 @@ version: '2.2' services: # default nginx setup nginx: - build: custom/nginx + build: + context: ../../../images/nginx environment: CERTBOT_EMAIL: "webmaster@ixvd.net" CERTBOT_DOMAINS: "localhost" diff --git a/skel/etc/ixvd/skel-sum.txt b/skel/etc/ixvd/skel-sum.txt index 47dacea..debf3d8 100644 --- a/skel/etc/ixvd/skel-sum.txt +++ b/skel/etc/ixvd/skel-sum.txt @@ -1 +1 @@ -059c7c3eb87d4a9bd30b70ba9016b875783b9206cbd44b4c2dc1bb8f59787127 - +07453417352829e9a47d22b3d8e15e0bb2d12df86f92165bda2568883d1817ab - From 68ef615dad3d65267ac0c76f1b545718582e0a9d Mon Sep 17 00:00:00 2001 From: Raine Date: Fri, 29 Mar 2024 17:07:24 +0100 Subject: [PATCH 10/10] fix: nginx nebulosus --- .../docker-compose.d/custom/nginx/conf.d/nebulosus.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/servers/keymaker/docker-compose.d/custom/nginx/conf.d/nebulosus.conf b/servers/keymaker/docker-compose.d/custom/nginx/conf.d/nebulosus.conf index de69d59..8f9d856 100644 --- a/servers/keymaker/docker-compose.d/custom/nginx/conf.d/nebulosus.conf +++ b/servers/keymaker/docker-compose.d/custom/nginx/conf.d/nebulosus.conf @@ -4,5 +4,7 @@ server { # SSL is managed by certbot, no need for a ssl listen; it will be generated automagically! - proxy_pass http://site; + location / { + proxy_pass http://site; + } }