fix archlinux builds

bodsch · Feb 23, 2023 · 95b548f · 95b548f
1 parent 2f7d059
commit 95b548f
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 11 deletions.
diff --git a/molecule/default/requirements.yml b/molecule/default/requirements.yml
@@ -10,7 +10,7 @@
 
 - name: monitoring-tools
   src: bodsch.monitoring_plugins
-  version: 1.4.0
+  version: 1.4.1
 
 - name: mariadb
   src: bodsch.mariadb

diff --git a/molecule/icinga2-with-icingadb/requirements.yml b/molecule/icinga2-with-icingadb/requirements.yml
@@ -10,15 +10,15 @@
 
 - name: monitoring-tools
   src: bodsch.monitoring_plugins
-  version: 1.4.0
+  version: 1.4.1
 
 - name: mariadb
   src: bodsch.mariadb
   version: 2.3.1
 
 - name: icingadb
   src: bodsch.icingadb
-  version: 1.0.1
+  version: 1.0.2
 
 - name: redis
   src: bodsch.redis

diff --git a/molecule/icinga2-with-influxdb/prepare.yml b/molecule/icinga2-with-influxdb/prepare.yml
@@ -43,6 +43,13 @@
       package:
         name: python3-pip
         state: present
+
+    # to fix https://github.com/mkayontour/ansible-influxdb/issues/9
+    - name: add influxdata-archive_compat.key
+      shell:
+        cd /tmp/ ;
+        curl https://repos.influxdata.com/influxdata-archive_compat.key > /tmp/influxdata-archive_compat.key &&
+        echo '393e8779c89ac8d958f81f942f9ad7fb82a25e133faddaf92e15b16e6ac9ce4c /tmp/influxdata-archive_compat.key' | sha256sum -c && cat /tmp/influxdata-archive_compat.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg
       when:
         - ansible_distribution | lower == 'debian'
 

diff --git a/molecule/icinga2-with-influxdb/requirements.yml b/molecule/icinga2-with-influxdb/requirements.yml
@@ -10,7 +10,7 @@
 
 - name: monitoring-tools
   src: bodsch.monitoring_plugins
-  version: 1.4.0
+  version: 1.4.1
 
 - name: mariadb
   src: bodsch.mariadb

diff --git a/molecule/primary-as-ha/requirements.yml b/molecule/primary-as-ha/requirements.yml
@@ -10,7 +10,7 @@
 
 - name: monitoring-tools
   src: bodsch.monitoring_plugins
-  version: 1.4.0
+  version: 1.4.1
 
 - name: mariadb
   src: bodsch.mariadb

diff --git a/molecule/primary-with-satellite/requirements.yml b/molecule/primary-with-satellite/requirements.yml
@@ -10,7 +10,7 @@
 
 - name: monitoring-tools
   src: bodsch.monitoring_plugins
-  version: 1.4.0
+  version: 1.4.1
 
 - name: mariadb
   src: bodsch.mariadb

diff --git a/molecule/primary-with-satellites/requirements.yml b/molecule/primary-with-satellites/requirements.yml
@@ -10,7 +10,7 @@
 
 - name: monitoring-tools
   src: bodsch.monitoring_plugins
-  version: 1.4.0
+  version: 1.4.1
 
 - name: mariadb
   src: bodsch.mariadb

diff --git a/tasks/prepare.yml b/tasks/prepare.yml
@@ -183,11 +183,12 @@
   block:
     - name: install build tools
       ansible.builtin.package:
-        name: "{{ item }}"
+        name:
+          - base-devel
+          - cmake
+          - fakeroot
+          - patch
         state: present
-      loop:
-        - base-devel
-        - cmake
 
     - name: create sudo rules for aur_builder
       ansible.builtin.copy: