From d67048b79bb54e52c091214fac0d8b3a9b0f8c89 Mon Sep 17 00:00:00 2001
From: Markus Hauschild <markus@moepman.eu>
Date: Sat, 4 Sep 2021 15:29:51 +0200
Subject: [PATCH] librenms: upgrade for bullseye

---
 roles/librenms/tasks/main.yml     | 26 +++++++++++++-------------
 roles/librenms/templates/vhost.j2 |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/roles/librenms/tasks/main.yml b/roles/librenms/tasks/main.yml
index 610ca3d..fcacd65 100644
--- a/roles/librenms/tasks/main.yml
+++ b/roles/librenms/tasks/main.yml
@@ -7,20 +7,20 @@
     - git
     - graphviz
     - imagemagick
-    - mtr-tiny
     - mariadb-server
+    - mtr-tiny
     - nmap
+    - php-cli
+    - php-curl
+    - php-fpm
+    - php-gd
+    - php-json
+    - php-mbstring
+    - php-mysql
     - php-net-ipv4
     - php-net-ipv6
     - php-pear
-    - php7.3-cli
-    - php7.3-curl
-    - php7.3-fpm
-    - php7.3-gd
-    - php7.3-json
-    - php7.3-mbstring
-    - php7.3-mysql
-    - php7.3-snmp
+    - php-snmp
     - python3-dotenv
     - python3-pymysql
     - python3-redis
@@ -51,8 +51,8 @@
     regexp: ';?date\.timezone'
     line: 'date.timezone = Europe/Berlin'
   with_items:
-  - /etc/php/7.3/cli/php.ini
-  - /etc/php/7.3/fpm/php.ini
+  - /etc/php/7.4/cli/php.ini
+  - /etc/php/7.4/fpm/php.ini
 
 - name: Ensure certificates are available
   command: openssl req -x509 -nodes -newkey rsa:2048 -keyout /etc/nginx/ssl/{{ librenms_domain }}.key -out /etc/nginx/ssl/{{ librenms_domain }}.crt -days 730 -subj "/CN={{ librenms_domain }}" creates=/etc/nginx/ssl/{{ librenms_domain }}.crt
@@ -76,5 +76,5 @@
   file: src=/etc/nginx/sites-available/librenms dest=/etc/nginx/sites-enabled/librenms state=link
   notify: Restart nginx
 
-- name: Start php7.3-fpm
-  service: name=php7.3-fpm state=started enabled=yes
+- name: Start php7.4-fpm
+  service: name=php7.4-fpm state=started enabled=yes
diff --git a/roles/librenms/templates/vhost.j2 b/roles/librenms/templates/vhost.j2
index 8819c6f..83f3d99 100644
--- a/roles/librenms/templates/vhost.j2
+++ b/roles/librenms/templates/vhost.j2
@@ -31,7 +31,7 @@ server {
 		include fastcgi_params;
 		fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
 		fastcgi_param PATH_INFO $fastcgi_path_info;
-		fastcgi_pass unix:/var/run/php/php7.3-fpm.sock;
+		fastcgi_pass unix:/var/run/php/php7.4-fpm.sock;
 		fastcgi_intercept_errors on;
 	}