summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-10-11 17:50:42 +0200
committerlassulus <lass@aidsballs.de>2016-10-11 17:50:42 +0200
commit88bb31e8d2ca330c14d4a6e843d7cd7b1909d815 (patch)
treee175512d2f3e69bdc9bc773cf4d910ebaf8f3391
parentef4e7dc4ba76ce990577ba800d31c9ba56ecde48 (diff)
l 2 websites domsen: use new phpOptions
-rw-r--r--lass/2configs/websites/domsen.nix23
1 files changed, 7 insertions, 16 deletions
diff --git a/lass/2configs/websites/domsen.nix b/lass/2configs/websites/domsen.nix
index 2f93c1f9c..0723e9ab9 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