From 527781ebc4137d9e6cda6dd21ab0dd776f8582d5 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 31 Oct 2017 17:31:02 +0100 Subject: apache-httpd: fix nix evaluation error This only sets the timezone when it's not null to prevent: error: cannot coerce null to a string, at nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix:676:7 --- nixos/modules/services/web-servers/apache-httpd/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'nixos/modules/services/web-servers') diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 1c3c7835d961..f9f2511f45dc 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -676,6 +676,7 @@ in '' ; Needed for PHP's mail() function. sendmail_path = sendmail -t -i + '' + optionalString (!isNull config.time.timeZone) '' ; Apparently PHP doesn't use $TZ. date.timezone = "${config.time.timeZone}" -- cgit 1.4.1 From 3165c56db9df4d2399e900a8d6eaffcd092359f7 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Tue, 31 Oct 2017 17:37:11 +0000 Subject: apache-httpd/wordpress: disable built-in WordPress autoupdater --- nixos/modules/services/web-servers/apache-httpd/wordpress.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'nixos/modules/services/web-servers') diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix index c6f4bcd0f666..1c654667dfc7 100644 --- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix +++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix @@ -13,6 +13,7 @@ let define('DB_HOST', '${config.dbHost}'); define('DB_CHARSET', 'utf8'); $table_prefix = '${config.tablePrefix}'; + define('AUTOMATIC_UPDATER_DISABLED', true); ${config.extraConfig} if ( !defined('ABSPATH') ) define('ABSPATH', dirname(__FILE__) . '/'); -- cgit 1.4.1