- conflict before package split

[packages/apache1.git] / apache1-mod_userdir.conf

diff --git a/apache1-mod_userdir.conf b/apache1-mod_userdir.conf
index 2255e882e388cdc64310a2f8e2a47e2e5a2d4ba3..3b294f9edeb6059b2b84e20c9d97d0723bf2ab59 100644 (file)
--- a/apache1-mod_userdir.conf
+++ b/apache1-mod_userdir.conf
@@ -11,16 +11,16 @@ UserDir public_html
 # Control access to UserDir directories.  The following is an example
 # for a site where these directories are restricted to read-only.
 #
-#<Directory /home/users/*/public_html>
-#      AllowOverride FileInfo AuthConfig Limit
-#      Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
-#      <Limit GET POST OPTIONS PROPFIND>
-#              Order allow,deny
-#              Allow from all
-#      </Limit>
-#      <LimitExcept GET POST OPTIONS PROPFIND>
-#              Order deny,allow
-#              Deny from all
-#      </LimitExcept>
-#</Directory>
+<Directory /home/users/*/public_html>
+       AllowOverride FileInfo AuthConfig Limit
+       Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
+       <Limit GET POST OPTIONS PROPFIND>
+               Order allow,deny
+               Allow from all
+       </Limit>
+       <LimitExcept GET POST OPTIONS PROPFIND>
+               Order deny,allow
+               Deny from all
+       </LimitExcept>
+</Directory>
 </IfModule>