bump to v6, do some clean up, fix vars, add some

defaults/main.yml

@@ -1,37 +1,44 @@
 ---
 
-#zabbix_installed: 'false'
-zabbix_proxy_installed: 'true'
+zabbix_proxy_installed: 'false' # set to false the first time you deploy proxy, then to true once it is deployed.  NOT NEEDED ANYMORE?
 
 #main
-zabbix_version: '5.0'
-zabbix_agent: 'true'
-zabbix_server: 'true'
-zabbix_proxy: 'false'
+zabbix_version: '6.0'
+zabbix_agent: 'true' # set to true if you want to deploy it.
+zabbix_server: 'true' # set to true if you want to deploy it.
+zabbix_proxy: 'false' # set to true if you want to deploy it.
 
 #Zabbix Server
+zabbix_server_pkg:
+      - zabbix-server-mysql
+      - zabbix-frontend-php
+      - zabbix-nginx-conf
+      - zabbix-sql-scripts
+      - gzip
+      - python3-pymysql
+
 zabbix_server_hostname: 'localhost'
-zabbix_server_name: 'Monitoring Monitoring'
+zabbix_server_name: 'Monitoring'
 zabbix_server_listen_port: '10051'
 zabbix_server_log_path: '/var/log/zabbix/zabbix_server.log'
 zabbix_server_log_size: '1' #in MB
 zabbix_debug_level: '3'
-#	0 - basic information about starting and stopping of Zabbix processes
-#	1 - critical information
-#	2 - error information
-#	3 - warnings
-#	4 - for debugging (produces lots of information)
-#	5 - extended debugging (produces even more information)
+#   0 - basic information about starting and stopping of Zabbix processes
+#   1 - critical information
+#   2 - error information
+#   3 - warnings
+#   4 - for debugging (produces lots of information)
+#   5 - extended debugging (produces even more information)
 zabbix_server_db_host: 'localhost'
 zabbix_server_db_plugin: 'mysql'
 zabbix_server_db_port: '0'
 zabbix_server_db_name: 'zabbix'
 zabbix_server_db_user: 'zabbixadmin'
 zabbix_server_db_passwd: 'changeme'
-zabbix_server_pollers: '5' #	Number of pre-forked instances of pollers.
+zabbix_server_pollers: '5' # Number of pre-forked instances of pollers.
 zabbix_server_ipmi_pollers: '0'
 zabbix_server_timeout: '4'
-zabbix_server_alert_scripts: '/usr/lib/zabbix/alertscripts/usr/lib/zabbix/alertscripts'
+zabbix_server_alert_scripts: '/usr/lib/zabbix/alertscripts'
 zabbix_server_external_scripts: '/usr/lib/zabbix/externalscripts'
 zabbix_server_fping: '/usr/bin/fping'
 zabbix_server_fping6: '/usr/bin/fping6'
@@ -42,6 +49,9 @@ zabbix_cachesize: '8M'
 zabbix_agent_params:
   - name: "container"
 
+zabbix_web_listen: '8080'
+zabbix_web_servername: 'example.com'
+
 zabbix_agent_pid: '/var/run/zabbix/zabbix_agentd.pid'
 zabbix_agent_logfile: '/var/log/zabbix/zabbix_agentd.log'
 zabbix_agent_log_size: '1'
@@ -53,15 +63,13 @@ zabbix_agent_pkg:
     - gzip
     - zabbix-get
     - zabbix-sender
-zabbix_client_pkg:
-    - zabbix-agent
-    - gzip
 
 #Zabbix Scripts
 zabbix_scripts_deploy: 'false'
 zabbix_scripts_repo: 'https://git.disroot.org/Disroot/zabbix-scripts.git'
 zabbix_scripts_dir: '/usr/local/bin/zabbix-scripts'
 zabbix_scripts_version: 'master'
+
 #Zabbix Proxy
 zabbix_proxy_pkg:
       - zabbix-proxy-mysql
@@ -78,71 +86,23 @@ zabbix_proxy_debug_level: '3'
 zabbix_proxy_db_host: 'localhost'
 zabbix_proxy_db_name: 'zabbix_proxy'
 zabbix_proxy_db_user: 'zabbixproxyadmin'
-zabbix_proxy_db_passwd: 'dupa123'
+zabbix_proxy_db_passwd: 'changeme'
 zabbix_proxy_local_buffer: '0'
 zabbix_proxy_offline_buffer: '1'
-zabbix_proxy_heartbeat_freq: '60'
 zabbix_proxy_config_freq: '3600'
 zabbix_proxy_data_sernder_freq: '1'
 zabbix_proxy_start_pollers: '5'
 zabbix_proxy_ipmi_pollers: '0'
 
-#PHP Vars
-php_version: '8.0'
-php_etc_path: '/etc/php'
-install_php: 'true'
-pool_listen: '/var/run/php/php{{ php_version }}-fpm.sock'
 
-php_pkgs:
-  - php{{ php_version }}-fpm
-  - php{{ php_version }}-bz2
-  - php{{ php_version }}-cgi
-  - php{{ php_version }}-cli
-  - php{{ php_version }}-common
-  - php{{ php_version }}-curl
-  - php{{ php_version }}-dev
-  - php{{ php_version }}-enchant
-  - php{{ php_version }}-gd
-  - php{{ php_version }}-gmp
-  - php{{ php_version }}-igbinary
-  - php{{ php_version }}-interbase
-  - php{{ php_version }}-intl
-  - php{{ php_version }}-mbstring # frontend
-  - php{{ php_version }}-msgpack
-  - php{{ php_version }}-pspell
-  - php{{ php_version }}-readline
-  - php{{ php_version }}-zip
-  - php{{ php_version }}-gd # frontend
-  - php{{ php_version }}-bcmath # frontend
-  - php{{ php_version }}-xml # frontend
-  - php{{ php_version }}-ldap # frontend
-
-
-#nginx
-nginx_default_vhost: 'zabbix'
-nginx_default_vhost_ssl: 'zabbix'
-#nginx_www_dir: '/var/www/'
-nginx_vhosts:
-
-- name: 'zabbix'
-  template: 'zabbix'
-  proto: 'http'
-  listen: '80'
-  root: '/usr/share/zabbix'
-  use_access_log: 'true'
-  use_error_log: 'true'
-  nginx_error_log_level: 'warn'
-  state: 'enable'
-  letsencrypt: 'false'
-
-# MARIADB CONFIG
+#MariaDB
 mariadb_databases:
   - name: '{{ zabbix_server_db_name }}'
-    collation: 'utf8_general_ci' # should it be utf8_bin?
-    encoding: 'utf8'
+    collation: 'utf8mb4_bin'
+    encoding: 'utf8mb4'
   - name: '{{ zabbix_proxy_db_name }}'
-    collation: 'utf8_general_ci'
-    encoding: 'utf8'
+    collation: 'utf8mb4_bin'
+    encoding: 'utf8mb4'
 
 mariadb_users:
   - name: '{{ zabbix_server_db_user }}'