From 7016660fd1a80d03c3cf04222fb4c24533a2f9ea Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Sat, 15 Feb 2025 10:29:55 -0700 Subject: [PATCH] Removed comments in conf nignx file --- .vscode/settings.json | 2 + etc/nginx/include/2fauth.conf | 20 ------- etc/nginx/include/actual.conf | 20 ------- etc/nginx/include/adguard.conf | 3 - etc/nginx/include/affirm.conf | 11 +++- etc/nginx/include/authentik.conf | 23 ------- etc/nginx/include/baikal.conf | 3 - etc/nginx/include/bchs.conf | 15 +++-- etc/nginx/include/beszel.conf | 3 - etc/nginx/include/blinko.conf | 3 - etc/nginx/include/cockpit.conf | 3 - etc/nginx/include/dashkiosk.conf | 3 - etc/nginx/include/dorico.conf | 3 - etc/nginx/include/dotnet-sdk-8.conf | 3 - etc/nginx/include/firefox.conf | 3 - etc/nginx/include/gitea.conf | 3 - etc/nginx/include/gotify.conf | 3 - etc/nginx/include/immich-kiosk.conf | 3 - etc/nginx/include/immich-to-slideshow.conf | 3 - etc/nginx/include/immich.conf | 3 - etc/nginx/include/jmlc.conf | 11 +++- etc/nginx/include/kanbn-to-quartz.conf | 3 - etc/nginx/include/kuma.conf | 3 - etc/nginx/include/linkwarden.conf | 20 ------- etc/nginx/include/mattermost.conf | 46 -------------- .../original-to-deterministic-hash-code.conf | 3 - etc/nginx/include/passed.conf | 23 ------- etc/nginx/include/pgadmin.conf | 3 - etc/nginx/include/phares.conf | 3 - etc/nginx/include/quartz.conf | 5 +- etc/nginx/include/slideshow.conf | 3 - etc/nginx/include/sumco.conf | 17 ++++++ etc/nginx/include/vaultwarden.conf | 3 - etc/nginx/include/warden.conf | 3 - etc/nginx/include/xandikos.conf | 3 - etc/nginx/sites-available/default | 19 +++--- etc/systemd/system/snap.certbot.renew.service | 6 +- etc/systemd/system/snap.certbot.renew.timer | 8 +-- .../snap.vaultwarden.vaultwarden.service | 6 +- .../ignore/file-folder-helper.container | 27 +++++++++ .../containers/systemd/firefox.container | 32 ++++++++++ .../systemd/uptime-kuma-server.container | 1 + var/spool/cron/crontabs/podman | 60 +++++++++---------- 43 files changed, 154 insertions(+), 287 deletions(-) delete mode 100644 etc/nginx/include/2fauth.conf delete mode 100644 etc/nginx/include/actual.conf delete mode 100644 etc/nginx/include/authentik.conf delete mode 100644 etc/nginx/include/linkwarden.conf delete mode 100644 etc/nginx/include/mattermost.conf delete mode 100644 etc/nginx/include/passed.conf create mode 100644 etc/nginx/include/sumco.conf create mode 100644 home/podman/.config/containers/ignore/file-folder-helper.container diff --git a/.vscode/settings.json b/.vscode/settings.json index 27f1a46..6aae651 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -21,6 +21,7 @@ "gitea", "gogs", "immich", + "JMLC", "journalctl", "kanbn", "kestra", @@ -34,6 +35,7 @@ "personalised", "pgadmin", "phares", + "Sumco", "umbrel", "usersecrets", "vaultwarden", diff --git a/etc/nginx/include/2fauth.conf b/etc/nginx/include/2fauth.conf deleted file mode 100644 index 2161e2c..0000000 --- a/etc/nginx/include/2fauth.conf +++ /dev/null @@ -1,20 +0,0 @@ -server { - # touch /etc/nginx/include/2fauth.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/2fauth.phares.duckdns.org.key -out /etc/nginx/include/2fauth.phares.duckdns.org.crt -config /etc/nginx/include/2fauth.phares.duckdns.org - ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; - ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; - ssl_protocols TLSv1.2 TLSv1.3; - listen 443 ssl http2; - server_name 2fauth.phares.duckdns.org; - client_max_body_size 5000m; - location / { - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_pass https://192.168.11.2:5015/; - proxy_read_timeout 600s; - proxy_send_timeout 600s; - } -} \ No newline at end of file diff --git a/etc/nginx/include/actual.conf b/etc/nginx/include/actual.conf deleted file mode 100644 index 531b113..0000000 --- a/etc/nginx/include/actual.conf +++ /dev/null @@ -1,20 +0,0 @@ -server { - # touch /etc/nginx/include/actual.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/actual.phares.duckdns.org.key -out /etc/nginx/include/actual.phares.duckdns.org.crt -config /etc/nginx/include/actual.phares.duckdns.org - ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; - ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; - ssl_protocols TLSv1.2 TLSv1.3; - listen 443 ssl http2; - server_name actual.phares.duckdns.org; - client_max_body_size 5000m; - location / { - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_pass http://192.168.11.2:5013/; - proxy_read_timeout 600s; - proxy_send_timeout 600s; - } -} \ No newline at end of file diff --git a/etc/nginx/include/adguard.conf b/etc/nginx/include/adguard.conf index d136949..6c0407d 100644 --- a/etc/nginx/include/adguard.conf +++ b/etc/nginx/include/adguard.conf @@ -1,8 +1,5 @@ server { - # touch /etc/nginx/include/adguard.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/adguard.phares.duckdns.org.key -out /etc/nginx/include/adguard.phares.duckdns.org.crt -config /etc/nginx/include/adguard.phares.duckdns.org ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; diff --git a/etc/nginx/include/affirm.conf b/etc/nginx/include/affirm.conf index e3679c7..8ef0ad9 100644 --- a/etc/nginx/include/affirm.conf +++ b/etc/nginx/include/affirm.conf @@ -4,9 +4,14 @@ server { ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; server_name *.affirm.duckdns.org; - root /var/www/html-affirm; - index index.html index.htm; + client_max_body_size 5000m; location / { - try_files $uri $uri.html $uri/ =404; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_pass https://192.168.0.31/; + proxy_read_timeout 600s; + proxy_send_timeout 600s; } } \ No newline at end of file diff --git a/etc/nginx/include/authentik.conf b/etc/nginx/include/authentik.conf deleted file mode 100644 index 538d6af..0000000 --- a/etc/nginx/include/authentik.conf +++ /dev/null @@ -1,23 +0,0 @@ -server { - # touch /etc/nginx/include/authentik.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/authentik.phares.duckdns.org.key -out /etc/nginx/include/authentik.phares.duckdns.org.crt -config /etc/nginx/include/authentik.phares.duckdns.org - ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; - ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; - ssl_protocols TLSv1.2 TLSv1.3; - listen 443 ssl http2; - server_name authentik.phares.duckdns.org; - client_max_body_size 5000m; - location / { - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_pass https://192.168.11.2:5018/; - proxy_read_timeout 600s; - proxy_send_timeout 600s; - proxy_connect_timeout 600s; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - } -} \ No newline at end of file diff --git a/etc/nginx/include/baikal.conf b/etc/nginx/include/baikal.conf index d24fca6..b1aba88 100644 --- a/etc/nginx/include/baikal.conf +++ b/etc/nginx/include/baikal.conf @@ -1,8 +1,5 @@ server { - # touch /etc/nginx/include/baikal.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/baikal.phares.duckdns.org.key -out /etc/nginx/include/baikal.phares.duckdns.org.crt -config /etc/nginx/include/baikal.phares.duckdns.org ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; diff --git a/etc/nginx/include/bchs.conf b/etc/nginx/include/bchs.conf index 99604d0..ded5658 100644 --- a/etc/nginx/include/bchs.conf +++ b/etc/nginx/include/bchs.conf @@ -1,12 +1,17 @@ server { - ssl_certificate /home/podman/wild-bchs/fullchain.pem; - ssl_certificate_key /home/podman/wild-bchs/privkey.pem; + ssl_certificate /home/podman/wild-bchs/fullchain.cer; + ssl_certificate_key /home/podman/wild-bchs/bchs.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; server_name *.bchs.duckdns.org; - root /var/www/html-bchs; - index index.html index.htm; + client_max_body_size 5000m; location / { - try_files $uri $uri.html $uri/ =404; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_pass https://192.168.0.43/; + proxy_read_timeout 600s; + proxy_send_timeout 600s; } } \ No newline at end of file diff --git a/etc/nginx/include/beszel.conf b/etc/nginx/include/beszel.conf index d87e42b..7b38ba8 100644 --- a/etc/nginx/include/beszel.conf +++ b/etc/nginx/include/beszel.conf @@ -1,8 +1,5 @@ server { - # touch /etc/nginx/include/beszel.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/beszel.phares.duckdns.org.key -out /etc/nginx/include/beszel.phares.duckdns.org.crt -config /etc/nginx/include/beszel.phares.duckdns.org ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; diff --git a/etc/nginx/include/blinko.conf b/etc/nginx/include/blinko.conf index f29dcbf..273619e 100644 --- a/etc/nginx/include/blinko.conf +++ b/etc/nginx/include/blinko.conf @@ -1,8 +1,5 @@ server { - # touch /etc/nginx/include/blinko.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/blinko.phares.duckdns.org.key -out /etc/nginx/include/blinko.phares.duckdns.org.crt -config /etc/nginx/include/blinko.phares.duckdns.org ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; diff --git a/etc/nginx/include/cockpit.conf b/etc/nginx/include/cockpit.conf index 27c4e91..84fa0cb 100644 --- a/etc/nginx/include/cockpit.conf +++ b/etc/nginx/include/cockpit.conf @@ -1,8 +1,5 @@ server { - # touch /etc/nginx/include/cockpit.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/cockpit.phares.duckdns.org.key -out /etc/nginx/include/cockpit.phares.duckdns.org.crt -config /etc/nginx/include/cockpit.phares.duckdns.org ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; diff --git a/etc/nginx/include/dashkiosk.conf b/etc/nginx/include/dashkiosk.conf index 3b35f48..578e8c1 100644 --- a/etc/nginx/include/dashkiosk.conf +++ b/etc/nginx/include/dashkiosk.conf @@ -1,8 +1,5 @@ server { - # touch /etc/nginx/include/dashkiosk.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/dashkiosk.phares.duckdns.org.key -out /etc/nginx/include/dashkiosk.phares.duckdns.org.crt -config /etc/nginx/include/dashkiosk.phares.duckdns.org ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; diff --git a/etc/nginx/include/dorico.conf b/etc/nginx/include/dorico.conf index dcdc6b4..d1cd1d4 100644 --- a/etc/nginx/include/dorico.conf +++ b/etc/nginx/include/dorico.conf @@ -1,8 +1,5 @@ server { - # touch /etc/nginx/include/dorico.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/dorico.phares.duckdns.org.key -out /etc/nginx/include/dorico.phares.duckdns.org.crt -config /etc/nginx/include/dorico.phares.duckdns.org ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; diff --git a/etc/nginx/include/dotnet-sdk-8.conf b/etc/nginx/include/dotnet-sdk-8.conf index 0824434..1dc76c3 100644 --- a/etc/nginx/include/dotnet-sdk-8.conf +++ b/etc/nginx/include/dotnet-sdk-8.conf @@ -1,8 +1,5 @@ server { - # touch /etc/nginx/include/dotnet-sdk-8-hash-code.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/dotnet-sdk-8-hash-code.phares.duckdns.org.key -out /etc/nginx/include/dotnet-sdk-8-hash-code.phares.duckdns.org.crt -config /etc/nginx/include/dotnet-sdk-8-hash-code.phares.duckdns.org ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; diff --git a/etc/nginx/include/firefox.conf b/etc/nginx/include/firefox.conf index 7786414..d650ad4 100644 --- a/etc/nginx/include/firefox.conf +++ b/etc/nginx/include/firefox.conf @@ -1,8 +1,5 @@ server { - # touch /etc/nginx/include/firefox.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/firefox.phares.duckdns.org.key -out /etc/nginx/include/firefox.phares.duckdns.org.crt -config /etc/nginx/include/firefox.phares.duckdns.org ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; diff --git a/etc/nginx/include/gitea.conf b/etc/nginx/include/gitea.conf index 447110a..b4fa05f 100644 --- a/etc/nginx/include/gitea.conf +++ b/etc/nginx/include/gitea.conf @@ -1,8 +1,5 @@ server { - # touch /etc/nginx/include/gitea.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/gitea.phares.duckdns.org.key -out /etc/nginx/include/gitea.phares.duckdns.org.crt -config /etc/nginx/include/gitea.phares.duckdns.org ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; diff --git a/etc/nginx/include/gotify.conf b/etc/nginx/include/gotify.conf index a7aad3e..83ff6bc 100644 --- a/etc/nginx/include/gotify.conf +++ b/etc/nginx/include/gotify.conf @@ -1,8 +1,5 @@ server { - # touch /etc/nginx/include/gotify.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/gotify.phares.duckdns.org.key -out /etc/nginx/include/gotify.phares.duckdns.org.crt -config /etc/nginx/include/gotify.phares.duckdns.org ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; diff --git a/etc/nginx/include/immich-kiosk.conf b/etc/nginx/include/immich-kiosk.conf index 5a4b63c..3792bea 100644 --- a/etc/nginx/include/immich-kiosk.conf +++ b/etc/nginx/include/immich-kiosk.conf @@ -1,8 +1,5 @@ server { - # touch /etc/nginx/include/immich-kiosk.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/immich-kiosk.phares.duckdns.org.key -out /etc/nginx/include/immich-kiosk.phares.duckdns.org.crt -config /etc/nginx/include/immich-kiosk.phares.duckdns.org ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; diff --git a/etc/nginx/include/immich-to-slideshow.conf b/etc/nginx/include/immich-to-slideshow.conf index 20245ff..e1cb230 100644 --- a/etc/nginx/include/immich-to-slideshow.conf +++ b/etc/nginx/include/immich-to-slideshow.conf @@ -1,8 +1,5 @@ server { - # touch /etc/nginx/include/immich-to-slideshow.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/immich-to-slideshow.phares.duckdns.org.key -out /etc/nginx/include/immich-to-slideshow.phares.duckdns.org.crt -config /etc/nginx/include/immich-to-slideshow.phares.duckdns.org ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; diff --git a/etc/nginx/include/immich.conf b/etc/nginx/include/immich.conf index 8f9d17f..a7afa55 100644 --- a/etc/nginx/include/immich.conf +++ b/etc/nginx/include/immich.conf @@ -1,8 +1,5 @@ server { - # touch /etc/nginx/include/immich.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/immich.phares.duckdns.org.key -out /etc/nginx/include/immich.phares.duckdns.org.crt -config /etc/nginx/include/immich.phares.duckdns.org ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; diff --git a/etc/nginx/include/jmlc.conf b/etc/nginx/include/jmlc.conf index 6ee24e4..2c64c10 100644 --- a/etc/nginx/include/jmlc.conf +++ b/etc/nginx/include/jmlc.conf @@ -4,9 +4,14 @@ server { ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; server_name *.jmlc.duckdns.org; - root /var/www/html-jmlc; - index index.html index.htm; + client_max_body_size 5000m; location / { - try_files $uri $uri.html $uri/ =404; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_pass https://192.168.0.42/; + proxy_read_timeout 600s; + proxy_send_timeout 600s; } } \ No newline at end of file diff --git a/etc/nginx/include/kanbn-to-quartz.conf b/etc/nginx/include/kanbn-to-quartz.conf index 1b7294d..4d211e6 100644 --- a/etc/nginx/include/kanbn-to-quartz.conf +++ b/etc/nginx/include/kanbn-to-quartz.conf @@ -1,8 +1,5 @@ server { - # touch /etc/nginx/include/kanbn-to-quartz.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/kanbn-to-quartz.phares.duckdns.org.key -out /etc/nginx/include/kanbn-to-quartz.phares.duckdns.org.crt -config /etc/nginx/include/kanbn-to-quartz.phares.duckdns.org ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; diff --git a/etc/nginx/include/kuma.conf b/etc/nginx/include/kuma.conf index 080f4ed..921a725 100644 --- a/etc/nginx/include/kuma.conf +++ b/etc/nginx/include/kuma.conf @@ -1,8 +1,5 @@ server { - # touch /etc/nginx/include/kuma.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/kuma.phares.duckdns.org.key -out /etc/nginx/include/kuma.phares.duckdns.org.crt -config /etc/nginx/include/kuma.phares.duckdns.org ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; diff --git a/etc/nginx/include/linkwarden.conf b/etc/nginx/include/linkwarden.conf deleted file mode 100644 index efa066f..0000000 --- a/etc/nginx/include/linkwarden.conf +++ /dev/null @@ -1,20 +0,0 @@ -server { - # touch /etc/nginx/include/linkwarden.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/linkwarden.phares.duckdns.org.key -out /etc/nginx/include/linkwarden.phares.duckdns.org.crt -config /etc/nginx/include/linkwarden.phares.duckdns.org - ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; - ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; - ssl_protocols TLSv1.2 TLSv1.3; - listen 443 ssl http2; - server_name linkwarden.phares.duckdns.org; - client_max_body_size 5000m; - location / { - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_pass http://192.168.11.2:5011/; - proxy_read_timeout 600s; - proxy_send_timeout 600s; - } -} \ No newline at end of file diff --git a/etc/nginx/include/mattermost.conf b/etc/nginx/include/mattermost.conf deleted file mode 100644 index 60cdab3..0000000 --- a/etc/nginx/include/mattermost.conf +++ /dev/null @@ -1,46 +0,0 @@ -server { - # touch /etc/nginx/include/mattermost.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/mattermost.phares.duckdns.org.key -out /etc/nginx/include/mattermost.phares.duckdns.org.crt -config /etc/nginx/include/mattermost.phares.duckdns.org - ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; - ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; - ssl_protocols TLSv1.2 TLSv1.3; - listen 443 ssl http2; - server_name mattermost.phares.duckdns.org; - # add_header X-Early-Data $tls1_3_early_data; - location / { - # https://mattermost.m1k1o.net/#/getting-started/reverse-proxy - client_max_body_size 100M; - proxy_set_header Connection ""; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Frame-Options SAMEORIGIN; - proxy_buffers 256 16k; - proxy_buffer_size 16k; - proxy_read_timeout 600s; - proxy_http_version 1.1; - proxy_pass https://192.168.11.2:8443/; - } - location ~ /api/v[0-9]+/(users/)?websocket$ { - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - client_max_body_size 50M; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Frame-Options SAMEORIGIN; - proxy_buffers 256 16k; - proxy_buffer_size 16k; - client_body_timeout 60s; - send_timeout 300s; - lingering_timeout 5s; - proxy_connect_timeout 90s; - proxy_send_timeout 300s; - proxy_read_timeout 90s; - proxy_http_version 1.1; - proxy_pass https://192.168.11.2:8443; - } -} \ No newline at end of file diff --git a/etc/nginx/include/original-to-deterministic-hash-code.conf b/etc/nginx/include/original-to-deterministic-hash-code.conf index d231028..805db60 100644 --- a/etc/nginx/include/original-to-deterministic-hash-code.conf +++ b/etc/nginx/include/original-to-deterministic-hash-code.conf @@ -1,8 +1,5 @@ server { - # touch /etc/nginx/include/original-to-deterministic-hash-code.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/original-to-deterministic-hash-code.phares.duckdns.org.key -out /etc/nginx/include/original-to-deterministic-hash-code.phares.duckdns.org.crt -config /etc/nginx/include/original-to-deterministic-hash-code.phares.duckdns.org ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; diff --git a/etc/nginx/include/passed.conf b/etc/nginx/include/passed.conf deleted file mode 100644 index 413e244..0000000 --- a/etc/nginx/include/passed.conf +++ /dev/null @@ -1,23 +0,0 @@ -server { - # touch /etc/nginx/include/passed.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/passed.phares.duckdns.org.key -out /etc/nginx/include/passed.phares.duckdns.org.crt -config /etc/nginx/include/passed.phares.duckdns.org - ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; - ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; - ssl_protocols TLSv1.2 TLSv1.3; - listen 443 ssl http2; - server_name passed.phares.duckdns.org; - client_max_body_size 5000m; - location / { - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_pass http://192.168.11.2:5022/; - proxy_read_timeout 600s; - proxy_send_timeout 600s; - proxy_connect_timeout 600s; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - } -} \ No newline at end of file diff --git a/etc/nginx/include/pgadmin.conf b/etc/nginx/include/pgadmin.conf index 763028f..7de8c2b 100644 --- a/etc/nginx/include/pgadmin.conf +++ b/etc/nginx/include/pgadmin.conf @@ -1,8 +1,5 @@ server { - # touch /etc/nginx/include/pgadmin.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/pgadmin.phares.duckdns.org.key -out /etc/nginx/include/pgadmin.phares.duckdns.org.crt -config /etc/nginx/include/pgadmin.phares.duckdns.org ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; diff --git a/etc/nginx/include/phares.conf b/etc/nginx/include/phares.conf index 2d68b3a..50f8db4 100644 --- a/etc/nginx/include/phares.conf +++ b/etc/nginx/include/phares.conf @@ -17,10 +17,7 @@ server { } } server { - # touch /etc/nginx/include/phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/phares.duckdns.org.key -out /etc/nginx/include/phares.duckdns.org.crt -config /etc/nginx/include/phares.duckdns.org ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; diff --git a/etc/nginx/include/quartz.conf b/etc/nginx/include/quartz.conf index d9063bf..8c9bae0 100644 --- a/etc/nginx/include/quartz.conf +++ b/etc/nginx/include/quartz.conf @@ -8,10 +8,7 @@ server { } } server { - # touch /etc/nginx/include/quartz.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/quartz.phares.duckdns.org.key -out /etc/nginx/include/quartz.phares.duckdns.org.crt -config /etc/nginx/include/quartz.phares.duckdns.org ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; @@ -20,5 +17,7 @@ server { index index.html index.htm; location / { try_files $uri $uri.html $uri/ =404; + auth_basic "auth_basic"; + auth_basic_user_file /etc/nginx/.htpasswd; } } \ No newline at end of file diff --git a/etc/nginx/include/slideshow.conf b/etc/nginx/include/slideshow.conf index 2eb916e..8ad87cb 100644 --- a/etc/nginx/include/slideshow.conf +++ b/etc/nginx/include/slideshow.conf @@ -9,10 +9,7 @@ server { } } server { - # touch /etc/nginx/include/slideshow.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/slideshow.phares.duckdns.org.key -out /etc/nginx/include/slideshow.phares.duckdns.org.crt -config /etc/nginx/include/slideshow.phares.duckdns.org ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; diff --git a/etc/nginx/include/sumco.conf b/etc/nginx/include/sumco.conf new file mode 100644 index 0000000..ad0eba5 --- /dev/null +++ b/etc/nginx/include/sumco.conf @@ -0,0 +1,17 @@ +server { + ssl_certificate /home/podman/wild-sumco/fullchain.cer; + ssl_certificate_key /home/podman/wild-sumco/sumco.duckdns.org.key; + ssl_protocols TLSv1.2 TLSv1.3; + listen 443 ssl http2; + server_name *.sumco.duckdns.org; + client_max_body_size 5000m; + location / { + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_pass https://192.168.0.41/; + proxy_read_timeout 600s; + proxy_send_timeout 600s; + } +} \ No newline at end of file diff --git a/etc/nginx/include/vaultwarden.conf b/etc/nginx/include/vaultwarden.conf index 64bc446..96a134d 100644 --- a/etc/nginx/include/vaultwarden.conf +++ b/etc/nginx/include/vaultwarden.conf @@ -1,8 +1,5 @@ server { - # touch /etc/nginx/include/vaultwarden.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/vaultwarden.phares.duckdns.org.key -out /etc/nginx/include/vaultwarden.phares.duckdns.org.crt -config /etc/nginx/include/vaultwarden.phares.duckdns.org ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; diff --git a/etc/nginx/include/warden.conf b/etc/nginx/include/warden.conf index e773109..4458e11 100644 --- a/etc/nginx/include/warden.conf +++ b/etc/nginx/include/warden.conf @@ -1,8 +1,5 @@ server { - # touch /etc/nginx/include/warden.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/warden.phares.duckdns.org.key -out /etc/nginx/include/warden.phares.duckdns.org.crt -config /etc/nginx/include/warden.phares.duckdns.org ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; diff --git a/etc/nginx/include/xandikos.conf b/etc/nginx/include/xandikos.conf index f4a24f6..2e688fa 100644 --- a/etc/nginx/include/xandikos.conf +++ b/etc/nginx/include/xandikos.conf @@ -1,8 +1,5 @@ server { - # touch /etc/nginx/include/xandikos.phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/xandikos.phares.duckdns.org.key -out /etc/nginx/include/xandikos.phares.duckdns.org.crt -config /etc/nginx/include/xandikos.phares.duckdns.org ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; diff --git a/etc/nginx/sites-available/default b/etc/nginx/sites-available/default index 4187298..7eb31c1 100644 --- a/etc/nginx/sites-available/default +++ b/etc/nginx/sites-available/default @@ -1,8 +1,5 @@ server { - # touch /etc/nginx/include/phares.duckdns.org - # openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/include/phares.duckdns.org.key -out /etc/nginx/include/phares.duckdns.org.crt -config /etc/nginx/include/phares.duckdns.org ssl_certificate /home/podman/wild-phares/fullchain.cer; - # ssl_certificate /home/podman/wild-phares/phares.duckdns.org.cer; ssl_certificate_key /home/podman/wild-phares/phares.duckdns.org.key; ssl_protocols TLSv1.2 TLSv1.3; listen 443 ssl http2; @@ -13,13 +10,14 @@ server { try_files $uri $uri.html $uri/ =404; } } -include /etc/nginx/include/2fauth.conf; # https://2fauth.phares.duckdns.org # https://192.168.11.2:5015/ +include /etc/nginx/include/affirm.conf; # https://*.affirm.duckdns.org # https://192.168.0.31/ +include /etc/nginx/include/bchs.conf; # https://*.bchs.duckdns.org # https://192.168.0.43/ +include /etc/nginx/include/jmlc.conf; # https://*.jmlc.duckdns.org # https://192.168.0.42/ +include /etc/nginx/include/sumco.conf; # https://*.sumco.duckdns.org # https://192.168.0.41/ +# include /etc/nginx/include/adguard.conf; # https://adguard.phares.duckdns.org # http://192.168.11.2:5014/ -include /etc/nginx/include/authentik.conf; # https://authentik.phares.duckdns.org # https://192.168.11.2:5018/ -include /etc/nginx/include/affirm.conf; # https://*.affirm.duckdns.org # /var/www/html-affirm include /etc/nginx/include/baikal.conf; # https://baikal.phares.duckdns.org # http://192.168.11.2:8001/ include /etc/nginx/include/beszel.conf; # https://beszel.phares.duckdns.org # http://192.168.11.2:5023/ -include /etc/nginx/include/bchs.conf; # https://*.bchs.duckdns.org # /var/www/html-bchs include /etc/nginx/include/blinko.conf; # https://blinko.phares.duckdns.org # http://192.168.11.2:5012/ include /etc/nginx/include/cockpit.conf; # https://cockpit.phares.duckdns.org # https://127.0.0.1:9090/ include /etc/nginx/include/dashkiosk.conf; # https://dashkiosk.phares.duckdns.org # http://192.168.11.2:9400/ @@ -31,13 +29,9 @@ include /etc/nginx/include/gotify.conf; # https://gotify.phares.duckdns.org # ht include /etc/nginx/include/immich-kiosk.conf; # https://immich-kiosk.phares.duckdns.org # http://192.168.11.2:5010/ include /etc/nginx/include/immich-to-slideshow.conf; # https://immich-to-slideshow.phares.duckdns.org # http://192.168.11.2:5009/ include /etc/nginx/include/immich.conf; # https://immich.phares.duckdns.org # http://192.168.11.2:3001/ -include /etc/nginx/include/jmlc.conf; # https://*.jmlc.duckdns.org # /var/www/html-jmlc include /etc/nginx/include/kanbn-to-quartz.conf; # https://kanbn-to-quartz.phares.duckdns.org # http://192.168.11.2:5024/ include /etc/nginx/include/kuma.conf; # https://kuma.phares.duckdns.org # https://192.168.11.2:3004/ -include /etc/nginx/include/linkwarden.conf; # https://linkwarden.phares.duckdns.org # http://192.168.11.2:5011/ -include /etc/nginx/include/mattermost.conf; # https://mattermost.phares.duckdns.org # https://192.168.11.2:8443/ include /etc/nginx/include/original-to-deterministic-hash-code.conf; # https://original-to-deterministic.phares.duckdns.org # http://192.168.11.2:5025/ -include /etc/nginx/include/passed.conf; # https://passed.phares.duckdns.org # http://192.168.11.2:5022/ include /etc/nginx/include/pgadmin.conf; # https://pgadmin.phares.duckdns.org # https://192.168.11.2:5007/ include /etc/nginx/include/phares.conf; # https://phares.duckdns.org # /var/www/html-nginx include /etc/nginx/include/quartz.conf; # https://quartz.phares.duckdns.org # /var/www/html-quartz @@ -45,5 +39,6 @@ include /etc/nginx/include/slideshow.conf; # https://slideshow.phares.duckdns.or include /etc/nginx/include/vaultwarden.conf; # https://vaultwarden.phares.duckdns.org # https://192.168.11.2:5008/ include /etc/nginx/include/warden.conf; # https://warden.phares.duckdns.org # https://192.168.11.2:5008/ include /etc/nginx/include/xandikos.conf; # https://xandikos.phares.duckdns.org # http://192.168.11.2:8000/ +# # ssh root@free.file.sync.root -p 22 -i C:/Users/phares/.ssh/id_ed25519 -# ssh root@free.file.sync.root -p 5026 -i C:/Users/phares/.ssh/id_ed25519 \ No newline at end of file +# ssh root@free.file.sync.root -p 5026 -i C:/Users/phares/.ssh/id_ed25519 diff --git a/etc/systemd/system/snap.certbot.renew.service b/etc/systemd/system/snap.certbot.renew.service index 6339b93..cb144d0 100644 --- a/etc/systemd/system/snap.certbot.renew.service +++ b/etc/systemd/system/snap.certbot.renew.service @@ -1,9 +1,9 @@ [Unit] # Auto-generated, DO NOT EDIT Description=Service for snap application certbot.renew -Requires=snap-certbot-4325.mount +Requires=snap-certbot-4412.mount Wants=network.target -After=snap-certbot-4325.mount network.target snapd.apparmor.service +After=snap-certbot-4412.mount network.target snapd.apparmor.service X-Snappy=yes [Service] @@ -11,6 +11,6 @@ EnvironmentFile=-/etc/environment ExecStart=/usr/bin/snap run --timer="00:00~24:00/2" certbot.renew SyslogIdentifier=certbot.renew Restart=no -WorkingDirectory=/var/snap/certbot/4325 +WorkingDirectory=/var/snap/certbot/4412 TimeoutStopSec=30 Type=oneshot diff --git a/etc/systemd/system/snap.certbot.renew.timer b/etc/systemd/system/snap.certbot.renew.timer index 478a836..979b21b 100644 --- a/etc/systemd/system/snap.certbot.renew.timer +++ b/etc/systemd/system/snap.certbot.renew.timer @@ -1,14 +1,14 @@ [Unit] # Auto-generated, DO NOT EDIT Description=Timer renew for snap application certbot.renew -Requires=snap-certbot-4325.mount -After=snap-certbot-4325.mount +Requires=snap-certbot-4412.mount +After=snap-certbot-4412.mount X-Snappy=yes [Timer] Unit=snap.certbot.renew.service -OnCalendar=*-*-* 05:42 -OnCalendar=*-*-* 19:22 +OnCalendar=*-*-* 09:38 +OnCalendar=*-*-* 20:24 [Install] WantedBy=timers.target diff --git a/etc/systemd/system/snap.vaultwarden.vaultwarden.service b/etc/systemd/system/snap.vaultwarden.vaultwarden.service index bfd795e..a48d57e 100644 --- a/etc/systemd/system/snap.vaultwarden.vaultwarden.service +++ b/etc/systemd/system/snap.vaultwarden.vaultwarden.service @@ -1,9 +1,9 @@ [Unit] # Auto-generated, DO NOT EDIT Description=Service for snap application vaultwarden.vaultwarden -Requires=snap-vaultwarden-161.mount +Requires=snap-vaultwarden-164.mount Wants=network.target -After=snap-vaultwarden-161.mount network.target snapd.apparmor.service +After=snap-vaultwarden-164.mount network.target snapd.apparmor.service X-Snappy=yes [Service] @@ -11,7 +11,7 @@ EnvironmentFile=-/etc/environment ExecStart=/usr/bin/snap run vaultwarden SyslogIdentifier=vaultwarden.vaultwarden Restart=on-failure -WorkingDirectory=/var/snap/vaultwarden/161 +WorkingDirectory=/var/snap/vaultwarden/164 TimeoutStopSec=30 Type=simple diff --git a/home/podman/.config/containers/ignore/file-folder-helper.container b/home/podman/.config/containers/ignore/file-folder-helper.container new file mode 100644 index 0000000..e799205 --- /dev/null +++ b/home/podman/.config/containers/ignore/file-folder-helper.container @@ -0,0 +1,27 @@ +[Container] +AutoUpdate=registry +ContainerName=file-folder-helper +Exec=sleep infinity +Image=gitea.phares.duckdns.org:443/phares3757/file-folder-helper:latest +# Network=file-folder-helper.network +# Pod=file-folder-helper.pod +Volume=/etc/localtime:/etc/localtime:ro +Volume=/etc/timezone:/etc/timezone:ro +Volume=/mnt/free-file-sync/notes/user-secrets/8da397d4-13ec-4576-9722-3c79cad25563/secrets.json:/app/secrets.json:ro + +[Service] +Restart=no + +[Install] +WantedBy=multi-user.target default.target + +# podman pull gitea.phares.duckdns.org:443/phares3757/file-folder-helper:latest +# systemctl --user daemon-reload +# systemctl --user start file-folder-helper +# systemctl --user status file-folder-helper +# journalctl -fu file-folder-helper.service +# podman logs file-folder-helper +# systemctl --user stop file-folder-helper +# systemctl --user disable file-folder-helper +# podman exec -ti file-folder-helper /bin/sh +# podman exec -ti file-folder-helper /bin/bash diff --git a/home/podman/.config/containers/systemd/firefox.container b/home/podman/.config/containers/systemd/firefox.container index 8db0f04..47712bf 100644 --- a/home/podman/.config/containers/systemd/firefox.container +++ b/home/podman/.config/containers/systemd/firefox.container @@ -6,6 +6,38 @@ Image=docker.io/jlesage/firefox:v24.11.1 # Network=firefox.network # Pod=firefox.pod PublishPort=5800:5800 +PodmanArgs=--add-host=adguard.affirm.duckdns.org:192.168.0.31 +PodmanArgs=--add-host=adguard.bchs.duckdns.org:192.168.0.43 +PodmanArgs=--add-host=adguard.jmlc.duckdns.org:192.168.0.42 +PodmanArgs=--add-host=adguard.phares.duckdns.org:192.168.11.2 +PodmanArgs=--add-host=adguard.sumco.duckdns.org:192.168.0.41 +PodmanArgs=--add-host=cockpit.affirm.duckdns.org:192.168.0.31 +PodmanArgs=--add-host=cockpit.bchs.duckdns.org:192.168.0.43 +PodmanArgs=--add-host=cockpit.jmlc.duckdns.org:192.168.0.42 +PodmanArgs=--add-host=cockpit.sumco.duckdns.org:192.168.0.41 +PodmanArgs=--add-host=firefox.affirm.duckdns.org:192.168.0.31 +PodmanArgs=--add-host=firefox.bchs.duckdns.org:192.168.0.43 +PodmanArgs=--add-host=firefox.jmlc.duckdns.org:192.168.0.42 +PodmanArgs=--add-host=firefox.sumco.duckdns.org:192.168.0.41 +PodmanArgs=--add-host=gotify.phares.duckdns.org:192.168.11.2 +PodmanArgs=--add-host=immich.affirm.duckdns.org:192.168.0.31 +PodmanArgs=--add-host=immich.bchs.duckdns.org:192.168.0.43 +PodmanArgs=--add-host=immich.jmlc.duckdns.org:192.168.0.42 +PodmanArgs=--add-host=immich.phares.duckdns.org:192.168.11.2 +PodmanArgs=--add-host=immich.sumco.duckdns.org:192.168.0.41 +PodmanArgs=--add-host=kanbn-to-quartz.phares.duckdns.org:192.168.11.2 +PodmanArgs=--add-host=kuma.affirm.duckdns.org:192.168.0.31 +PodmanArgs=--add-host=kuma.bchs.duckdns.org:192.168.0.43 +PodmanArgs=--add-host=kuma.jmlc.duckdns.org:192.168.0.42 +PodmanArgs=--add-host=kuma.phares.duckdns.org:192.168.11.2 +PodmanArgs=--add-host=kuma.phares.duckdns.org:192.168.11.2 +PodmanArgs=--add-host=kuma.sumco.duckdns.org:192.168.0.41 +PodmanArgs=--add-host=vaultwarden.phares.duckdns.org:192.168.11.2 +PodmanArgs=--add-host=warden.phares.duckdns.org:192.168.11.2 +PodmanArgs=--add-host=ha.sumco.duckdns.org:192.168.0.41 +PodmanArgs=--add-host=nginx.sumco.duckdns.org:192.168.0.41 +PodmanArgs=--add-host=ha.bchs.duckdns.org:192.168.0.41 +PodmanArgs=--add-host=nginx.bchs.duckdns.org:192.168.0.41 Volume=/etc/localtime:/etc/localtime:ro Volume=/etc/timezone:/etc/timezone:ro Volume=firefox-data.volume:/config:rw diff --git a/home/podman/.config/containers/systemd/uptime-kuma-server.container b/home/podman/.config/containers/systemd/uptime-kuma-server.container index 346e28e..6b3969b 100644 --- a/home/podman/.config/containers/systemd/uptime-kuma-server.container +++ b/home/podman/.config/containers/systemd/uptime-kuma-server.container @@ -7,6 +7,7 @@ Environment="UPTIME_KUMA_SSL_KEY=/certs/server.key" Image=docker.io/louislam/uptime-kuma:1 # Network=uptime-kuma.network # Pod=uptime-kuma.pod +PodmanArgs=--add-host=adguard.bchs.duckdns.org:192.168.11.2 PodmanArgs=--add-host=cockpit.phares.duckdns.org:192.168.11.2 PodmanArgs=--add-host=gotify.phares.duckdns.org:192.168.11.2 PodmanArgs=--add-host=immich-to-slideshow.phares.duckdns.org:192.168.11.2 diff --git a/var/spool/cron/crontabs/podman b/var/spool/cron/crontabs/podman index 868429d..9114672 100644 --- a/var/spool/cron/crontabs/podman +++ b/var/spool/cron/crontabs/podman @@ -1,42 +1,42 @@ # DO NOT EDIT THIS FILE - edit the master and reinstall. -# (/tmp/crontab.NYw9wK/crontab installed on Sun Feb 2 14:26:54 2025) +# (/tmp/crontab.fOmbMr/crontab installed on Wed Feb 12 16:28:17 2025) # (Cron version -- $Id: crontab.c,v 2.13 1994/01/17 03:20:37 vixie Exp $) # DO NOT EDIT THIS FILE - edit the master and reinstall. # (/tmp/crontab.35buNM/crontab installed on Tue Dec 3 13:24:22 2024) # (Cron version -- $Id: crontab.c,v 2.13 1994/01/17 03:20:37 vixie Exp $) # Edit this file to introduce tasks to be run by cron. # -14 11 * * * podman volume export systemd-baikal-server-data --output /home/podman/cron-backup/baikal-server-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar -15 11 * * * podman volume export systemd-blinko-server-data --output /home/podman/cron-backup/blinko-server-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar -16 11 * * * podman volume export systemd-gitea-server-data --output /home/podman/cron-backup/gitea-server-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar -# 17 11 * * * podman volume export systemd-linkwarden-server-data --output /home/podman/cron-backup/linkwarden-server-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar -# 18 11 * * * podman volume export systemd-mattermost-server-data --output /home/podman/cron-backup/mattermost-server-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar -# 19 11 * * * podman volume export systemd-odoo-server-data --output /home/podman/cron-backup/odoo-server-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar -20 11 * * * podman volume export systemd-uptime-kuma-server-data --output /home/podman/cron-backup/uptime-kuma-server-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar -21 11 * * * podman volume export systemd-xandikos-server-data --output /home/podman/cron-backup/xandikos-server-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +14 11 * * * podman volume export systemd-baikal-server-data --output /home/podman/cron-backup/phares-baikal-server-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +15 11 * * * podman volume export systemd-blinko-server-data --output /home/podman/cron-backup/phares-blinko-server-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +16 11 * * * podman volume export systemd-gitea-server-data --output /home/podman/cron-backup/phares-gitea-server-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +# 17 11 * * * podman volume export systemd-linkwarden-server-data --output /home/podman/cron-backup/phares-linkwarden-server-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +# 18 11 * * * podman volume export systemd-mattermost-server-data --output /home/podman/cron-backup/phares-mattermost-server-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +# 19 11 * * * podman volume export systemd-odoo-server-data --output /home/podman/cron-backup/phares-odoo-server-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +20 11 * * * podman volume export systemd-uptime-kuma-server-data --output /home/podman/cron-backup/phares-uptime-kuma-server-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +21 11 * * * podman volume export systemd-xandikos-server-data --output /home/podman/cron-backup/phares-xandikos-server-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar # -22 11 * * * podman volume export systemd-baikal-server-config --output /home/podman/cron-backup/baikal-server-config-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar -23 11 * * * podman volume export systemd-gitea-server-config --output /home/podman/cron-backup/gitea-server-config-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar -24 11 23 * * podman volume export systemd-immich-server-upload --output /home/podman/cron-backup/immich-server-upload-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar -# 25 11 * * * podman volume export systemd-mattermost-server-bleve --output /home/podman/cron-backup/mattermost-server-bleve-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar -# 26 11 * * * podman volume export systemd-mattermost-server-client-plugins --output /home/podman/cron-backup/mattermost-server-client-plugins-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar -# 27 11 * * * podman volume export systemd-mattermost-server-config --output /home/podman/cron-backup/mattermost-server-config-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar -# 28 11 * * * podman volume export systemd-mattermost-server-logs --output /home/podman/cron-backup/mattermost-server-logs-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar -# 29 11 * * * podman volume export systemd-mattermost-server-plugins --output /home/podman/cron-backup/mattermost-server-plugins-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +22 11 * * * podman volume export systemd-baikal-server-config --output /home/podman/cron-backup/phares-baikal-server-config-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +23 11 * * * podman volume export systemd-gitea-server-config --output /home/podman/cron-backup/phares-gitea-server-config-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +24 11 23 * * podman volume export systemd-immich-server-upload --output /home/podman/cron-backup/phares-immich-server-upload-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +# 25 11 * * * podman volume export systemd-mattermost-server-bleve --output /home/podman/cron-backup/phares-mattermost-server-bleve-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +# 26 11 * * * podman volume export systemd-mattermost-server-client-plugins --output /home/podman/cron-backup/phares-mattermost-server-client-plugins-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +# 27 11 * * * podman volume export systemd-mattermost-server-config --output /home/podman/cron-backup/phares-mattermost-server-config-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +# 28 11 * * * podman volume export systemd-mattermost-server-logs --output /home/podman/cron-backup/phares-mattermost-server-logs-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +# 29 11 * * * podman volume export systemd-mattermost-server-plugins --output /home/podman/cron-backup/phares-mattermost-server-plugins-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar # -30 11 * * * podman volume export systemd-pgadmin-data --output /home/podman/cron-backup/pgadmin-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar -31 11 * * * podman volume export systemd-firefox-data --output /home/podman/cron-backup/firefox-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar -32 11 * * * podman volume export systemd-immich-learning-cache --output /home/podman/cron-backup/immich-learning-cache-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +30 11 * * * podman volume export systemd-pgadmin-data --output /home/podman/cron-backup/phares-pgadmin-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +31 11 * * * podman volume export systemd-firefox-data --output /home/podman/cron-backup/phares-firefox-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +32 11 * * * podman volume export systemd-immich-learning-cache --output /home/podman/cron-backup/phares-immich-learning-cache-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar # -13 12 * * * podman volume export systemd-blinko-db-data --output /home/podman/cron-backup/blinko-db-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar -14 12 * * * podman volume export systemd-gitea-db-data --output /home/podman/cron-backup/gitea-db-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar -15 12 * * * podman volume export systemd-immich-db-data --output /home/podman/cron-backup/immich-db-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar -# 16 12 * * * podman volume export systemd-linkwarden-db-data --output /home/podman/cron-backup/linkwarden-db-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar -# 17 12 * * * podman volume export systemd-mattermost-db-data --output /home/podman/cron-backup/mattermost-db-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar -# 18 12 * * * podman volume export systemd-odoo-db-data --output /home/podman/cron-backup/odoo-db-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar -19 12 * * * podman volume export systemd-vaultwarden-db-data --output /home/podman/cron-backup/vaultwarden-db-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +13 12 * * * podman volume export systemd-blinko-db-data --output /home/podman/cron-backup/phares-blinko-db-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +14 12 * * * podman volume export systemd-gitea-db-data --output /home/podman/cron-backup/phares-gitea-db-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +15 12 * * * podman volume export systemd-immich-db-data --output /home/podman/cron-backup/phares-immich-db-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +# 16 12 * * * podman volume export systemd-linkwarden-db-data --output /home/podman/cron-backup/phares-linkwarden-db-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +# 17 12 * * * podman volume export systemd-mattermost-db-data --output /home/podman/cron-backup/phares-mattermost-db-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +# 18 12 * * * podman volume export systemd-odoo-db-data --output /home/podman/cron-backup/phares-odoo-db-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +19 12 * * * podman volume export systemd-vaultwarden-db-data --output /home/podman/cron-backup/phares-vaultwarden-db-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar # -20 12 * * * podman volume export systemd-gotify-server-data --output /home/podman/cron-backup/gotify-server-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar -# 21 12 * * * podman volume export systemd-2fauth-server-data --output /home/podman/cron-backup/2fauth-server-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +20 12 * * * podman volume export systemd-gotify-server-data --output /home/podman/cron-backup/phares-gotify-server-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +# 21 12 * * * podman volume export systemd-2fauth-server-data --output /home/podman/cron-backup/phares-2fauth-server-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar # -22 12 * * * podman volume export systemd-beszel-server-data --output /home/podman/cron-backup/systemd-beszel-server-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar +22 12 * * * podman volume export systemd-beszel-server-data --output /home/podman/cron-backup/phares-systemd-beszel-server-data-$(date +"\%Y-\%m-\%d--\%H-\%M-\%S").tar