From f955b587e7068e1b76f70055b61aa124400e7b1f Mon Sep 17 00:00:00 2001 From: octospacc Date: Thu, 2 Feb 2023 19:47:00 +0100 Subject: [PATCH] [Server] Add nginx config; Update 2 backup scripts --- Server/.Repo.Update.sh | 1 + Server/Scripts/Backup/CloudBackup.sh | 2 +- Server/nginx/sites-available/articles | 20 +++++++++ .../sites-available/epic.octt.eu.org.conf | 31 +++++++++++++ Server/nginx/sites-available/feeds | 16 +++++++ .../sites-available/godo.octt.eu.org.conf | 44 +++++++++++++++++++ Server/nginx/sites-available/librex | 16 +++++++ .../sites-available/miss.octt.eu.org.conf | 30 +++++++++++++ Server/nginx/sites-available/root | 16 +++++++ 9 files changed, 175 insertions(+), 1 deletion(-) create mode 100644 Server/nginx/sites-available/articles create mode 100644 Server/nginx/sites-available/epic.octt.eu.org.conf create mode 100644 Server/nginx/sites-available/feeds create mode 100644 Server/nginx/sites-available/godo.octt.eu.org.conf create mode 100644 Server/nginx/sites-available/librex create mode 100644 Server/nginx/sites-available/miss.octt.eu.org.conf create mode 100644 Server/nginx/sites-available/root diff --git a/Server/.Repo.Update.sh b/Server/.Repo.Update.sh index cae3a33..f0a351e 100755 --- a/Server/.Repo.Update.sh +++ b/Server/.Repo.Update.sh @@ -5,3 +5,4 @@ cd "$( dirname "$( realpath "$0" )" )" cp -v /etc/diycron ./diycron cp -v /Server/Scripts/Backup/*.sh ./Scripts/Backup/ cp -v /Server/Scripts/Backup/*.cfg ./Scripts/Backup/ +# nginx was done manually diff --git a/Server/Scripts/Backup/CloudBackup.sh b/Server/Scripts/Backup/CloudBackup.sh index f557d25..702f522 100755 --- a/Server/Scripts/Backup/CloudBackup.sh +++ b/Server/Scripts/Backup/CloudBackup.sh @@ -21,7 +21,7 @@ Item="FreshRSS-data" && cp "../${Item}/Latest.tar.xz" "./${Item}.tar.xz" && ccen GitPush cd .. -#GitPullPushPath "./Personal-Game-Saves" +GitPullPushPath "/Cloud/Repos/Personal-Game-Saves" #CloudDir="/home/octo/Cloud" #cd "$CloudDir" diff --git a/Server/nginx/sites-available/articles b/Server/nginx/sites-available/articles new file mode 100644 index 0000000..a5c0575 --- /dev/null +++ b/Server/nginx/sites-available/articles @@ -0,0 +1,20 @@ +server { + listen 443 ssl; + server_name articles.octt.eu.org; + ssl_certificate /etc/letsencrypt/live/articles.octt.eu.org/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/articles.octt.eu.org/privkey.pem; + ssl_prefer_server_ciphers on; + location / { + proxy_http_version 1.1; + proxy_pass http://octt.ddns.net:8036; + 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 Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Accept-Encoding ""; # Needed for sub_filter + sub_filter ' href="http://octt.ddns.net:8036/' ' href="https://articles.octt.eu.org/'; + sub_filter ' src="http://octt.ddns.net:8036/' ' src="https://articles.octt.eu.org/'; + sub_filter_once off; + } +} diff --git a/Server/nginx/sites-available/epic.octt.eu.org.conf b/Server/nginx/sites-available/epic.octt.eu.org.conf new file mode 100644 index 0000000..3627adf --- /dev/null +++ b/Server/nginx/sites-available/epic.octt.eu.org.conf @@ -0,0 +1,31 @@ +#server { +# listen 80; +# listen [::]:80; +# server_name epic.octt.eu.org; +# index index.html; +# rewrite ^ https://$server_name$request_uri? permanent; +#} + +server { + listen 443 ssl; + server_name epic.octt.eu.org; + ssl_certificate /etc/letsencrypt/live/epic.octt.eu.org/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/epic.octt.eu.org/privkey.pem; + ssl_prefer_server_ciphers on; + location / { + proxy_http_version 1.1; + proxy_pass http://localhost:7156; + 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 Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + #sub_filter '' '\n\n'; + #sub_filter_once on; + } + location /newsmirror { + root /Server/www/epic.octt.eu.org; + try_files $uri =404; + } +} diff --git a/Server/nginx/sites-available/feeds b/Server/nginx/sites-available/feeds new file mode 100644 index 0000000..a1d56bf --- /dev/null +++ b/Server/nginx/sites-available/feeds @@ -0,0 +1,16 @@ +server { + listen 443 ssl; + server_name feeds.octt.eu.org; + ssl_certificate /etc/letsencrypt/live/feeds.octt.eu.org/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/feeds.octt.eu.org/privkey.pem; + ssl_prefer_server_ciphers on; + location / { + proxy_http_version 1.1; + proxy_pass http://octt.ddns.net:8017; + 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 Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + } +} diff --git a/Server/nginx/sites-available/godo.octt.eu.org.conf b/Server/nginx/sites-available/godo.octt.eu.org.conf new file mode 100644 index 0000000..891a123 --- /dev/null +++ b/Server/nginx/sites-available/godo.octt.eu.org.conf @@ -0,0 +1,44 @@ +server { + listen 80; + server_name godo.octt.eu.org; + rewrite ^ https://$server_name$request_uri? permanent; +} + +server { + listen 443 ssl; + server_name godo.octt.eu.org; + ssl_certificate /etc/letsencrypt/live/godo.octt.eu.org/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/godo.octt.eu.org/privkey.pem; + ssl_prefer_server_ciphers on; + location / { + proxy_http_version 1.1; + proxy_pass http://localhost:6066; + 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 Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + } + location = / { + rewrite ^ https://$server_name/@octt permanent; + } +} + +server { + listen 443 ssl; + server_name pinafore-0.octt.eu.org; + ssl_certificate /etc/letsencrypt/live/pinafore-0.octt.eu.org/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/pinafore-0.octt.eu.org/privkey.pem; + ssl_prefer_server_ciphers on; + location / { + proxy_http_version 1.1; + proxy_pass https://pinafore.social; + proxy_set_header Host "pinafore.social"; + 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 Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + } +} diff --git a/Server/nginx/sites-available/librex b/Server/nginx/sites-available/librex new file mode 100644 index 0000000..06248f6 --- /dev/null +++ b/Server/nginx/sites-available/librex @@ -0,0 +1,16 @@ +server { + listen 443 ssl; + server_name librex.octt.eu.org; + ssl_certificate /etc/letsencrypt/live/librex.octt.eu.org/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/librex.octt.eu.org/privkey.pem; + ssl_prefer_server_ciphers on; + location / { + proxy_http_version 1.1; + proxy_pass https://librex.devol.it; + 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 Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + } +} diff --git a/Server/nginx/sites-available/miss.octt.eu.org.conf b/Server/nginx/sites-available/miss.octt.eu.org.conf new file mode 100644 index 0000000..4f441a2 --- /dev/null +++ b/Server/nginx/sites-available/miss.octt.eu.org.conf @@ -0,0 +1,30 @@ +server { + listen 443 ssl; + server_name miss.octt.eu.org; + ssl_certificate /etc/letsencrypt/live/miss.octt.eu.org/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/miss.octt.eu.org/privkey.pem; + ssl_prefer_server_ciphers on; + location / { + proxy_http_version 1.1; + proxy_pass http://localhost:3033; + #proxy_pass http://192.168.1.157:3033; + 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 Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + sub_filter '' '\n\n'; + sub_filter '' '\n\n'; + sub_filter_once on; + } + location /Static/ { + root /Server/www/; + autoindex off; + } + location /MisskeyStatic/ { + root /Server/www/; + try_files $uri $uri.html $uri/index.html index.html; + autoindex off; + } +} diff --git a/Server/nginx/sites-available/root b/Server/nginx/sites-available/root new file mode 100644 index 0000000..faf62fe --- /dev/null +++ b/Server/nginx/sites-available/root @@ -0,0 +1,16 @@ +server { + listen 80; + rewrite ^ https://$host$request_uri? permanent; +} + +server { + listen 443 ssl; + server_name hlb0.octt.eu.org; + ssl_certificate /etc/letsencrypt/live/hlb0.octt.eu.org/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/hlb0.octt.eu.org/privkey.pem; + ssl_prefer_server_ciphers on; + location / { + root /Server/www/root; + try_files $uri =404; + } +}