diff --git a/defaults/main.yml b/defaults/main.yml index c063c3d..7f2f418 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,8 +1,9 @@ --- # defaults file for mariadb +munin_sql_config_file: /etc/munin/plugin-conf.d/zzz-mariadb munin_sql_user: munin munin_sql_password: za8x5sECY6pP2GWdR36UKYP7tHFodvRLyr6f5wAt7D mysql_server_config_file: /etc/mysql/mariadb.conf.d/50-server.cnf -mysql_socket: /var/run/mysqld/mysqld.sock +mysql_socket: /run/mysqld/mysqld.sock diff --git a/tasks/munin.yml b/tasks/munin.yml index 0a8c392..586d009 100644 --- a/tasks/munin.yml +++ b/tasks/munin.yml @@ -10,11 +10,13 @@ - name: "Munin: Ersetze MariaDB-Zugangsdaten" template: src: templates/munin-mariadb.j2 - dest: /etc/munin/plugin-conf.d/zzz-mariadb + dest: "{{ munin_sql_config_file }}" notify: restart munin-node - name: "Munin: Aktiviere mysql-Plugin" - command: munin-node-configure --shell | grep mysql_ | sh + shell: munin-node-configure --shell | grep mysql_ | sh + args: + creates: "{{ munin_sql_config_file }}" # Ausgabe von fehlerhaften Plugins (exit 1) ignorieren ignore_errors: yes notify: restart munin-node diff --git a/tasks/packages.yml b/tasks/packages.yml index c91041e..06d80d1 100644 --- a/tasks/packages.yml +++ b/tasks/packages.yml @@ -9,5 +9,4 @@ - default-mysql-server - libcache-cache-perl - python-pymysql - update_cache: yes cache_valid_time: 3600