evolix
/
ansible-roles
22
2
Fork 2
Code Issues 61 Pull Requests 18 Releases 32 Wiki Activity

apache: add a variable to customize the server-status host
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Jérémy Lecour 2019-06-20 17:29:23 +02:00 committed by Jérémy Lecour
parent a8ef97fcde
commit 49d90fff09
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -12,6 +12,7 @@ The **patch** part changes incrementally at each release.
### Added ### Added
* apache: add server status suffix in VHost (and default site) if missing * apache: add server status suffix in VHost (and default site) if missing
* apache: add a variable to customize the server-status host
* apt: add a script to manage packages with "hold" mark * apt: add a script to manage packages with "hold" mark
* etc-git: gitignore /etc/letsencrypt/.certbot.lock * etc-git: gitignore /etc/letsencrypt/.certbot.lock
* evomaintenance: make hooks configurable * evomaintenance: make hooks configurable

2
apache/defaults/main.yml
View File

@ -19,3 +19,5 @@ apache_munin_include: True
general_alert_email: "root@localhost" general_alert_email: "root@localhost"
log2mail_alert_email: Null log2mail_alert_email: Null
apache_serverstatus_host: 127.0.0.1

5
apache/tasks/server_status.yml
View File

@ -62,7 +62,8 @@
- name: apache-status URL is configured for Munin - name: apache-status URL is configured for Munin
lineinfile: lineinfile:
dest: /etc/munin/plugin-conf.d/munin-node dest: /etc/munin/plugin-conf.d/munin-node
line: "env.url http://127.0.0.1/server-status-{{ apache_serverstatus_suffix }}?auto" line: "env.url http://{{ apache_serverstatus_host }}/server-status-{{ apache_serverstatus_suffix }}?auto"
regexp: "env.url http://127.0.0.1/server-status" regexp: 'env.url http://[^\\/]+/server-status'
insertafter: "[apache_*]" insertafter: "[apache_*]"
create: no create: no
notify: restart munin-node