From 565d06608e7eb4a51693f769e239861f48e3bf37 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 25 May 2016 16:32:32 +0200
Subject: l 2 websites domsen: use old phpIni again

---
 lass/2configs/websites/domsen.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'lass/2configs/websites/domsen.nix')

diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index f31fccd51..43f9b3924 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -79,9 +79,18 @@ in {
     createHome = true;
   };
 
-  services.phpfpm.phpOptions = ''
-    extension=${pkgs.phpPackages.apcu}/lib/php/extensions/apcu.so
-    sendmail_path = ${sendmail} -t
+  #services.phpfpm.phpOptions = ''
+  #  extension=${pkgs.phpPackages.apcu}/lib/php/extensions/apcu.so
+  #  sendmail_path = ${sendmail} -t
+  #'';
+  services.phpfpm.phpIni = pkgs.runCommand "php.ini" {
+     options = ''
+      extension=${pkgs.phpPackages.apcu}/lib/php/extensions/apcu.so
+      sendmail_path = ${sendmail} -t -i"
+    '';
+  } ''
+    cat ${pkgs.php}/etc/php-recommended.ini > $out
+    echo "$options" >> $out
   '';
 }
 
-- 
cgit v1.2.3


From 80e50fd8a05192faaf0e6f87faa3ea9c0313aa32 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 31 May 2016 23:26:35 +0200
Subject: l: move websites libs to 2/websites/util

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

(limited to 'lass/2configs/websites/domsen.nix')

diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index 43f9b3924..35a391d1b 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -1,14 +1,10 @@
 { config, pkgs, lib, ... }:
 
 let
-  inherit (config.krebs.lib)
+  inherit (import <stockholm/krebs/4lib> { config = {}; inherit lib; })
     genid
-    readFile
     ;
-  inherit (import ../../4lib { inherit lib pkgs; })
-    manageCert
-    manageCerts
-    activateACME
+  inherit (import <stockholm/lass/2configs/websites/util.nix> {inherit lib pkgs;})
     ssl
     servePage
     serveOwncloud
-- 
cgit v1.2.3


From 76296d5cc5f1ddb1108c3f213204bb386353ad93 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 1 Jun 2016 00:13:19 +0200
Subject: l 2 websites: put sqlBackup in seperate file

---
 lass/2configs/websites/domsen.nix | 53 +++++++++++++--------------------------
 1 file changed, 17 insertions(+), 36 deletions(-)

(limited to 'lass/2configs/websites/domsen.nix')

diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index 35a391d1b..45d09c3b9 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -22,49 +22,30 @@ let
 
 in {
   imports = [
-    ( ssl [ "reich-gebaeudereinigung.de" ])
-    ( servePage [ "reich-gebaeudereinigung.de" ])
+    ./sqlBackup.nix
+    (ssl [ "reich-gebaeudereinigung.de" ])
+    (servePage [ "reich-gebaeudereinigung.de" ])
 
-    ( manageCerts [ "karlaskop.de" ])
-    ( servePage [ "karlaskop.de" ])
+    (ssl [ "karlaskop.de" ])
+    (servePage [ "karlaskop.de" ])
 
-    ( ssl [ "makeup.apanowicz.de" ])
-    ( servePage [ "makeup.apanowicz.de" ])
+    (ssl [ "makeup.apanowicz.de" ])
+    (servePage [ "makeup.apanowicz.de" ])
 
-    ( manageCerts [ "pixelpocket.de" ])
-    ( servePage [ "pixelpocket.de" ])
+    (ssl [ "pixelpocket.de" ])
+    (servePage [ "pixelpocket.de" ])
 
-    ( ssl [ "o.ubikmedia.de" ])
-    ( serveOwncloud [ "o.ubikmedia.de" ])
+    (ssl [ "o.ubikmedia.de" ])
+    (serveOwncloud [ "o.ubikmedia.de" ])
 
-    ( 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" ] )
+    (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" ])
   ];
 
-  services.mysql = {
-    enable = true;
-    package = pkgs.mariadb;
-    rootPassword = toString (<secrets/mysql_rootPassword>);
-  };
-
-  lass.mysqlBackup = {
-    enable = true;
-    config.domsen = {
-      password = toString (<secrets/mysql_rootPassword>);
-      databases = [
-        "ubikmedia_de"
-        "o_ubikmedia_de"
-      ];
-    };
-  };
-  services.mysqlBackup = {
-    enable = true;
-    databases = [
-      "ubikmedia_de"
-      "o_ubikmedia_de"
-    ];
-    location = "/bku/sql_dumps";
-  };
+  lass.mysqlBackup.config.all.databases = [
+    "ubikmedia_de"
+    "o_ubikmedia_de"
+  ];
 
   users.users.domsen = {
     uid = genid "domsen";
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/00000000.lock: No such file or directory (2)