Fix(add-apache-vhost): Fix SSL files directives

[ansible.git] / playbooks / debian / roles / add-apache-vhost / templates / vhost.conf

diff --git a/playbooks/debian/roles/add-apache-vhost/templates/vhost.conf b/playbooks/debian/roles/add-apache-vhost/templates/vhost.conf
index 2f3dd5b054efac6c798f6db48ce4c08ce47437e5..304b9b433a9fafe2e32aa2d16304d7aa4f652e53 100644 (file)
--- a/playbooks/debian/roles/add-apache-vhost/templates/vhost.conf
+++ b/playbooks/debian/roles/add-apache-vhost/templates/vhost.conf
@@ -1,30 +1,30 @@
-<VirtualHost 127.0.0.1:80 {{ virtual_host }}:80>
+<VirtualHost 127.0.0.1:80 {{ ansible_facts.default_ipv4.address }}:80>
 ServerName {{ virtual_host }}
 Redirect permanent / https://{{ virtual_host }}/
 ErrorLog /var/log/apache2/{{ virtual_host }}/error_log
 CustomLog /var/log/apache2/{{ virtual_host }}/access_log common
 </VirtualHost>
 
-<VirtualHost 127.0.0.1:80 {{ virtual_host }}:80>
+<VirtualHost 127.0.0.1:80 {{ ansible_facts.default_ipv4.address }}:80>
 ServerName www.{{ virtual_host }}
 Redirect permanent / https://{{ virtual_host }}/
 ErrorLog /var/log/apache2/{{ virtual_host }}/error_log
 CustomLog /var/log/apache2/{{ virtual_host }}/access_log common
 </VirtualHost>
 
-<VirtualHost 127.0.0.1:443 {{ virtual_host }}:443>
+<VirtualHost 127.0.0.1:443 {{ ansible_facts.default_ipv4.address }}:443>
 ServerName {{ virtual_host }}
 
-DocumentRoot /home/phd/Internet/WWW/htdocs/{{ virtual_host }}
-ScriptAlias /cgi-bin /home/phd/Internet/WWW/cgi-bin/{{ virtual_host }}
+DocumentRoot /usr/local/apache2/htdocs/{{ virtual_host }}
+ScriptAlias /cgi-bin /usr/local/apache2/cgi-bin/{{ virtual_host }}
 ErrorLog /var/log/apache2/{{ virtual_host }}/error_log
 CustomLog /var/log/apache2/{{ virtual_host }}/access_log common
 
-<Directory /home/phd/Internet/WWW/htdocs/{{ virtual_host }}>
+<Directory /usr/local/apache2/htdocs/{{ virtual_host }}>
 Require all granted
 </Directory>
 
-<Directory /home/phd/Internet/WWW/cgi-bin/{{ virtual_host }}>
+<Directory /usr/local/apache2/cgi-bin/{{ virtual_host }}>
 Require all granted
 </Directory>
 
@@ -44,7 +44,7 @@ AddDefaultCharset utf-8
 ProxyRequests Off
 </IfModule>
 
-SSLEngine on
+SSLEngine off
 #Header always set Strict-Transport-Security "max-age=63072000; includeSubDomains; preload"
 #Header always set X-Content-Type-Options nosniff
 #Header always set X-Frame-Options DENY
@@ -64,15 +64,15 @@ SSLProxyEngine off
 #SSLUseStapling on
 SSLVerifyClient none
 
-SSLCACertificateFile /etc/apache2/ssl/CA.crt
-SSLCertificateFile /etc/apache2/ssl/{{ virtual_host }}.crt
-SSLCertificateKeyFile /etc/apache2/ssl/{{ virtual_host }}.key
+#SSLCACertificateFile /etc/apache2/ssl/CA.crt
+#SSLCertificateFile /etc/apache2/ssl/{{ virtual_host }}.crt
+#SSLCertificateKeyFile /etc/apache2/ssl/{{ virtual_host }}.key
 
 <Directory />
    SSLRequireSSL
 </Directory>
 
-<Directory /home/phd/Internet/WWW/cgi-bin/{{ virtual_host }}>
+<Directory /usr/local/apache2/cgi-bin/{{ virtual_host }}>
    SSLOptions +StdEnvVars
 </Directory>
 
@@ -88,7 +88,7 @@ BrowserMatch "MSIE [2-6]" \
 BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
 </VirtualHost>
 
-<VirtualHost 127.0.0.1:443 {{ virtual_host }}:443>
+<VirtualHost 127.0.0.1:443 {{ ansible_facts.default_ipv4.address }}:443>
 ServerName www.{{ virtual_host }}
 Redirect permanent / https://{{ virtual_host }}/
 ErrorLog /var/log/apache2/{{ virtual_host }}/error_log