From 6a580d32b48ee9725365a2fbd98db48ce147b3fb Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 12 Aug 2023 18:53:15 +0200 Subject: [PATCH 1/3] Version 6.4 --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index a54e625..ba1799d 100644 --- a/scripts/install +++ b/scripts/install @@ -62,7 +62,7 @@ ynh_app_setting_set --app=$app --key=admin --value=$admin ynh_script_progression --message="Installing dependencies..." ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies -ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="http://repo.zabbix.com/zabbix/5.0/debian $(lsb_release -sc) main" --package="$zabbix_pkg_dependencies" --key="https://repo.zabbix.com/zabbix-official-repo.key" +ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="http://repo.zabbix.com/zabbix/6.4/debian $(lsb_release -sc) main" --package="$zabbix_pkg_dependencies" --key="https://repo.zabbix.com/zabbix-official-repo.key" ynh_replace_string --match_string="# $language.UTF-8 UTF-8" --replace_string="$language.UTF-8 UTF-8" --target_file=/etc/locale.gen locale-gen From af07b8d82c9307182af878df4f6db5a4c16c4242 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 19 Aug 2023 15:16:50 +0200 Subject: [PATCH 2/3] add zabbix-sql-scripts --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 225f507..22b5687 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -15,7 +15,7 @@ fi pkg_dependencies="libapr1 libaprutil1 libaprutil1-dbd-sqlite3 libaprutil1-ldap liblua5.2-0 fonts-dejavu-core patch smistrip unzip wget fping libcap2-bin libiksemel3 libopenipmi0 libpam-cap libsnmp-base $libsnmpd_version snmptrapd snmpd libjs-prototype jq libssh-4 php${YNH_PHP_VERSION}-fpm php${YNH_PHP_VERSION}-bcmath" -zabbix_pkg_dependencies="zabbix-agent zabbix-frontend-php zabbix-server-mysql" +zabbix_pkg_dependencies="zabbix-agent zabbix-frontend-php zabbix-server-mysql zabbix-sql-scripts" #================================================= # PERSONAL HELPERS From 5f2688a52e0c1d27dca45dd998215865f15e1438 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 19 Aug 2023 15:19:37 +0200 Subject: [PATCH 3/3] New create.sql path https://github.com/YunoHost-Apps/zabbix_ynh/pull/46#issuecomment-1684941900 --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index ba1799d..3354cab 100644 --- a/scripts/install +++ b/scripts/install @@ -116,7 +116,7 @@ ynh_script_progression --message="Import default data in database..." export mysqlconn="mysql --user=$db_user --password=$db_pwd --database=$db_name" $mysqlconn -e "ALTER DATABASE $db_name CHARACTER SET utf8 COLLATE utf8_general_ci;" -zcat /usr/share/doc/zabbix-server-mysql*/create.sql.gz | $mysqlconn +zcat /usr/share/zabbix-sql-scripts/mysql/server.sql.gz | $mysqlconn convert_ZabbixDB