X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=playbooks%2Fdebian%2Froles%2Fapache%2Ftemplates%2F001-phd.conf;fp=playbooks%2Fdebian%2Froles%2Fapache%2Ftemplates%2F001-phd.conf;h=b4e06a2531c52a609ad86c28530d9d7bd24cb875;hb=5686d6f8428f655ec827a555a916caaf62bd9319;hp=f4a91fb95b7f650b932565c320a53eb8f431fe66;hpb=b24e337da878cd16106e96175f8af1e0dce895cd;p=ansible.git

diff --git a/playbooks/debian/roles/apache/templates/001-phd.conf b/playbooks/debian/roles/apache/templates/001-phd.conf
index f4a91fb..b4e06a2 100644
--- a/playbooks/debian/roles/apache/templates/001-phd.conf
+++ b/playbooks/debian/roles/apache/templates/001-phd.conf
@@ -1,5 +1,5 @@
 ServerName localhost
-ServerAdmin phd@{{ inventory_hostname }}
+ServerAdmin webmaster@{{ inventory_hostname }}
 MaxConnectionsPerChild 10
 
 <IfModule prefork.c>
@@ -36,7 +36,7 @@ AddDefaultCharset koi8-r
     AuthUserFile /usr/local/apache2/data/apache.passwd
     <RequireAll>
     Require ip 127.0.0.1 {{ ansible_facts.default_ipv4.address }}
-    Require user phd
+    Require user webmaster
     </RequireAll>
 </Location>
 
@@ -104,10 +104,6 @@ Options Indexes FollowSymLinks
 RemoveHandler .py
 </Directory>
 
-<Location /~phd/Bookmarks>
-ErrorDocument 404 /~phd/Bookmarks/notfound.html
-</Location>
-
 <VirtualHost {{ ansible_facts.default_ipv4.address }}:80>
 ServerName unknown.invalid
 DocumentRoot /usr/local/apache2/_default_/