From 53990ee9979c5c7dfaf3babf434608015e4c5fe9 Mon Sep 17 00:00:00 2001 From: Teun Ouwehand Date: Tue, 8 Dec 2015 21:03:13 +0100 Subject: [PATCH] Add global config variable --- defaults/main.yml | 3 +++ templates/vhosts-2.2.conf.j2 | 3 +-- templates/vhosts-2.4.conf.j2 | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 20ead1d..65bcb1d 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,6 +1,9 @@ --- apache_enablerepo: "" +apache_global_settings: | + DirectoryIndex index.php index.html + apache_listen_port: 80 apache_listen_port_ssl: 443 diff --git a/templates/vhosts-2.2.conf.j2 b/templates/vhosts-2.2.conf.j2 index 3c27677..ef4c5c2 100644 --- a/templates/vhosts-2.2.conf.j2 +++ b/templates/vhosts-2.2.conf.j2 @@ -1,5 +1,4 @@ - -DirectoryIndex index.php index.html +{{ apache_global_settings }} {# Set up VirtualHosts #} {% for vhost in apache_vhosts %} diff --git a/templates/vhosts-2.4.conf.j2 b/templates/vhosts-2.4.conf.j2 index 50f908c..bc6b0b1 100644 --- a/templates/vhosts-2.4.conf.j2 +++ b/templates/vhosts-2.4.conf.j2 @@ -1,5 +1,4 @@ - -DirectoryIndex index.php index.html +{{ apache_global_settings }} {# Set up VirtualHosts #} {% for vhost in apache_vhosts %}