1 files changed, 36 insertions, 39 deletions
diff --git a/lass/2configs/websites/fritz.nix b/lass/2configs/websites/fritz.nix
index e35615040..63efbecb6 100644
--- a/lass/2configs/websites/fritz.nix
+++ b/lass/2configs/websites/fritz.nix
@@ -1,57 +1,54 @@
 { config, pkgs, lib, ... }:
 
 let
-  inherit (import ../../4lib { inherit lib pkgs; })
-    manageCerts
-    activateACME
+  inherit (import <stockholm/krebs/4lib> { config = {}; inherit lib; })
+    genid
+    head
+    nameValuePair
+  ;
+  inherit (import <stockholm/lass/2configs/websites/util.nix> {inherit lib pkgs;})
     ssl
     servePage
-    serveWordpress;
+    serveWordpress
+  ;
 
 in {
   imports = [
-    ( manageCerts [ "biostase.de" "www.biostase.de" ])
-    #( serveWordpress [ "biostase.de" "www.biostase.de" ])
+    ./sqlBackup.nix
+    (ssl [ "biostase.de" "www.biostase.de" ])
+    (serveWordpress [ "biostase.de" "www.biostase.de" ])
 
-    ( manageCerts [ "radical-dreamers.de" ])
-    ( serveWordpress [ "radical-dreamers.de" ])
+    (ssl [ "radical-dreamers.de" "www.radical-dreamers.de" ])
+    (serveWordpress [ "radical-dreamers.de" "www.radical-dreamers.de" ])
 
-    ( manageCerts [ "gs-maubach.de" ])
-    ( serveWordpress [ "gs-maubach.de" ])
+    (ssl [ "gs-maubach.de" "www.gs-maubach.de" ])
+    (serveWordpress [ "gs-maubach.de" "www.gs-maubach.de" ])
 
-    ( manageCerts [ "spielwaren-kern.de" ])
-    ( serveWordpress [ "spielwaren-kern.de" ])
+    (ssl [ "spielwaren-kern.de" "www.spielwaren-kern.de" ])
+    (serveWordpress [ "spielwaren-kern.de" "www.spielwaren-kern.de" ])
 
-    ( manageCerts [ "familienpraxis-korntal.de" ])
-    ( servePage [ "familienpraxis-korntal.de" ])
+    (ssl [ "familienpraxis-korntal.de" "www.familienpraxis-korntal.de" ])
+    (servePage [ "familienpraxis-korntal.de" "www.familienpraxis-korntal.de" ])
 
-    ( manageCerts [ "ttf-kleinaspach.de" ])
-    ( serveWordpress [ "ttf-kleinaspach.de" ])
+    (ssl [ "ttf-kleinaspach.de" "www.ttf-kleinaspach.de" ])
+    (serveWordpress [ "ttf-kleinaspach.de" "www.ttf-kleinaspach.de" ])
 
-    ( ssl [ "eastuttgart.de" ])
-    ( serveWordpress [ "eastuttgart.de" ])
+    (ssl [ "eastuttgart.de" "www.eastuttgart.de" ])
+    (serveWordpress [ "eastuttgart.de" "www.eastuttgart.de" ])
 
-    ( ssl [ "habsys.de" "habsys.eu" ])
-    ( servePage [ "habsys.de" "habsys.eu" ])
+    (ssl [ "habsys.de" "www.habsys.de" "habsys.eu" "www.habsys.eu" ])
+    (servePage [ "habsys.de" "www.habsys.de" "habsys.eu" "www.habsys.eu" ])
   ];
 
-  services.mysql = {
-    enable = true;
-    package = pkgs.mariadb;
-    rootPassword = toString (<secrets/mysql_rootPassword>);
-  };
-
-  lass.mysqlBackup = {
-    enable = true;
-    config.fritz = {
-      password = toString (<secrets/mysql_rootPassword>);
-      databases = [
-        "biostase_de"
-        "eastuttgart_de"
-        "radical_dreamers_de"
-        "spielwaren_kern_de"
-        "ttf_kleinaspach_de"
-      ];
-    };
-  };
+  lass.mysqlBackup.config.all.databases = [
+    "biostase_de"
+    "eastuttgart_de"
+    "radical_dreamers_de"
+    "spielwaren_kern_de"
+    "ttf_kleinaspach_de"
+  ];
+
+  users.users.root.openssh.authorizedKeys.keys = [
+    config.krebs.users.fritz.pubkey
+  ];
 }