From 26b76aed17ff60a9ced2178f2f2a13f1932d1b4e Mon Sep 17 00:00:00 2001 From: Gregory Colpart Date: Thu, 7 Sep 2017 01:20:12 +0200 Subject: [PATCH] review default vhost --- apache/templates/evolinux-default.conf.j2 | 8 ++------ evolinux-base/templates/default_www/index.html.j2 | 6 +++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apache/templates/evolinux-default.conf.j2 b/apache/templates/evolinux-default.conf.j2 index 5136eb33..b50409a8 100644 --- a/apache/templates/evolinux-default.conf.j2 +++ b/apache/templates/evolinux-default.conf.j2 @@ -67,6 +67,8 @@ DocumentRoot /var/www/ + # We override these 2 Directory directives setted in apache2.conf. + # We want no access except from allowed IP address. Include /etc/apache2/ipaddr_whitelist.conf @@ -80,12 +82,6 @@ SSLCertificateFile {{ apache_evolinux_default_ssl_cert }} SSLCertificateKeyFile {{ apache_evolinux_default_ssl_key }} - # We override these 2 Directory directives setted in apache2.conf. - # We want no access except from allowed IP address. - - Include /etc/apache2/ipaddr_whitelist.conf - - # Munin. We need to set Directory directive as Alias take precedence. Alias /munin /var/cache/munin/www diff --git a/evolinux-base/templates/default_www/index.html.j2 b/evolinux-base/templates/default_www/index.html.j2 index 981732ee..ccdb44a4 100644 --- a/evolinux-base/templates/default_www/index.html.j2 +++ b/evolinux-base/templates/default_www/index.html.j2 @@ -58,12 +58,16 @@