From de6e888da9ed85ebbe35fa23569fbd8617734798 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 13 Apr 2016 16:32:04 +0200
Subject: l websites: use lists in helpers

---
 lass/2configs/websites/domsen.nix             | 22 +++++++--------
 lass/2configs/websites/fritz.nix              | 39 ++++++++++++++-------------
 lass/2configs/websites/wohnprojekt-rhh.de.nix |  9 +++----
 3 files changed, 35 insertions(+), 35 deletions(-)

(limited to 'lass/2configs')

diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index 1b62bd977..caaee96bb 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -13,22 +13,22 @@ let
 
 in {
   imports = [
-    ( ssl "reich-gebaeudereinigung.de" )
-    ( servePage "reich-gebaeudereinigung.de" )
+    ( ssl [ "reich-gebaeudereinigung.de" ])
+    ( servePage [ "reich-gebaeudereinigung.de" ])
 
-    ( manageCert "karlaskop.de" )
-    ( servePage "karlaskop.de" )
+    ( manageCerts [ "karlaskop.de" ])
+    ( servePage [ "karlaskop.de" ])
 
-    ( manageCert "makeup.apanowicz.de" )
-    ( servePage "makeup.apanowicz.de" )
+    ( ssl [ "makeup.apanowicz.de" ])
+    ( servePage [ "makeup.apanowicz.de" ])
 
-    ( manageCert "pixelpocket.de" )
-    ( servePage "pixelpocket.de" )
+    ( manageCerts [ "pixelpocket.de" ])
+    ( servePage [ "pixelpocket.de" ])
 
-    ( ssl "o.ubikmedia.de" )
-    ( serveOwncloud "o.ubikmedia.de" )
+    ( ssl [ "o.ubikmedia.de" ])
+    ( serveOwncloud [ "o.ubikmedia.de" ])
 
-    ( manageCerts [ "ubikmedia.de" "apanowicz.de" "nirwanabluete.de" "aldonasiech.com" "360gradvideo.tv" "ubikmedia.eu" ] )
+    ( ssl [ "ubikmedia.de" "aldona.ubikmedia.de" "apanowicz.de" "nirwanabluete.de" "aldonasiech.com" "360gradvideo.tv" "ubikmedia.eu" ] )
     ( serveWordpress [ "ubikmedia.de" "*.ubikmedia.de" "apanowicz.de" "nirwanabluete.de" "aldonasiech.com" "360gradvideo.tv" "ubikmedia.eu" ] )
   ];
 
diff --git a/lass/2configs/websites/fritz.nix b/lass/2configs/websites/fritz.nix
index 16a240d7c..7a35ba75b 100644
--- a/lass/2configs/websites/fritz.nix
+++ b/lass/2configs/websites/fritz.nix
@@ -2,37 +2,40 @@
 
 let
   inherit (import ../../4lib { inherit lib pkgs; })
-    manageCert
+    manageCerts
     activateACME
     ssl
     servePage
-    serveOwncloud;
+    serveWordpress;
 
 in {
   imports = [
-    ( manageCert "biostase.de" )
-    ( servePage "biostase.de" )
+    #( manageCerts [ "biostase.de" ])
+    #( servePage [ "biostase.de" ])
 
-    ( manageCert "gs-maubach.de" )
-    ( servePage "gs-maubach.de" )
+    #( manageCerts [ "gs-maubach.de" ])
+    #( servePage [ "gs-maubach.de" ])
 
-    ( manageCert "spielwaren-kern.de" )
-    ( servePage "spielwaren-kern.de" )
+    #( manageCerts [ "spielwaren-kern.de" ])
+    #( servePage [ "spielwaren-kern.de" ])
 
-    ( manageCert "societyofsimtech.de" )
-    ( servePage "societyofsimtech.de" )
+    #( manageCerts [ "societyofsimtech.de" ])
+    #( servePage [ "societyofsimtech.de" ])
 
-    ( manageCert "ttf-kleinaspach.de" )
-    ( servePage "ttf-kleinaspach.de" )
+    #( manageCerts [ "ttf-kleinaspach.de" ])
+    #( servePage [ "ttf-kleinaspach.de" ])
 
-    ( manageCert "edsn.de" )
-    ( servePage "edsn.de" )
+    #( manageCerts [ "edsn.de" ])
+    #( servePage [ "edsn.de" ])
 
-    ( manageCert "eab.berkeley.edu" )
-    ( servePage "eab.berkeley.edu" )
+    #( manageCerts [ "eab.berkeley.edu" ])
+    #( servePage [ "eab.berkeley.edu" ])
 
-    ( manageCert "habsys.de" )
-    ( servePage "habsys.de" )
+    ( manageCerts [ "eastuttgart.de" ])
+    ( serveWordpress [ "eastuttgart.de" ])
+
+    ( manageCerts [ "habsys.de" ])
+    ( servePage [ "habsys.de" ])
   ];
 
   #lass.owncloud = {
diff --git a/lass/2configs/websites/wohnprojekt-rhh.de.nix b/lass/2configs/websites/wohnprojekt-rhh.de.nix
index 4e3eb071a..858054531 100644
--- a/lass/2configs/websites/wohnprojekt-rhh.de.nix
+++ b/lass/2configs/websites/wohnprojekt-rhh.de.nix
@@ -3,16 +3,13 @@
 let
   inherit (config.krebs.lib) genid;
   inherit (import ../../4lib { inherit lib pkgs; })
-    manageCert
-    activateACME
     ssl
-    servePage
-    serveOwncloud;
+    servePage;
 
 in {
   imports = [
-    ( ssl "wohnprojekt-rhh.de" )
-    ( servePage "wohnprojekt-rhh.de" )
+    ( ssl [ "wohnprojekt-rhh.de" ])
+    ( servePage [ "wohnprojekt-rhh.de" ])
   ];
 
   users.users.laura = {
-- 
cgit v1.2.3