Merge branch 'master' into staging

2016-05-08 21:24:48 +02:00
parent 62fc8859c1 6054c9f217
commit 65a9fa8cdc
245 changed files with 4326 additions and 1284 deletions
@@ -406,7 +406,7 @@ let
        ([ mainCfg.phpOptions ] ++ (map (svc: svc.phpOptions) allSubservices));
    }
    ''
-      cat ${php}/etc/php-recommended.ini > $out
+      cat ${php}/etc/php.ini > $out
      echo "$options" >> $out
    '';