From 6c001f470b3d87cc8cd7175f56f46f1ea5352e9e Mon Sep 17 00:00:00 2001
From: mg <mg@noreply.git.mgrote.net>
Date: Sat, 17 Jul 2021 19:57:50 +0200
Subject: [PATCH] docker2 (#160)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

munin für alle

fehler var name

munin auf docker2

inventory

Co-authored-by: Michael Grote <michael.grote@posteo.de>
Reviewed-on: https://git.mgrote.net/mg/ansible/pulls/160
Co-Authored-By: mg <mg@noreply.git.mgrote.net>
Co-Committed-By: mg <mg@noreply.git.mgrote.net>
---
 group_vars/docker.yml           | 2 +-
 host_vars/docker.grote.lan.yml  | 5 -----
 host_vars/docker2.grote.lan.yml | 9 +++++++++
 inventory                       | 2 ++
 playbooks/base/monitoring.yml   | 2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 host_vars/docker2.grote.lan.yml

diff --git a/group_vars/docker.yml b/group_vars/docker.yml
index 4e471dfe..38a76fab 100644
--- a/group_vars/docker.yml
+++ b/group_vars/docker.yml
@@ -4,7 +4,7 @@
     - mg
   ### mgrote.restic
   restic_folders_to_backup: /usr/local /etc /root /home /var/lib/docker
-  qssrestic_cron_hours: "*/4"
+  restic_cron_hours: "*/4"
   restic_exclude: |
         ._*
         desktop.ini
diff --git a/host_vars/docker.grote.lan.yml b/host_vars/docker.grote.lan.yml
index b5764188..f0ebda3d 100644
--- a/host_vars/docker.grote.lan.yml
+++ b/host_vars/docker.grote.lan.yml
@@ -12,11 +12,6 @@
       repository_url: git.mgrote.net/mg/docker-miniflux
       repository_user: mg
       repository_user_password: "{{ lookup('keepass', 'gitea_mg_https_password', 'password') }}"
-    - name: munin-master
-      dir_name: docker-munin-master
-      repository_url: git.mgrote.net/mg/docker-munin-master
-      repository_user: mg
-      repository_user_password: "{{ lookup('keepass', 'gitea_mg_https_password', 'password') }}"
     - name: navidrome-mg
       dir_name: docker-navidrome-mg
       repository_url: git.mgrote.net/mg/docker-navidrome-mg
diff --git a/host_vars/docker2.grote.lan.yml b/host_vars/docker2.grote.lan.yml
new file mode 100644
index 00000000..f653bef6
--- /dev/null
+++ b/host_vars/docker2.grote.lan.yml
@@ -0,0 +1,9 @@
+---
+  ### mgrote.docker-compose-deploy
+  docker_compose_base_dir: /home/mg/docker
+  docker_compose_projects:
+    - name: munin-master
+      dir_name: docker-munin-master
+      repository_url: git.mgrote.net/mg/docker-munin-master
+      repository_user: mg
+      repository_user_password: "{{ lookup('keepass', 'gitea_mg_https_password', 'password') }}"
diff --git a/inventory b/inventory
index ae1a4db3..653de21e 100644
--- a/inventory
+++ b/inventory
@@ -27,6 +27,7 @@ all:
     docker:
       hosts:
         docker.grote.lan:
+        docker2.grote.lan:
         docker-test.grote.lan:
     vmtest:
       hosts:
@@ -73,6 +74,7 @@ all:
         gitea.grote.lan:
         pihole2.grote.lan:
         ntp-server.grote.lan:
+        docker2.grote.lan:
     test:
       hosts:
         dokuwiki-test.grote.lan:
diff --git a/playbooks/base/monitoring.yml b/playbooks/base/monitoring.yml
index 10cec447..b82f8922 100644
--- a/playbooks/base/monitoring.yml
+++ b/playbooks/base/monitoring.yml
@@ -1,5 +1,5 @@
 ---
-  - hosts: production
+  - hosts: all
     roles:
       - { role: mgrote.munin-node,
         become: true,