diff --git a/Server/Root/Main/Server/Scripts/BackupAll.zx.mjs b/Server/Root/Main/Server/Scripts/BackupAll.zx.mjs index b25c1d2..c7c3eb1 100755 --- a/Server/Root/Main/Server/Scripts/BackupAll.zx.mjs +++ b/Server/Root/Main/Server/Scripts/BackupAll.zx.mjs @@ -233,10 +233,13 @@ Jobs.Cloud_ServerBackupLimited = async () => { await BackPathCrypt('script-server', Secrets.BackupKey_Git_scriptserver); await BackPathCrypt('docker-mailserver', Secrets.BackupKey_Git_dockermailserver); await BackPathCrypt('memos', Secrets.BackupKey_Git_memos); + await $`split --bytes=95M --numeric-suffixes ./FreshRSS.tar.xz.cpt FreshRSS.tar.xz.cpt.`; + await $`rm ./FreshRSS.tar.xz.cpt`; await GitPullPush(); }; Jobs.Cloud_ArticlesBackupPrivate = async () => { + await GitReclone('Articles-Backup-Private', 'https://gitlab.com/octospacc/Articles-Backup-Private/'); await FolderGoCopyForCloud('shiori-data', 'Articles-Backup-Private'); await GitPullPush(); }; diff --git a/Server/Root/Main/Server/Scripts/CleanCache.sh b/Server/Root/Main/Server/Scripts/CleanCache.sh index 94693ed..7a97cbb 100755 --- a/Server/Root/Main/Server/Scripts/CleanCache.sh +++ b/Server/Root/Main/Server/Scripts/CleanCache.sh @@ -2,3 +2,4 @@ set -e rm -rf /root/.cache /home/*/.cache || true rm -rf /var/log/*.{4,5,6,7,8,9}.* || true +docker system prune -af diff --git a/Server/Root/Main/Server/VMs/WindowsServer2022.sh b/Server/Root/Main/Server/VMs/WindowsServer2022.sh index e870b17..4341e80 100755 --- a/Server/Root/Main/Server/VMs/WindowsServer2022.sh +++ b/Server/Root/Main/Server/VMs/WindowsServer2022.sh @@ -14,8 +14,8 @@ while true; do -smbios type=4,manufacturer=Intel,max-speed=4800,current-speed=4800 \ -cpu "host,family=6,model=158,stepping=2,model_id=Intel(R) Core(TM) i9-12900K CPU @ 2.60GHz,vmware-cpuid-freq=false,enforce=false,host-phys-bits=true,hypervisor=off" \ -machine q35,kernel_irqchip=on \ - -smp 3 \ - -m 3840M \ + -smp 4 \ + -m 3700M \ -drive file=./WindowsServer2022.qcow2,format=qcow2,index=0,media=disk \ -device e1000,netdev=net0 \ -netdev user,id=net0,hostfwd=tcp::3389-:3389,hostfwd=udp::3389-:3389 \ diff --git a/Server/Root/etc/nginx/sites-available/SpaccBBS.conf b/Server/Root/etc/nginx/sites-available/SpaccBBS.conf index 9c2525c..2609061 100644 --- a/Server/Root/etc/nginx/sites-available/SpaccBBS.conf +++ b/Server/Root/etc/nginx/sites-available/SpaccBBS.conf @@ -107,6 +107,20 @@ server { } } + location ~ ^/new/api/v3/posts/.+/diffs/.+$ { + #limit_except GET POST PUT HEAD OPTIONS { + # deny all; + #} + if ($request_method = DELETE) { + return 405; + } + proxy_pass http://localhost:4567; + } + + location /search/ { + return 301 $scheme://$host/new/$request_uri; + } + location /user/ { rewrite ^ $scheme://$host/new/$request_uri redirect; } diff --git a/Server/Root/etc/nginx/sites-available/memos.conf b/Server/Root/etc/nginx/sites-available/memos.conf index 4994d07..5cb47c2 100644 --- a/Server/Root/etc/nginx/sites-available/memos.conf +++ b/Server/Root/etc/nginx/sites-available/memos.conf @@ -32,10 +32,10 @@ server { proxy_pass http://127.0.0.1/MemosViewer.php?structure=original&uid=; proxy_set_header Host hlb0.octt.eu.org; } - location ~ ^/memos.api.v1.MemoService/(CreateMemo|UpdateMemo)$ { - proxy_pass $proxy_pass_backend; - proxy_set_header Host hlb0.octt.eu.org; - } + #location ~ ^/memos.api.v1.MemoService/(CreateMemo|UpdateMemo)$ { + # proxy_pass $proxy_pass_backend; + # proxy_set_header Host hlb0.octt.eu.org; + #} location /assets/index-CupmbTt3.js { return 301 $scheme://hlb0.octt.eu.org/Res/Memos/fix-2024-06-03/index-01f381cb-D3gN5Bpo.js; } diff --git a/Server/Root/etc/nginx/sites-available/test.octt.eu.org.conf b/Server/Root/etc/nginx/sites-available/test.octt.eu.org.conf new file mode 100644 index 0000000..774ecca --- /dev/null +++ b/Server/Root/etc/nginx/sites-available/test.octt.eu.org.conf @@ -0,0 +1,26 @@ +server { + listen 80; + index index.php index.html; + server_name test.octt.eu.org; + root /Main/Server/www/test; + + default_type text/plain; + add_header X-Content-Type-Options nosniff; + + rewrite ^/(content|site|kirby)/(.*)$ /error last; + rewrite ^/\.(?!well-known/) /error last; + rewrite ^/(?!app\.webmanifest)[^/]+$ /index.php last; + + location / { + try_files $uri $uri/ /index.php$is_args$args; + } + + location ~* \.php$ { + try_files $uri =404; + fastcgi_pass php; + include fastcgi.conf; + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param SERVER_PORT 80; + } +}