summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorDaniel Peebles <copumpkin@users.noreply.github.com>2017-01-09 00:28:41 -0500
committerGitHub <noreply@github.com>2017-01-09 00:28:41 -0500
commitb0264bb63cf0aa604fa60382605a5856baa35c9d (patch)
treed323f4826c1cbf2503aabcf425a5028937e15174 /nixos/modules/services
parent1603526000c2f5db86e018041677cfa80b4885a1 (diff)
parentdf7b4f4f6f12ff090f48108838353531aff92507 (diff)
downloadnixlib-b0264bb63cf0aa604fa60382605a5856baa35c9d.tar
nixlib-b0264bb63cf0aa604fa60382605a5856baa35c9d.tar.gz
nixlib-b0264bb63cf0aa604fa60382605a5856baa35c9d.tar.bz2
nixlib-b0264bb63cf0aa604fa60382605a5856baa35c9d.tar.lz
nixlib-b0264bb63cf0aa604fa60382605a5856baa35c9d.tar.xz
nixlib-b0264bb63cf0aa604fa60382605a5856baa35c9d.tar.zst
nixlib-b0264bb63cf0aa604fa60382605a5856baa35c9d.zip
Merge pull request #21703 from copumpkin/httpd-no-mkdir
httpd module: don't create documentRoot directory if it doesn't exist
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/web-servers/apache-httpd/default.nix7
1 files changed, 0 insertions, 7 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 84c608ca2ab1..dc0ca501a484 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -709,13 +709,6 @@ in
             ''}
             mkdir -m 0700 -p ${mainCfg.logDir}
 
-            ${optionalString (mainCfg.documentRoot != null)
-            ''
-              # Create the document root directory if does not exists yet
-              mkdir -p ${mainCfg.documentRoot}
-            ''
-            }
-
             # Get rid of old semaphores.  These tend to accumulate across
             # server restarts, eventually preventing it from restarting
             # successfully.