From d8f72378dcbc925b0256e103828baa9ee186cce7 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 24 Oct 2021 19:58:34 +0200
Subject: l domsen: add roundcube at mail.lassul.us

---
 lass/2configs/websites/domsen.nix | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'lass/2configs/websites')

diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index 40f67537e..c67451eac 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -117,6 +117,13 @@ in {
   # workaround for android 7
   security.acme.certs."lassul.us".keyType = "rsa4096";
 
+  services.roundcube = {
+    enable = true;
+    hostName = "mail.lassul.us";
+    extraConfig = ''
+      $config['smtp_port'] = 25;
+    '';
+  };
   services.dovecot2 = {
     enable = true;
     mailLocation = "maildir:~/Mail";
-- 
cgit v1.2.3


From 2e9b241e868c17a3b29d782960d24437fd9bee2a Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 24 Oct 2021 20:05:08 +0200
Subject: l domsen: use default php

---
 lass/2configs/websites/domsen.nix | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lass/2configs/websites')

diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index c67451eac..c434955b8 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -82,7 +82,6 @@ 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 6300cb0166a87311fbe6683cd840daa8f2ad3a8e Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 24 Oct 2021 20:08:16 +0200
Subject: l domsen: fix exim authenticator permissions

---
 lass/2configs/websites/domsen.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/2configs/websites')

diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index c434955b8..3bb9ad4f8 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -144,7 +144,7 @@ in {
       driver = plaintext
       public_name = LOGIN
       server_prompts = "Username:: : Password::"
-      server_condition = ''${run{${config.lass.usershadow.path}/bin/verify_arg ${config.lass.usershadow.pattern} $auth1 $auth2}{yes}{no}}
+      server_condition = ''${run{/run/wrappers/bin/shadow_verify_arg ${config.lass.usershadow.pattern} $auth1 $auth2}{yes}{no}}
     '';
     internet-aliases = [
       { from = "dma@ubikmedia.de"; to = "domsen"; }
-- 
cgit v1.2.3


From 3bde0ed639ed6661f1e4e7fba07a172c8db855dd Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 24 Oct 2021 20:09:20 +0200
Subject: l domsen: add line user

---
 lass/2configs/websites/domsen.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'lass/2configs/websites')

diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index 3bb9ad4f8..3f055e370 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -323,6 +323,15 @@ in {
     isNormalUser = true;
   };
 
+  users.users.line = {
+    uid = genid_uint31 "line";
+    home = "/home/line";
+    useDefaultShell = true;
+    # extraGroups = [ "xanf" ];
+    createHome = true;
+    isNormalUser = true;
+  };
+
   users.groups.xanf = {};
 
   krebs.on-failure.plans.restic-backups-domsen = {
-- 
cgit v1.2.3


From 15539bebabaecda0abd49173bb2461149cbf0041 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 26 Oct 2021 21:03:07 +0200
Subject: l nginx: reload instead of restart, remove old default

---
 lass/2configs/websites/default.nix  | 7 +------
 lass/2configs/websites/lassulus.nix | 1 +
 2 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'lass/2configs/websites')

diff --git a/lass/2configs/websites/default.nix b/lass/2configs/websites/default.nix
index 1ffa105a7..bfd86ad7e 100644
--- a/lass/2configs/websites/default.nix
+++ b/lass/2configs/websites/default.nix
@@ -8,12 +8,7 @@ with import <stockholm/lib>;
     recommendedOptimisation = true;
     recommendedTlsSettings = true;
 
-    virtualHosts._http = {
-      default = true;
-      extraConfig = ''
-        return 404;
-      '';
-    };
+    enableReload = true;
 
     virtualHosts.default = {
       locations."= /etc/os-release".extraConfig = ''
diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix
index bb983b78e..5bf8de013 100644
--- a/lass/2configs/websites/lassulus.nix
+++ b/lass/2configs/websites/lassulus.nix
@@ -32,6 +32,7 @@ in {
   services.nginx.virtualHosts."lassul.us" = {
     addSSL = true;
     enableACME = true;
+    default = true;
     locations."/".extraConfig = ''
       root /srv/http/lassul.us;
     '';
-- 
cgit v1.2.3