From d7c333ce04b9be59291543d9489fb27fb21b4923 Mon Sep 17 00:00:00 2001 From: octospacc Date: Mon, 10 Apr 2023 00:16:17 +0200 Subject: [PATCH] Upd --- .../Server/Scripts/Backup/BackupGlobals.cfg | 5 +++ .../Root/Server/Scripts/Backup/CloudBackup.sh | 10 ++---- .../Scripts/Backup/ExternalDataBackup.sh | 4 +-- .../Server/Scripts/Backup/ServerDataBackup.sh | 16 +++++---- Server/Root/etc/diycron | 2 ++ .../etc/nginx/sites-available/SpaccCloud.conf | 34 +++++++++++++++++++ .../etc/nginx/sites-available/analytics.conf | 11 +++++- .../Root/etc/nginx/sites-available/feeds.conf | 2 +- .../etc/nginx/sites-available/invidious.conf | 20 +++++++++++ .../Root/etc/nginx/sites-available/root.conf | 6 +++- .../Root/etc/systemd/system/diycron.service | 4 +-- 11 files changed, 94 insertions(+), 20 deletions(-) create mode 100644 Server/Root/etc/nginx/sites-available/SpaccCloud.conf create mode 100644 Server/Root/etc/nginx/sites-available/invidious.conf diff --git a/Server/Root/Server/Scripts/Backup/BackupGlobals.cfg b/Server/Root/Server/Scripts/Backup/BackupGlobals.cfg index d5d6be2..7e5df38 100644 --- a/Server/Root/Server/Scripts/Backup/BackupGlobals.cfg +++ b/Server/Root/Server/Scripts/Backup/BackupGlobals.cfg @@ -27,3 +27,8 @@ ccencryptNow() { WriteLastLog() { echo "$0: $(date)" > "${BackupsBase}/Last.log" } + +EchoExec() { + echo "$@" + $@ +} diff --git a/Server/Root/Server/Scripts/Backup/CloudBackup.sh b/Server/Root/Server/Scripts/Backup/CloudBackup.sh index c68a28c..5e135f3 100755 --- a/Server/Root/Server/Scripts/Backup/CloudBackup.sh +++ b/Server/Root/Server/Scripts/Backup/CloudBackup.sh @@ -18,7 +18,7 @@ BackPathCrypt() { Folder="$1" Key="$2" Ext="$([ -z "$3" ] && echo ".tar.xz" || echo "$3")" - cp "../${Folder}/Latest${Ext}" "./${Folder}${Ext}" && \ + cp -v "../${Folder}/Latest${Ext}" "./${Folder}${Ext}" && \ ccencryptNow "./${Folder}${Ext}" "${Key}" } @@ -27,16 +27,12 @@ BackPathCrypt "Invidious-User" "${BackupKey_Git_Invidious}" ".7z" #BackPathCrypt "wallabag-data" "${BackupKey_Git_wallabag}" BackPathCrypt "FreshRSS-data" "${BackupKey_Git_FreshRSS}" #BackPathCrypt "shiori-data" "${BackupKey_Git_Shiori}" -#Item="Invidious-User" && cp "../${Item}/Latest.7z" "./${Item}.7z" && ccencryptNow "./${Item}.7z" "${BackupKey_Git_Invidious}" -#Item="wallabag-data" && cp "../${Item}/Latest.tar.xz" "./${Item}.tar.xz" && ccencryptNow "./${Item}.tar.xz" "${BackupKey_Git_wallabag}" -#Item="FreshRSS-data" && cp "../${Item}/Latest.tar.xz" "./${Item}.tar.xz" && ccencryptNow "./${Item}.tar.xz" "${BackupKey_Git_FreshRSS}" -#Item="shiori-data" && cp "../${Item}/Latest.tar.xz" "./${Item}.tar.xz" && ccencryptNow "./${Item}.tar.xz" "${BackupKey_Git_Shiori}" GitPush cd .. cd ./Articles-Backup-Private -rm -rf ./shiori-data -cp -r "../shiori-data/Latest.d" "./shiori-data" +EchoExec rm -rf ./shiori-data +EchoExec cp -rp "../shiori-data/Latest.d" "./shiori-data" GitPush cd .. diff --git a/Server/Root/Server/Scripts/Backup/ExternalDataBackup.sh b/Server/Root/Server/Scripts/Backup/ExternalDataBackup.sh index 94b8de5..0b02ede 100755 --- a/Server/Root/Server/Scripts/Backup/ExternalDataBackup.sh +++ b/Server/Root/Server/Scripts/Backup/ExternalDataBackup.sh @@ -5,10 +5,10 @@ # Invidious personal JSON dump Name="Invidious-User" -mkdir -p "./${Name}" +mkdir -vp "./${Name}" curl \ "${Invidious_Backup_URL}/subscription_manager?action_takeout=1&format=json" \ -H "${Invidious_Backup_Cookie}" \ - | 7z a -mmt1 -mx9 "./${Name}/${RunDate}.7z" -si && cp "./${Name}/${RunDate}.7z" "./${Name}/Latest.7z" + | 7z a -mmt1 -mx9 "./${Name}/${RunDate}.7z" -si && cp -v "./${Name}/${RunDate}.7z" "./${Name}/Latest.7z" WriteLastLog diff --git a/Server/Root/Server/Scripts/Backup/ServerDataBackup.sh b/Server/Root/Server/Scripts/Backup/ServerDataBackup.sh index 14ba317..d5755b3 100755 --- a/Server/Root/Server/Scripts/Backup/ServerDataBackup.sh +++ b/Server/Root/Server/Scripts/Backup/ServerDataBackup.sh @@ -5,17 +5,21 @@ SimpleBackup() { # $1: Folder - # $2: Optional prefix in /Server path - mkdir -p "./$1" - tar cvJSf "./$1/${RunDate}.tar.xz" "/Server/$2/$1" && \ - cp "./$1/${RunDate}.tar.xz" "./$1/Latest.tar.xz" - rm -rf "./$1/Latest.d" - cp -r "/Server/$2/$1" "./$1/Latest.d" + # $2: Optional prefix relative to path in /Server + mkdir -vp "./$1" + #tar cvJSf "./$1/${RunDate}.tar.xz" "/Server/$2/$1" && \ + #cp "./$1/${RunDate}.tar.xz" "./$1/Latest.tar.xz" + EchoExec rm -rf "./$1/Latest.d" + EchoExec cp -rp "/Server/$2/$1" "./$1/Latest.d" + EchoExec tar cJSf "./$1/${RunDate}.tar.xz" "./$1/Latest.d" && \ + cp -v "./$1/${RunDate}.tar.xz" "./$1/Latest.tar.xz" } #SimpleBackup "wallabag-data" SimpleBackup "FreshRSS-data" + SimpleBackup "shiori-data" "Shiori" +rm -v "./shiori-data/Latest.d/archive/*" # GoToSocial #Name="GoToSocial" diff --git a/Server/Root/etc/diycron b/Server/Root/etc/diycron index 6666dd0..2124690 100755 --- a/Server/Root/etc/diycron +++ b/Server/Root/etc/diycron @@ -21,7 +21,9 @@ ResetJobs() { echo "------------------------------------------" echo "[ $(date "+%F | %T") ] diycron started." +set -x # Enable command echo ResetJobs + while true do # Inside here, declaration of all cronjobs like normal shell commands, made easy thanks to integrated functions. diff --git a/Server/Root/etc/nginx/sites-available/SpaccCloud.conf b/Server/Root/etc/nginx/sites-available/SpaccCloud.conf new file mode 100644 index 0000000..943fdc2 --- /dev/null +++ b/Server/Root/etc/nginx/sites-available/SpaccCloud.conf @@ -0,0 +1,34 @@ +#server { +# listen 443 ssl; +# server_name spacccloud.octt.eu.org; +# ssl_certificate /etc/letsencrypt/live/spacccloud.octt.eu.org/fullchain.pem; +# ssl_certificate_key /etc/letsencrypt/live/spacccloud.octt.eu.org/privkey.pem; +# ssl_prefer_server_ciphers on; +# location / { +# proxy_http_version 1.1; +# proxy_pass http://localhost:8080; +# 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"; +# } +#} + +server { + listen 443 ssl; + server_name spacccloud-wfm.octt.eu.org; + ssl_certificate /etc/letsencrypt/live/spacccloud-wfm.octt.eu.org/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/spacccloud-wfm.octt.eu.org/privkey.pem; + ssl_prefer_server_ciphers on; + location / { + proxy_http_version 1.1; + proxy_pass http://localhost:7580; + proxy_set_header Access-Control-Allow-Origin https://spacccloud.octt.eu.org http://192.168.1.25 http://192.168.1.25:8080; + 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/Root/etc/nginx/sites-available/analytics.conf b/Server/Root/etc/nginx/sites-available/analytics.conf index a5b6ca8..c6af350 100644 --- a/Server/Root/etc/nginx/sites-available/analytics.conf +++ b/Server/Root/etc/nginx/sites-available/analytics.conf @@ -4,8 +4,17 @@ server { ssl_certificate /etc/letsencrypt/live/private-analytics-not-for-public-use.octt.eu.org/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/private-analytics-not-for-public-use.octt.eu.org/privkey.pem; ssl_prefer_server_ciphers on; + location /sitoctt/ { + proxy_http_version 1.1; + proxy_pass https://sitoctt.goatcounter.com/; + proxy_set_header Host "sitoctt.goatcounter.com"; + 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 /octtkb/ { - #resolver 9.9.9.9; proxy_http_version 1.1; proxy_pass https://octtkb.goatcounter.com/; proxy_set_header Host "octtkb.goatcounter.com"; diff --git a/Server/Root/etc/nginx/sites-available/feeds.conf b/Server/Root/etc/nginx/sites-available/feeds.conf index a1d56bf..8416267 100644 --- a/Server/Root/etc/nginx/sites-available/feeds.conf +++ b/Server/Root/etc/nginx/sites-available/feeds.conf @@ -6,7 +6,7 @@ server { ssl_prefer_server_ciphers on; location / { proxy_http_version 1.1; - proxy_pass http://octt.ddns.net:8017; + proxy_pass http://localhost: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; diff --git a/Server/Root/etc/nginx/sites-available/invidious.conf b/Server/Root/etc/nginx/sites-available/invidious.conf new file mode 100644 index 0000000..41e64b0 --- /dev/null +++ b/Server/Root/etc/nginx/sites-available/invidious.conf @@ -0,0 +1,20 @@ +server { + listen 443 ssl; + server_name 5e47578a-1136-4891-a526-7d5db74c1fbc.octt.eu.org; + ssl_certificate /etc/letsencrypt/live/5e47578a-1136-4891-a526-7d5db74c1fbc.octt.eu.org/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/5e47578a-1136-4891-a526-7d5db74c1fbc.octt.eu.org/privkey.pem; + ssl_prefer_server_ciphers on; + location / { + proxy_http_version 1.1; + #proxy_pass https://invidious.snopyta.org/redirect?referer=; + proxy_pass https://youtube.owacon.moe; + 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_hide_header Content-Security-Policy; + proxy_hide_header X-Frame-Options; + proxy_hide_header X-XSS-Protection; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + } +} diff --git a/Server/Root/etc/nginx/sites-available/root.conf b/Server/Root/etc/nginx/sites-available/root.conf index faf62fe..9f0ea78 100644 --- a/Server/Root/etc/nginx/sites-available/root.conf +++ b/Server/Root/etc/nginx/sites-available/root.conf @@ -9,8 +9,12 @@ server { 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; + error_page 404 = /404.html; location / { root /Server/www/root; - try_files $uri =404; + #try_files $uri =404; + try_files $uri $uri.html $uri/index.html index.html; + autoindex off; + #error_page 404 = /404.html; } } diff --git a/Server/Root/etc/systemd/system/diycron.service b/Server/Root/etc/systemd/system/diycron.service index a2f6d9d..11f66ce 100644 --- a/Server/Root/etc/systemd/system/diycron.service +++ b/Server/Root/etc/systemd/system/diycron.service @@ -6,8 +6,8 @@ StartLimitIntervalSec=0 Type=simple Restart=always RestartSec=5 -CPUQuota=80% -MemoryMax=350M +CPUQuota=85% +MemoryMax=384M User=root ExecStart=sh -c "cat /var/log/diycron.log >> /var/log/diycron.log.old; sh /etc/diycron > /var/log/diycron.log" [Install]