libretic/ansible-role-apache
6
0
Fork 0
mirror of https://github.com/geerlingguy/ansible-role-apache synced 2024-11-10 07:53:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #58 from BlackMesh/apache_global_settings

Browse source 
Rename apache_global_settings to apache_global_vhosts_settings
This commit is contained in:
Jeff Geerling 2015-12-16 16:07:29 -06:00
commit 1a12e57862
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -30,7 +30,7 @@ If set to true, a vhosts file, managed by this role's variables (see below), wil
On Debian/Ubuntu, a default virtualhost is included in Apache's configuration. Set this to `true` to remove that default virtualhost configuration file.
apache_global_settings: |
apache_global_vhost_settings: |
DirectoryIndex index.php index.html
# Add other global settings on subsequent lines.

2
defaults/main.yml
View file

@ -11,7 +11,7 @@ apache_vhosts_filename: "vhosts.conf"
# Set this to `true` to remove that default.
apache_remove_default_vhost: false
apache_global_settings: |
apache_global_vhost_settings: |
DirectoryIndex index.php index.html
apache_vhosts:

2
templates/vhosts-2.2.conf.j2
View file

@ -1,4 +1,4 @@
{{ apache_global_settings }}
{{ apache_global_vhost_settings }}
{# Set up VirtualHosts #}
{% for vhost in apache_vhosts %}

2
templates/vhosts-2.4.conf.j2
View file

@ -1,4 +1,4 @@
{{ apache_global_settings }}
{{ apache_global_vhost_settings }}
{# Set up VirtualHosts #}
{% for vhost in apache_vhosts %}