From 60b85fb15384f4d1fdffa1f00d6218de5fb3282f Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Thu, 7 Jul 2016 22:06:10 +0200
Subject: Revert "l 2 websites: phpIni -> phpOptions"

This reverts commit abdf11a17331401e3fca5e73dd38b241614c5aea.
---
 lass/2configs/websites/domsen.nix | 24 ++++++++++++------------
 lass/2configs/websites/fritz.nix  | 21 ++++++++-------------
 2 files changed, 20 insertions(+), 25 deletions(-)

(limited to 'lass/2configs')

diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index 3c33c0702..8a2161e45 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -113,18 +113,18 @@ in {
     createHome = true;
   };
 
-  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
+  #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
+  '';
 }
 
diff --git a/lass/2configs/websites/fritz.nix b/lass/2configs/websites/fritz.nix
index 0107da739..39f0cce06 100644
--- a/lass/2configs/websites/fritz.nix
+++ b/lass/2configs/websites/fritz.nix
@@ -74,18 +74,13 @@ in {
     config.krebs.users.fritz.pubkey
   ];
 
-  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
   '';
-
-  #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 cd990015e15555570561af2e3a20e4d812ae2043 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Thu, 7 Jul 2016 22:09:59 +0200
Subject: l 2 nixpkgs: c78f9ad -> 446d4c1

---
 lass/2configs/nixpkgs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/2configs')

diff --git a/lass/2configs/nixpkgs.nix b/lass/2configs/nixpkgs.nix
index 0021a8615..0f940a369 100644
--- a/lass/2configs/nixpkgs.nix
+++ b/lass/2configs/nixpkgs.nix
@@ -3,6 +3,6 @@
 {
   krebs.build.source.nixpkgs = {
       url = https://github.com/lassulus/nixpkgs;
-      rev = "c78f9ad2f91019648bdcf5a911f86ea3a397d290";
+      rev = "446d4c1fc10f53cf97abea1996d067ad93de2ded";
     };
 }
-- 
cgit v1.2.3