From 88bb31e8d2ca330c14d4a6e843d7cd7b1909d815 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Tue, 11 Oct 2016 17:50:42 +0200
Subject: l 2 websites domsen: use new phpOptions

---
 lass/2configs/websites/domsen.nix | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

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

diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index 2f93c1f9..0723e9ab 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -144,22 +144,13 @@ in {
   };
 
 
-  #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"
-      always_populate_raw_post_data = -1
-      upload_max_filesize = 100M
-      post_max_size = 100M
-      file_uploads = on
-    '';
-  } ''
-    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
+    always_populate_raw_post_data = -1
+    upload_max_filesize = 100M
+    post_max_size = 100M
+    file_uploads = on
   '';
 
   # MAIL STUFF
-- 
cgit v1.2.3


From 1c4bf63ed89d93fb13d98c5a0a12fc00387bbadd Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Wed, 12 Oct 2016 12:34:49 +0200
Subject: l 2 websites domsen: disable apcu

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

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

diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index 0723e9ab..e05f40d9 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -143,11 +143,8 @@ in {
     };
   };
 
-
   services.phpfpm.phpOptions = ''
-    extension=${pkgs.phpPackages.apcu}/lib/php/extensions/apcu.so
     sendmail_path = ${sendmail} -t
-    always_populate_raw_post_data = -1
     upload_max_filesize = 100M
     post_max_size = 100M
     file_uploads = on
-- 
cgit v1.2.3