From: Oleg Broytman <phd@phdru.name>
Date: Wed, 31 Jul 2019 16:50:38 +0000 (+0300)
Subject: Fix(apache): Remove mentions of me
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=5686d6f8428f655ec827a555a916caaf62bd9319;p=ansible.git

Fix(apache): Remove mentions of me

Make the config more generic.
---

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_/