l 2 websites: use helper functions

lass/2configs/websites/domsen.nix

@@ -1,27 +1,33 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 let
   inherit (config.krebs.lib) genid;
+  inherit (import ../../4lib { inherit lib pkgs; })
+    manageCert
+    activateACME
+    ssl
+    servePage
+    serveOwncloud;
+
 in {
   imports = [
-    ../../3modules/static_nginx.nix
+    ( ssl "reich-gebaeudereinigung.de" )
-    ../../3modules/owncloud_nginx.nix
+    ( servePage "reich-gebaeudereinigung.de" )
-    ../../3modules/wordpress_nginx.nix
+
+    ( servePage "karlaskop.de" )
+    ( manageCert "karlaskop.de" )
+
+    ( servePage "makeup.apanowicz.de" )
+    ( manageCert "makeup.apanowicz.de" )
+
+    ( servePage "pixelpocket.de" )
+    ( manageCert "pixelpocket.de" )
+
+    ( ssl "o.ubikmedia.de" )
+    ( serveOwncloud "o.ubikmedia.de" )
+
   ];
 
-  lass.staticPage = {
-    "karlaskop.de" = {};
-    "makeup.apanowicz.de" = {};
-    "pixelpocket.de" = {};
-    "reich-gebaeudereinigung.de" = {};
-  };
-
-  lass.owncloud = {
-    "o.ubikmedia.de" = {
-      instanceid = "oc8n8ddbftgh";
-    };
-  };
-
   services.mysql = {
     enable = true;
     package = pkgs.mariadb;

lass/2configs/websites/fritz.nix

@@ -1,23 +1,39 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
-{
+let
+  inherit (import ../../4lib { inherit lib pkgs; })
+    manageCert
+    activateACME
+    ssl
+    servePage
+    serveOwncloud;
 
+in {
   imports = [
-    ../../3modules/static_nginx.nix
+    ( manageCert "biostase.de" )
-    ../../3modules/owncloud_nginx.nix
+    ( servePage "biostase.de" )
-    ../../3modules/wordpress_nginx.nix
-  ];
 
-  lass.staticPage = {
+    ( manageCert "gs-maubach.de" )
-    "biostase.de" = {};
+    ( servePage "gs-maubach.de" )
-    "gs-maubach.de" = {};
+
-    "spielwaren-kern.de" = {};
+    ( manageCert "spielwaren-kern.de" )
-    "societyofsimtech.de" = {};
+    ( servePage "spielwaren-kern.de" )
-    "ttf-kleinaspach.de" = {};
+
-    "edsn.de" = {};
+    ( manageCert "societyofsimtech.de" )
-    "eab.berkeley.edu" = {};
+    ( servePage "societyofsimtech.de" )
-    "habsys.de" = {};
+
-  };
+    ( manageCert "ttf-kleinaspach.de" )
+    ( servePage "ttf-kleinaspach.de" )
+
+    ( manageCert "edsn.de" )
+    ( servePage "edsn.de" )
+
+    ( manageCert "eab.berkeley.edu" )
+    ( servePage "eab.berkeley.edu" )
+
+    ( manageCert "habsys.de" )
+    ( servePage "habsys.de" )
+  ];
 
   #lass.owncloud = {
   #  "o.ubikmedia.de" = {

lass/2configs/websites/wohnprojekt-rhh.de.nix

@@ -1,14 +1,20 @@
-{ config, ... }:
+{ config, pkgs, lib, ... }:
 
-{
+let
+  inherit (config.krebs.lib) genid;
+  inherit (import ../../4lib { inherit lib pkgs; })
+    manageCert
+    activateACME
+    ssl
+    servePage
+    serveOwncloud;
+
+in {
   imports = [
-    ../../3modules/static_nginx.nix
+    ( ssl "wohnprojekt-rhh.de" )
+    ( servePage "wohnprojekt-rhh.de" )
   ];
 
-  lass.staticPage = {
-    "wohnprojekt-rhh.de" = {};
-  };
-
   users.users.laura = {
     home = "/srv/http/wohnprojekt-rhh.de";
     createHome = true;