Auto-Backup $'Fri Aug 23 2024 00:59:33 GMT+0200 (Central European Summer Time)'

Server/Root/Main/Server/Scripts/BackupAll.zx.mjs

@@ -88,6 +88,12 @@ const FolderGoCopyForCloud = async (src, dst) => {
 	await $`rm -rf ./${src}/.git || true`;
 };
 
+const ScriptAndGitBackup = async (folder, command, program='sh') => {
+	cd(folder);
+	await $`${program} ${command}`;
+	await GitPullPush();
+};
+
 const Work = async (job) => await within(Jobs[job]);
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -138,11 +144,8 @@ Jobs.Mixed_OctospaccAltervista = async () => {
 		await GitPullPush();
 };
 
-Jobs.Mixed_Snippets = async () => {
+Jobs.Mixed_Configs = () => ScriptAndGitBackup('./Configs', './Server/Repo.Update.sh');
-	cd('./Snippets');
+Jobs.Mixed_Snippets = () => ScriptAndGitBackup('./Snippets', './.CopyFromServer.sh');
-	await $`cp /Main/Server/www/Drive/Misc/Scripts/* ./`;
-	await GitPullPush();
-};
 
 // TODO: setup FTP access and Cookie
 Jobs.Mixed_SpacccraftAltervista = async () => {
@@ -225,7 +228,8 @@ await Work('Local_SpaccBBSNodeBB');
 await Work('Local_liminalgici');
 await Work('Local_Doku');
 
-//await Work('Mixed_Snippets');
+await Work('Mixed_Configs');
+await Work('Mixed_Snippets');
 await Work('Mixed_OctospaccAltervista');
 //await Work('Mixed_SpacccraftAltervista');
 //await Work('Exter_WikiSpacc');

Server/Root/Main/Server/Scripts/GitSyncs.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+

Server/Root/etc/nginx/sites-available/SpaccBBS.conf

@@ -17,7 +17,7 @@ server {
 	error_log /var/log/nginx/SpaccBBS.error.log warn;
 	access_log /var/log/nginx/SpaccBBS.access.log;
 
-	location / {
+	location /old {
 		try_files $uri $uri/ @rewriteapp;
 
 		# Pass the php scripts to FastCGI server specified in upstream declaration.
@@ -38,7 +38,7 @@ server {
 			# Use internal directive to prohibit access on older versions.
 			internal;
 		}
-		location /includes {
+		location /old/includes {
 			deny all;
 			internal;
 		}
@@ -68,6 +68,14 @@ server {
 		rewrite ^(.*)$ /install/app.php/$1 last;
 	}
 
+	location ~ /*\.php {
+		rewrite ^ $scheme://$host/old$request_uri redirect;
+	}
+
+	location / {
+		return 301 /new/;
+	}
+
 	location /new { #~ ^/(new$|new/) {
 		proxy_http_version 1.1;
 		proxy_pass http://localhost:4567;
@@ -106,9 +114,6 @@ server {
 		internal;
 	}
 
-	location /old {
-		rewrite ^ $scheme://$host/ redirect;
-	}
 	location /wap {
 		rewrite ^ $scheme://$host/?style=4 redirect;
 	}

Server/Root/etc/nginx/sites-available/SpaccBBSnew.conf

@@ -1,28 +0,0 @@
-server {
-	listen 80;
-	listen 443 ssl;
-	server_name bbs.spacc.eu.org bbs.spaccsoj3trhzowrrblzb5m6hgkwu6syghnmhett7gvxbrz5zhsrs4ad.onion;
-	ssl_certificate /etc/letsencrypt/live/bbs.spacc.eu.org/fullchain.pem;
-	ssl_certificate_key /etc/letsencrypt/live/bbs.spacc.eu.org/privkey.pem;
-	ssl_prefer_server_ciphers on;
-	error_log /var/log/nginx/SpaccBBS.error.log;
-	access_log /var/log/nginx/SpaccBBS.access.log;
-	location / {
-		proxy_http_version 1.1;
-		proxy_pass http://localhost:4567;
-		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 /.well-known/webfinger {
-		proxy_http_version 1.1;
-		proxy_pass http://localhost:4567/new/.well-known/webfinger;
-		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/Root/etc/nginx/sites-available/root.conf

@@ -1,18 +1,3 @@
-#server {
-#	listen 80;
-#	rewrite ^ https://$host$request_uri? permanent;
-#	location / {
-#		#resolver 127.0.0.1;
-#		proxy_http_version 1.1;
-#		proxy_pass https://127.0.0.1$request_uri?;
-#		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;
-#	}
-#}
-
 server {
 	listen 80;
 	listen 443 ssl;
@@ -132,16 +117,3 @@ server {
 		rewrite ^/wwwroot/(.*)$ /$1 permanent;
 	}
 }
-
-#server {
-#	    listen 80;
-#        listen 81;
-#        listen 443 ssl;
-#        server_name old;
-#        ssl_certificate /Main/Server/www/Temp/old/keys12/server.pem;
-#        ssl_certificate_key /Main/Server/www/Temp/old/keys12/private_unencrypted.pem;
-#        ssl_prefer_server_ciphers on;
-#        location / {
-#        	root /Main/Server/www/Temp/old;
-#        }
-#}

Server/Root/etc/nginx/sites-available/tweb.conf

@@ -0,0 +1,48 @@
+server {
+	server_name tweb.octt.eu.org;
+	listen 80;
+	return 301 https://$host$request_uri;
+}
+
+server {
+	listen 80;
+	listen 443 ssl;
+	server_name 1.tgweb.octt.eu.org;
+	ssl_certificate /etc/letsencrypt/live/1.tgweb.octt.eu.org/fullchain.pem;
+	ssl_certificate_key /etc/letsencrypt/live/1.tgweb.octt.eu.org/privkey.pem;
+	ssl_prefer_server_ciphers on;
+	location / {
+		proxy_pass https://127.0.0.1;
+		proxy_set_header Host tweb.octt.eu.org;		
+	}
+}
+
+server {
+	listen 80;
+	listen 443 ssl;
+	server_name tweb.octt.eu.org;
+	ssl_certificate /etc/letsencrypt/live/tweb.octt.eu.org/fullchain.pem;
+	ssl_certificate_key /etc/letsencrypt/live/tweb.octt.eu.org/privkey.pem; 
+	ssl_prefer_server_ciphers on;
+	access_log /var/log/nginx/tweb.access.log;                                                                                 
+	error_log /var/log/nginx/tweb.error.log; 
+
+	location / {
+		root /Main/Server/www/tweb;
+		try_files $uri $uri/ $uri.html =404;
+		autoindex off;
+	}
+	location /k/ {
+		return 301 $scheme://$host/;
+	}
+	location /a/ {
+		proxy_pass https://149.154.167.99;
+		proxy_set_header Host web.telegram.org;
+		sub_filter '</head>' '<script src="/tweb-a-inject.js"></script></head>';
+		sub_filter 'Telegram' 'Spaccogram';
+		sub_filter_once off;
+	}
+	location /z/ {
+		return 301 $scheme://$host/a/;
+	}
+}

Server/Root/etc/systemd/system/WinDog.service

@@ -6,6 +6,6 @@ Type=simple
 Restart=always
 RestartSec=10
 User=tux
-ExecStart=/Main/Server/Bots/WinDog/StartWinDog.sh
+ExecStart=/Main/Server/Bots/WinDog/RunWinDog.sh
 [Install]
 WantedBy=multi-user.target