From 4a44b2898dfe98f7253f8c26a7c63c4b48805081 Mon Sep 17 00:00:00 2001
From: muppeth <muppeth@disroot.org>
Date: Fri, 27 Oct 2023 11:56:57 +0200
Subject: [PATCH] update from main

---
 handlers/main.yml                             |  2 +-
 tasks/install_server.yml                      | 19 +++++++------------
 .../userparameter_container.conf.j2           |  8 --------
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/handlers/main.yml b/handlers/main.yml
index 281871f..af872a7 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -18,4 +18,4 @@
 - name: restart nginx
   systemd:
     name: nginx
-    state: reloaded
+    state: restarted
\ No newline at end of file
diff --git a/tasks/install_server.yml b/tasks/install_server.yml
index 894caa6..96e690b 100644
--- a/tasks/install_server.yml
+++ b/tasks/install_server.yml
@@ -2,7 +2,7 @@
 
 - name: '[Server] - Install Zabbix from repository'
   apt:
-    pkg: "{{ zabbix_server_apt }}"
+    pkg: "{{ zabbix_server_pkg }}"
     state: latest
     update_cache: yes
     install_recommends: no
@@ -10,17 +10,12 @@
   notify:
     - restart zabbix_server
 
-- name: "[Agent] - Make sure the service is enabled"
-  systemd:
-    name: zabbix-server
-    enabled: yes
-
 - name: '[Server] - Remove apache2'
   apt:
     name: "{{ zabbix_apache }}"
     state: absent
 
-- name: "[Check] - Zabbix is already installed?"
+- name: "[Server] - Check if Zabbix is already installed"
   shell:
     cmd: "{{ zabbix_server_db_plugin }} -h {{ zabbix_server_db_host }} -u {{ zabbix_server_db_user }} -p{{ zabbix_server_db_passwd }} {{ zabbix_server_db_name }} -se 'SELECT instanceid from config;'"
   register: zabbix_installed
@@ -38,9 +33,9 @@
   # ERROR 1146 means the table doesn't exist
   notify:
     - restart zabbix_server
+    - restart nginx
 
-- name: "[Server] - Remove default nginx vhost"
-  file:
-    path: '/etc/nginx/sites-enabled/default'
-    state: 'absent'
-  notify: restart nginx
+- name: "[Server] - Make sure the service is enabled"
+  systemd:
+    name: zabbix-server
+    enabled: yes
\ No newline at end of file
diff --git a/templates/etc/zabbix/zabbix_agent.d/userparameter_container.conf.j2 b/templates/etc/zabbix/zabbix_agent.d/userparameter_container.conf.j2
index 7017db6..84017cb 100644
--- a/templates/etc/zabbix/zabbix_agent.d/userparameter_container.conf.j2
+++ b/templates/etc/zabbix/zabbix_agent.d/userparameter_container.conf.j2
@@ -59,18 +59,10 @@ UserParameter=lufi[*],cat /tmp/lufi_stats | grep $1 | cut -d' ' -f2-
 # PrivateBin
 UserParameter=privatebin[*],cat /tmp/bin_stats | grep $1 | cut -d' ' -f2-
 {% endif %}
-{% if item.name == 'framadate' %}
-# Framadate
-UserParameter=framadate[*],cat /tmp/framadate_stats | grep $1 | cut -d' ' -f2-
-{% endif %}
 {% if item.name == 'etherpad' %}
 # Etherpad
 UserParameter=etherpad[*],cat /tmp/pad_stats | grep $1 | cut -d' ' -f2-
 {% endif %}
-{% if item.name == 'ethercalc' %}
-# Ethercalc
-UserParameter=ethercalc[*],cat /tmp/ethercalc_stats | grep $1 | cut -d' ' -f2-
-{% endif %}
 {% if item.name == 'mariadb' %}
 # Mariadb
 UserParameter=mysql.ping[*], mysqladmin -h"$1" -P"$2" ping