X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=playbooks%2Fdebian%2Froles%2Fapache%2Ftemplates%2F001-phd.conf;h=b4e06a2531c52a609ad86c28530d9d7bd24cb875;hb=26d81517d2d679920a82ba54a48c86e1aee38cdc;hp=5eb26f6cc58b0a18711006fcb0c15a854a926a5d;hpb=64f279e592bc291ea76ff9e2246f1fc1760c6e83;p=ansible.git

diff --git a/playbooks/debian/roles/apache/templates/001-phd.conf b/playbooks/debian/roles/apache/templates/001-phd.conf
index 5eb26f6..b4e06a2 100644
--- a/playbooks/debian/roles/apache/templates/001-phd.conf
+++ b/playbooks/debian/roles/apache/templates/001-phd.conf
@@ -1,4 +1,5 @@
-ServerAdmin phd@{{ inventory_hostname }}
+ServerName localhost
+ServerAdmin webmaster@{{ inventory_hostname }}
 MaxConnectionsPerChild 10
 
 <IfModule prefork.c>
@@ -34,8 +35,8 @@ AddDefaultCharset koi8-r
     AuthName Apache
     AuthUserFile /usr/local/apache2/data/apache.passwd
     <RequireAll>
-    Require ip 127.0.0.1 {{ inventory_hostname }}
-    Require user phd
+    Require ip 127.0.0.1 {{ ansible_facts.default_ipv4.address }}
+    Require user webmaster
     </RequireAll>
 </Location>
 
@@ -62,21 +63,21 @@ Scriptsock            data/cgisock
 <IfModule mod_info.c>
 <Location /server-info>
     SetHandler server-info
-    Require ip 127.0.0.1 {{ inventory_hostname }}
+    Require ip 127.0.0.1 {{ ansible_facts.default_ipv4.address }}
 </Location>
 </IfModule>
 
 <IfModule mod_status.c>
 <Location /server-status>
     SetHandler server-status
-    Require ip 127.0.0.1 {{ inventory_hostname }}
+    Require ip 127.0.0.1 {{ ansible_facts.default_ipv4.address }}
 </Location>
 
 ExtendedStatus On
 </IfModule>
 
 <Location /printenv.shtml>
-    Require ip 127.0.0.1 {{ inventory_hostname }}
+    Require ip 127.0.0.1 {{ ansible_facts.default_ipv4.address }}
 </Location>
 
 <IfModule mod_env.c>
@@ -103,25 +104,21 @@ Options Indexes FollowSymLinks
 RemoveHandler .py
 </Directory>
 
-<Location /~phd/Bookmarks>
-ErrorDocument 404 /~phd/Bookmarks/notfound.html
-</Location>
-
-<VirtualHost {{ inventory_hostname }}:80>
+<VirtualHost {{ ansible_facts.default_ipv4.address }}:80>
 ServerName unknown.invalid
-DocumentRoot /home/phd/Internet/WWW/htdocs/_default_/
+DocumentRoot /usr/local/apache2/_default_/
 ErrorDocument 404 /nothing.html
 
-<Directory /home/phd/Internet/WWW/htdocs/_default_/>
+<Directory /usr/local/apache2/_default_/>
 Require all granted
 </Directory>
 </VirtualHost>
 
 <VirtualHost _default_:*>
-DocumentRoot /home/phd/Internet/WWW/htdocs/_default_/
+DocumentRoot /usr/local/apache2/_default_/
 ErrorDocument 404 /nothing.html
 
-<Directory /home/phd/Internet/WWW/htdocs/_default_/>
+<Directory /usr/local/apache2/_default_/>
 Require all granted
 </Directory>
 </VirtualHost>