From 8a32cd11d7ae755b04c2a2c82eabeca74a6a0cb5 Mon Sep 17 00:00:00 2001
From: naturallaw77 <advbuwxeew@use.startmail.com>
Date: Wed, 16 Aug 2023 09:40:11 -0700
Subject: [PATCH] updated cron script and removed move onlyoffice code

---
 configuration.nix           | 10 ++--------
 for_new_sovran_pros/sp.sh   |  9 ---------
 modules/personalization.nix |  2 --
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index b7d8388..1b9fb5c 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -287,12 +287,6 @@ in
 						tls internal
 					'';
 			};
-
-			"https://${personalization.onlyoffice_url}" = {
-						extraConfig = ''
-							reverse_proxy http://localhost:8000
-					'';
-			};
 		};
 	};
 
@@ -373,8 +367,8 @@ backup	/etc/nix-bitcoin-secrets/	localhost/
 		enable = true;
 		systemCronJobs = [
 		"*/5 * * * * caddy  /run/current-system/sw/bin/php -f /var/lib/www/nextcloud/cron.php"
-		"*/15 * * * *  root /var/lib/njalla/njalla.sh"
-		"*/15 * * * * root /var/lib/external_ip/external_ip.sh"
+		"*/15 * * * *  root /run/current-system/sw/bin/bash /var/lib/njalla/njalla.sh"
+		"*/15 * * * * root /run/current-system/sw/bin/bash /var/lib/external_ip/external_ip.sh"
 		];
 	};
 
diff --git a/for_new_sovran_pros/sp.sh b/for_new_sovran_pros/sp.sh
index f70c10b..3b66af0 100644
--- a/for_new_sovran_pros/sp.sh
+++ b/for_new_sovran_pros/sp.sh
@@ -26,7 +26,6 @@ mkdir /var/lib/domains
 touch /var/lib/domains/btcpayserver
 touch /var/lib/domains/matrix
 touch /var/lib/domains/nextcloud
-touch /var/lib/domains/onlyoffice
 touch /var/lib/domains/sslemail
 touch /var/lib/domains/vaultwarden
 touch /var/lib/domains/wordpress
@@ -53,10 +52,6 @@ echo -e "${GREEN}What is your New Vaultwarden domain name?${ENDCOLOR}"
 read 
 echo -n $REPLY > /var/lib/domains/vaultwarden
 
-echo -e "${GREEN}What is your New OnlyOffice domain name?${ENDCOLOR}"
-read 
-echo -n $REPLY > /var/lib/domains/onlyoffice
-
 echo -e "${GREEN}What is the email you would like to use to manage the SSL certificates for your domains?${ENDCOLOR}"
 read 
 echo -n $REPLY > /var/lib/domains/sslemail
@@ -154,7 +149,6 @@ touch /var/lib/secrets/matrixdb
 touch /var/lib/secrets/turn
 touch /var/lib/secrets/matrix_reg_secret
 touch /var/lib/secrets/main
-touch /var/lib/secrets/onlyofficejwtSecretFile
 touch /var/lib/secrets/vaultwarden/vaultwarden.env
 touch /var/lib/secrets/external_ip
 
@@ -164,7 +158,6 @@ echo -n $(pwgen -s 17 -1) > /var/lib/secrets/matrixdb
 echo -n $(pwgen -s 17 -1) > /var/lib/secrets/turn
 echo -n $(pwgen -s 17 -1) > /var/lib/secrets/matrix_reg_secret
 echo -n $(pwgen -s 17 -1) > /var/lib/secrets/main
-echo -n $(pwgen -s 17 -1) > /var/lib/secrets/onlyofficejwtSecretFile
 echo -n ADMIN_TOKEN=$(openssl rand -base64 48
 ) > /var/lib/secrets/vaultwarden/vaultwarden.env
 
@@ -222,8 +215,6 @@ chown mysql:mysql /var/lib/secrets/wordpressdb -R
 
 chown vaultwarden:vaultwarden /var/lib/secrets/vaultwarden -R
 
-chown onlyoffice:onlyoffice /var/lib/secrets/onlyofficejwtSecretFile
-
 
 chmod 770 /var/lib/secrets/ -R
 
diff --git a/modules/personalization.nix b/modules/personalization.nix
index 857a91d..68c135c 100644
--- a/modules/personalization.nix
+++ b/modules/personalization.nix
@@ -6,7 +6,6 @@ nextcloud_url = builtins.readFile /var/lib/domains/nextcloud;
 btcpayserver_url = builtins.readFile /var/lib/domains/btcpayserver;
 caddy_email_for_zerossl = builtins.readFile /var/lib/domains/sslemail;
 vaultwarden_url = builtins.readFile /var/lib/domains/vaultwarden;
-onlyoffice_url = builtins.readFile /var/lib/domains/onlyoffice;
 
 ##
 
@@ -23,6 +22,5 @@ age.secrets.wordpressdb.file = /var/lib/agenix-secrets/wordpressdb.age;
 ##
 
 external_ip_secret = /var/lib/secrets/external_ip;
-onlyofficejwtSecretFile = /var/lib/secrets/onlyofficejwtSecretFile;
 
 }