From 48421ac4b07a9a3c21ffa932d6cb817ddcbd8e1f Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 19 Sep 2021 16:47:25 +0200 Subject: l domsen: add illustra.de --- lass/2configs/websites/domsen.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/2configs/websites/domsen.nix') diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index e603f49da..5da4b0ae2 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -28,6 +28,7 @@ in { (servePage [ "aldonasiech.com" "www.aldonasiech.com" ]) (servePage [ "apanowicz.de" "www.apanowicz.de" ]) (servePage [ "reich-gebaeudereinigung.de" "www.reich-gebaeudereinigung.de" ]) + (servePage [ "illustra.de" "www.illustra.de" ]) (servePage [ "freemonkey.art" "www.freemonkey.art" -- cgit v1.2.3 From a602201eb253ee297f51b605881f42c7b71e4768 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 19 Sep 2021 16:48:05 +0200 Subject: l domsen: set nextcloud pw via krebs.secret --- lass/2configs/websites/domsen.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lass/2configs/websites/domsen.nix') diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 5da4b0ae2..453ecff8c 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -89,12 +89,18 @@ in { file_uploads = on ''; + krebs.secret.files.nextcloud_pw = { + path = "/run/nextcloud.pw"; + owner.name = "nextcloud"; + group-name = "nextcloud"; + source-path = toString + "/nextcloud_pw"; + }; services.nextcloud = { enable = true; hostName = "o.xanf.org"; package = pkgs.nextcloud20; config = { - adminpassFile = toString + "/nextcloud_pw"; + adminpassFile = "/run/nextcloud.pw"; overwriteProtocol = "https"; }; https = true; -- cgit v1.2.3 From 41d90b07e021ff19156aaec0bc9336c2cbc4442c Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 19 Sep 2021 16:48:21 +0200 Subject: l domsen: pin php to 7.3 --- lass/2configs/websites/domsen.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/2configs/websites/domsen.nix') diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 453ecff8c..1032ea19d 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -82,6 +82,7 @@ in { "o_ubikmedia_de" ]; + services.phpfpm.phpPackage = pkgs.php73; services.phpfpm.phpOptions = '' sendmail_path = ${sendmail} -t upload_max_filesize = 100M -- cgit v1.2.3 From d5e692105fe23ab5a90eb020c75eaf8c22d37ecb Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 19 Sep 2021 16:48:37 +0200 Subject: l domsen nextcloud: 20 -> 21 --- lass/2configs/websites/domsen.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/2configs/websites/domsen.nix') diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 1032ea19d..88888c099 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -99,7 +99,7 @@ in { services.nextcloud = { enable = true; hostName = "o.xanf.org"; - package = pkgs.nextcloud20; + package = pkgs.nextcloud21; config = { adminpassFile = "/run/nextcloud.pw"; overwriteProtocol = "https"; -- cgit v1.2.3 From 924752a609c4ac890f77043aebd97339812d8402 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 19 Sep 2021 16:49:04 +0200 Subject: l domsen: dont createHome on shared user --- lass/2configs/websites/domsen.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/2configs/websites/domsen.nix') diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 88888c099..567f6033e 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -186,7 +186,7 @@ in { group = "xanf"; home = "/home/xanf"; useDefaultShell = true; - createHome = true; + createHome = false; # creathome forces permissions isNormalUser = true; }; -- cgit v1.2.3 From c1b390bfef47f6c40ee2aea08784100ee5e73b4a Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 19 Sep 2021 16:49:34 +0200 Subject: l domsen: fix permissions --- lass/2configs/websites/domsen.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lass/2configs/websites/domsen.nix') diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 567f6033e..45406a407 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -340,14 +340,14 @@ in { ''; krebs.permown = { - "/backups/domsen" = { - owner = "backup"; + "/srv/http" = { group = "syncthing"; + owner = "nginx"; umask = "0007"; }; - "/srv/http" = { - owner = "syncthing"; - group = "nginx"; + "/home/xanf/XANF_TEAM" = { + owner = "XANF_TEAM"; + group = "xanf"; umask = "0007"; }; }; -- cgit v1.2.3 From 6915a8dcc3e8cfccc223bada053612ea64085ef0 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 19 Sep 2021 16:49:46 +0200 Subject: l domsen: add more users --- lass/2configs/websites/domsen.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'lass/2configs/websites/domsen.nix') diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix index 45406a407..40f67537e 100644 --- a/lass/2configs/websites/domsen.nix +++ b/lass/2configs/websites/domsen.nix @@ -299,6 +299,24 @@ in { isNormalUser = true; }; + users.users.movematchers = { + uid = genid_uint31 "movematchers"; + home = "/home/movematchers"; + useDefaultShell = true; + extraGroups = [ "xanf" ]; + createHome = true; + isNormalUser = true; + }; + + users.users.blackphoton = { + uid = genid_uint31 "blackphoton"; + home = "/home/blackphoton"; + useDefaultShell = true; + extraGroups = [ "xanf" ]; + createHome = true; + isNormalUser = true; + }; + users.groups.xanf = {}; krebs.on-failure.plans.restic-backups-domsen = { -- cgit v1.2.3