summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2017-10-31 17:50:57 -0400
committerGitHub <noreply@github.com>2017-10-31 17:50:57 -0400
commite5a44f303496315807be89fe82050e6410c66731 (patch)
tree7c493947fbbb1f5492d001cab1288169f7600ee2 /nixos/modules
parent486c125dc3b230590b135036a2aca7a41a58c073 (diff)
parent527781ebc4137d9e6cda6dd21ab0dd776f8582d5 (diff)
downloadnixlib-e5a44f303496315807be89fe82050e6410c66731.tar
nixlib-e5a44f303496315807be89fe82050e6410c66731.tar.gz
nixlib-e5a44f303496315807be89fe82050e6410c66731.tar.bz2
nixlib-e5a44f303496315807be89fe82050e6410c66731.tar.lz
nixlib-e5a44f303496315807be89fe82050e6410c66731.tar.xz
nixlib-e5a44f303496315807be89fe82050e6410c66731.tar.zst
nixlib-e5a44f303496315807be89fe82050e6410c66731.zip
Merge pull request #31044 from LumiGuide/fix-apache-httpd
apache-httpd: fix nix evaluation error
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/web-servers/apache-httpd/default.nix1
1 files changed, 1 insertions, 0 deletions
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}"