From eab9d6f97c24cbefb14921ec185412440bffedfa Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Sun, 13 Mar 2022 14:07:55 +0100
Subject: [PATCH] ovh.icinga2: update to debian bullseye and php 8.0

---
 data/nginx/files/extras/ovh.icinga2/icingaweb |  2 +-
 nodes/ovh/icinga2.py                          | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/data/nginx/files/extras/ovh.icinga2/icingaweb b/data/nginx/files/extras/ovh.icinga2/icingaweb
index b83e0ea..93d1b6f 100644
--- a/data/nginx/files/extras/ovh.icinga2/icingaweb
+++ b/data/nginx/files/extras/ovh.icinga2/icingaweb
@@ -1,7 +1,7 @@
     location ~ \.php$ {
         include fastcgi.conf;
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass unix:/run/php/php7.4-fpm.sock;
+        fastcgi_pass unix:/run/php/php8.0-fpm.sock;
         fastcgi_param SCRIPT_FILENAME /usr/share/icingaweb2/public/index.php;
         fastcgi_param ICINGAWEB_CONFIGDIR /etc/icingaweb2;
     }
diff --git a/nodes/ovh/icinga2.py b/nodes/ovh/icinga2.py
index a1c1e73..36410d7 100644
--- a/nodes/ovh/icinga2.py
+++ b/nodes/ovh/icinga2.py
@@ -10,7 +10,7 @@ nodes['ovh.icinga2'] = {
         'zfs',
     },
     'groups': {
-        'debian-buster',
+        'debian-bullseye',
         'webserver',
     },
     'metadata': {
@@ -29,11 +29,6 @@ nodes['ovh.icinga2'] = {
                 },
             },
         },
-        'apt': {
-            'packages': {
-                'php-imagick': {},
-            },
-        },
         'bird': {
             'static_routes': {
                 '172.19.136.3/32',
@@ -41,13 +36,13 @@ nodes['ovh.icinga2'] = {
         },
         'icinga2': {
             'api_users': {
-                # Used with <https://git.kunsmann.eu/kunsi/icinga2beamer>
                 'dashboard': {
                     'password': vault.password_for('ovh.icinga2 icinga2 api_user dashboard'),
                     'permissions': {
                         'objects/query/Service'
                     },
                 },
+                # Used with <https://git.franzi.business/kunsi/icinga2eamer>
                 'icinga2beamer': {
                     'password': vault.decrypt('encrypt$gAAAAABf3wM9YS5ZpRdhp3xyIFX21_MK0omzqHqykWbWdkZWp2xyJ6awaUSXODnZQ5j-rws6n0yrpaeMdXoj1irb2FrgxMDTdfCh88hIsqcKGOObzwGaRg6Ze0tuiMrzIfOO3tRnc9Kd'),
                     'permissions': {
@@ -104,12 +99,12 @@ nodes['ovh.icinga2'] = {
             },
         },
         'php': {
-            'version': '7.4',
+            'version': '8.0',
             'packages': {
                 'curl',
                 'gd',
                 'intl',
-                'json',
+                'imagick',
                 'ldap',
                 'mysql',
                 'opcache',