From 2dc617874e001c25c1caceccd14ef7c1f74f73bc Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sun, 2 Dec 2018 21:27:29 +0100
Subject: l: RIP fritz (uses helsinki)

---
 lass/2configs/websites/fritz.nix | 70 ----------------------------------------
 1 file changed, 70 deletions(-)
 delete mode 100644 lass/2configs/websites/fritz.nix

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

diff --git a/lass/2configs/websites/fritz.nix b/lass/2configs/websites/fritz.nix
deleted file mode 100644
index 14d6ce9ec..000000000
--- 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
-  '';
-}
-- 
cgit v1.2.3


From 79e5320e6b1da4d9d3569fe2b4f42c5d9db7c641 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 3 Dec 2018 09:47:35 +0100
Subject: l: use genid_uint31 where needed

---
 lass/2configs/websites/lassulus.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/lass/2configs/websites/lassulus.nix b/lass/2configs/websites/lassulus.nix
index 6470d86f7..17af0d00d 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;
-- 
cgit v1.2.3