From d1b9a88e1b0e4c0505aa6a7b0c1dbaff40b24555 Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Sun, 13 Apr 2014 16:03:29 +0300 Subject: [PATCH] apache: Always disable UserDir for root --- apache/templates/httpd.conf.erb | 7 ++++--- apache/templates/httpsd.conf.erb | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/apache/templates/httpd.conf.erb b/apache/templates/httpd.conf.erb index e241665..706733f 100644 --- a/apache/templates/httpd.conf.erb +++ b/apache/templates/httpd.conf.erb @@ -357,9 +357,10 @@ DocumentRoot "/srv/www/http/<%= @homename %>" # of a username on the system (depending on home directory # permissions). # - # puppet note: commented to make it possible to configure UserDir via - # included config. UserDir is disabled by default since apache 2.1.14. - #UserDir disable + # UserDir is disabled by default since apache 2.1.14, explicitly always + # disable for root. + # + UserDir disabled root # # To enable requests to /~user/ to serve the user's public_html diff --git a/apache/templates/httpsd.conf.erb b/apache/templates/httpsd.conf.erb index 8ff4d0a..2738a98 100644 --- a/apache/templates/httpsd.conf.erb +++ b/apache/templates/httpsd.conf.erb @@ -361,9 +361,10 @@ DocumentRoot "/srv/www/https/<%= @homename %>" # of a username on the system (depending on home directory # permissions). # - # puppet note: commented to make it possible to configure UserDir via - # included config. UserDir is disabled by default since apache 2.1.14. - #UserDir disable + # UserDir is disabled by default since apache 2.1.14, explicitly always + # disable for root. + # + UserDir disabled root # # To enable requests to /~user/ to serve the user's public_html