diff --git a/CHANGELOG.md b/CHANGELOG.md index 65fa6da4..e4668336 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ The **patch** part changes incrmentally at each release. * elasticsearch: use ES_TMPDIR variable for custom tmpdir, (from `/etc/default/elasticsearch` instead of changing `/etc/elesticsearch/jvm.options`). * elasticsearch: RESTART_ON_UPGRADE is configurable (default: `true`) * nagios-nrpe: mark plugins as executable +* nginx: package name can be specified (default: `nginx-full`) ### Fixed * nginx: fix basic auth for default vhost diff --git a/nginx/defaults/main.yml b/nginx/defaults/main.yml index 61700738..0591945d 100644 --- a/nginx/defaults/main.yml +++ b/nginx/defaults/main.yml @@ -3,6 +3,8 @@ nginx_minimal: False nginx_jessie_backports: False +nginx_package_name: "nginx-full" + nginx_default_ipaddr_whitelist_ips: [] nginx_additional_ipaddr_whitelist_ips: [] nginx_ipaddr_whitelist_present: "{{ nginx_default_ipaddr_whitelist_ips | union(nginx_additional_ipaddr_whitelist_ips) | unique }}" diff --git a/nginx/tasks/packages_jessie.yml b/nginx/tasks/packages_jessie.yml index 356b0b5e..25cc18ed 100644 --- a/nginx/tasks/packages_jessie.yml +++ b/nginx/tasks/packages_jessie.yml @@ -3,7 +3,7 @@ - name: Ensure Nginx is installed apt: - name: nginx-full + name: "{{ nginx_package_name }}" state: present notify: restart nginx tags: diff --git a/nginx/tasks/packages_stretch.yml b/nginx/tasks/packages_stretch.yml index 637cb044..565b9b1d 100644 --- a/nginx/tasks/packages_stretch.yml +++ b/nginx/tasks/packages_stretch.yml @@ -3,7 +3,7 @@ - name: Ensure Nginx is installed apt: - name: nginx-full + name: "{{ nginx_package_name }}" state: present notify: restart nginx tags: