Ubuntu 18.04 support #70

Closed
Ghost wants to merge 38 commits from ubuntu into unstable
3 changed files with 6 additions and 2 deletions
Showing only changes of commit 02e50580e2 - Show all commits

View file

@ -12,6 +12,7 @@ The **patch** part changes incrementally at each release.
### Added
* 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
* etc-git: gitignore /etc/letsencrypt/.certbot.lock
* evomaintenance: make hooks configurable

View file

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

View file

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