Revert "l 2 websites: phpIni -> phpOptions"

This reverts commit abdf11a17331401e3fca5e73dd38b241614c5aea.

2 files changed, 20 insertions, 25 deletions

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
-  #'';
 }