summaryrefslogtreecommitdiffstats
path: root/lass/2configs
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-06-28 18:11:11 +0200
committerlassulus <lass@aidsballs.de>2016-06-28 18:18:00 +0200
commitabdf11a17331401e3fca5e73dd38b241614c5aea (patch)
tree90ec3cc8dfe9bdc8ca893cbeaf8bc6c7c1f80910 /lass/2configs
parent1d071c59ecddb87cd7ba31c1c91edc34506479ad (diff)
l 2 websites: phpIni -> phpOptions
Diffstat (limited to 'lass/2configs')
-rw-r--r--lass/2configs/websites/domsen.nix24
-rw-r--r--lass/2configs/websites/fritz.nix21
2 files changed, 25 insertions, 20 deletions
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index ef44117fd..f88dc927e 100644
--- a/lass/2configs/websites/domsen.nix
+++ b/lass/2configs/websites/domsen.nix
@@ -109,18 +109,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 39f0cce06..0107da739 100644
--- a/lass/2configs/websites/fritz.nix
+++ b/lass/2configs/websites/fritz.nix
@@ -74,13 +74,18 @@ in {
config.krebs.users.fritz.pubkey
];
- 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
+ #'';
}