Merge remote-tracking branch 'lass/master' into HEAD

6 files changed, 16 insertions, 75 deletions

diff --git a/lass/2configs/binary-cache/server.nix b/lass/2configs/binary-cache/server.nix
index 86158c46..d3775b5d 100644
--- a/lass/2configs/binary-cache/server.nix
+++ b/lass/2configs/binary-cache/server.nix
@@ -26,6 +26,7 @@
       '';
     };
     virtualHosts."cache.krebsco.de" = {
+      forceSSL = true;
       serverAliases = [ "cache.lassul.us" ];
       enableACME = true;
       locations."/".extraConfig = ''
diff --git a/lass/2configs/blue-host.nix b/lass/2configs/blue-host.nix
index fba99674..9cf294af 100644
--- a/lass/2configs/blue-host.nix
+++ b/lass/2configs/blue-host.nix
@@ -81,6 +81,7 @@ in {
             host = "${host}.r",
             targetdir = "/var/lib/containers/.blue",
             rsync = {
+              archive = true,
               owner = true,
               group = true,
             };
diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix
index 9ea91ae1..36e797a9 100644
--- a/lass/2configs/mail.nix
+++ b/lass/2configs/mail.nix
@@ -174,6 +174,16 @@ let
     macro pager a "<modify-labels>-archive\n"  # tag as Archived
 
 
+    bind index U noop
+    bind index u noop
+    bind pager U noop
+    bind pager u noop
+    macro index U "<modify-labels>+unread\n"
+    macro index u "<modify-labels>-unread\n"
+    macro pager U "<modify-labels>+unread\n"
+    macro pager u "<modify-labels>-unread\n"
+
+
     bind index t noop
     bind pager t noop
     macro index t "<modify-labels>"        # tag as Archived
diff --git a/lass/2configs/radio.nix b/lass/2configs/radio.nix
index 85faded1..987632cd 100644
--- a/lass/2configs/radio.nix
+++ b/lass/2configs/radio.nix
@@ -5,7 +5,6 @@ with import <stockholm/lib>;
 let
   name = "radio";
   mainUser = config.users.extraUsers.mainUser;
-  inherit (import <stockholm/lib>) genid;
 
   admin-password = import <secrets/icecast-admin-pw>;
   source-password = import <secrets/icecast-source-pw>;
@@ -31,7 +30,7 @@ in {
     "${name}" = rec {
       inherit name;
       group = name;
-      uid = genid name;
+      uid = genid_uint31 name;
       description = "radio manager";
       home = "/home/${name}";
       useDefaultShell = true;
diff --git a/lass/2configs/websites/fritz.nix b/lass/2configs/websites/fritz.nix
deleted file mode 100644
index 14d6ce9e..00000000
--- a/lass/2configs/websites/fritz.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-let
-  inherit (import <stockholm/lib>)
-    genid
-    head
-  ;
-  inherit (import <stockholm/lass/2configs/websites/util.nix> {inherit lib pkgs;})
-    servePage
-    serveWordpress
-  ;
-
-  msmtprc = pkgs.writeText "msmtprc" ''
-    account default
-      host localhost
-  '';
-
-  sendmail = pkgs.writeDash "msmtp" ''
-    exec ${pkgs.msmtp}/bin/msmtp --read-envelope-from -C ${msmtprc} "$@"
-  '';
-
-in {
-
-  services.nginx.enable = true;
-
-  imports = [
-    ./default.nix
-    ./sqlBackup.nix
-
-    (serveWordpress [ "radical-dreamers.de" "www.radical-dreamers.de" ])
-
-    (serveWordpress [ "gs-maubach.de" "www.gs-maubach.de" ])
-
-    (serveWordpress [ "spielwaren-kern.de" "www.spielwaren-kern.de" ])
-
-    (servePage [ "familienpraxis-korntal.de" "www.familienpraxis-korntal.de" ])
-
-    (serveWordpress [ "ttf-kleinaspach.de" "www.ttf-kleinaspach.de" ])
-
-    (serveWordpress [ "eastuttgart.de" "www.eastuttgart.de" ])
-
-    (serveWordpress [ "goldbarrendiebstahl.radical-dreamers.de" ])
-  ];
-
-  lass.mysqlBackup.config.all.databases = [
-    "eastuttgart_de"
-    "radical_dreamers_de"
-    "spielwaren_kern_de"
-    "ttf_kleinaspach_de"
-  ];
-
-  users.users.root.openssh.authorizedKeys.keys = [
-    config.krebs.users.fritz.pubkey
-  ];
-
-  users.users.goldbarrendiebstahl = {
-    home = "/srv/http/goldbarrendiebstahl.radical-dreamers.de";
-    uid = genid "goldbarrendiebstahl";
-    createHome = true;
-    useDefaultShell = true;
-    openssh.authorizedKeys.keys = [
-      config.krebs.users.fritz.pubkey
-    ];
-  };
-
-  services.phpfpm.phpOptions = ''
-    sendmail_path = ${sendmail} -t
-  '';
-}
diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix
index 6470d86f..17af0d00 100644
--- a/lass/2configs/websites/lassulus.nix
+++ b/lass/2configs/websites/lassulus.nix
@@ -3,7 +3,7 @@
 with lib;
 let
   inherit (import <stockholm/lib>)
-    genid
+    genid_uint31
   ;
 
 in {
@@ -22,7 +22,7 @@ in {
   krebs.tinc_graphs.enable = true;
 
   users.users.lass-stuff = {
-    uid = genid "lass-stuff";
+    uid = genid_uint31 "lass-stuff";
     description = "lassul.us blog cgi stuff";
     home = "/var/empty";
   };
@@ -124,7 +124,7 @@ in {
   };
 
   users.users.blog = {
-    uid = genid "blog";
+    uid = genid_uint31 "blog";
     description = "lassul.us blog deployment";
     home = "/srv/http/lassul.us";
     useDefaultShell = true;