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 @@