From 2e5c8af47c5af3d98f322125db107774f15e38e7 Mon Sep 17 00:00:00 2001 From: Robin Sonnabend <robin@fsmpi.rwth-aachen.de> Date: Mon, 26 Feb 2018 20:24:06 +0100 Subject: [PATCH] Silence mrtg warnings --- mrtg/files/tmpfiles.conf | 1 + mrtg/handlers/main.yml | 5 +++++ mrtg/tasks/main.yml | 11 +++++++++++ mrtg/tasks/weathermap.yml | 7 +++++++ 4 files changed, 24 insertions(+) create mode 100644 mrtg/files/tmpfiles.conf create mode 100644 mrtg/handlers/main.yml diff --git a/mrtg/files/tmpfiles.conf b/mrtg/files/tmpfiles.conf new file mode 100644 index 0000000..432167d --- /dev/null +++ b/mrtg/files/tmpfiles.conf @@ -0,0 +1 @@ +d /run/lock/mrtg 0755 mrtg mrtg - - diff --git a/mrtg/handlers/main.yml b/mrtg/handlers/main.yml new file mode 100644 index 0000000..9527d2d --- /dev/null +++ b/mrtg/handlers/main.yml @@ -0,0 +1,5 @@ +--- +# file: shared-roles/network/mrtg/handlers/main.yml + +- name: create tmpfiles + shell: systemd-tmpfiles --create diff --git a/mrtg/tasks/main.yml b/mrtg/tasks/main.yml index 90d06fe..6c828b3 100644 --- a/mrtg/tasks/main.yml +++ b/mrtg/tasks/main.yml @@ -27,6 +27,17 @@ file: path=/etc/mrtg.cfg group=mrtg tags: mrtg +- name: ensure the mrtg user can get the lock + copy: + src: tmpfiles.conf + dest: /etc/tmpfiles.d/10-mrtg.conf + owner: root + group: root + mode: 0644 + notify: + - create tmpfiles + tags: mrtg + - name: create an index HTML page command: "indexmaker --output /var/www/mrtg/index.html --title='Traffic of {{domain}}' --columns=3 --pagetop='{% for switch in mrtg_switches %}<a href=\"index-{{switch['router']}}.html\"><b>{{switch['router']}}</b>.{{domain}}</a> {% endfor %} {% if use_weathermap %}<a href=\"weathermap.png\">Weathermap</a>{%endif %}' /etc/mrtg.cfg" become: yes diff --git a/mrtg/tasks/weathermap.yml b/mrtg/tasks/weathermap.yml index 8c687e5..014fca3 100644 --- a/mrtg/tasks/weathermap.yml +++ b/mrtg/tasks/weathermap.yml @@ -37,6 +37,13 @@ dest: /opt/ tags: weathermap +- name: silence the weathermap rrdtool warning + lineinfile: + path: /opt/weathermap/weathermap + regexp: '\$rrdtool=\"[^"]*\";' + line: '$rrdtool="/usr/sbin/nologin";' + tags: weathermap + - name: create the weathermap config script: "makeweather.py {{weathermap_placement_strategy}}" tags: weathermap -- GitLab