From 7c45e8b2141e8307b2baf805a79e98c438e30b21 Mon Sep 17 00:00:00 2001 From: Mickael-Martin Date: Thu, 30 Apr 2020 12:38:43 +0200 Subject: [PATCH] Add media type email --- manifest.json | 2 +- scripts/_common.sh | 12 +++++++++++- scripts/install | 2 ++ scripts/upgrade | 5 +++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index cbcb46a..bc0ede7 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A monitoring tool for diverse IT components, including networks, servers, VMs and cloud services.", "fr": "Un outil pour monitorer des réseaux, des serveurs, des VMs et autres services en ligne" }, - "version": "3.2", + "version": "3.2.2", "url": "https://www.zabbix.com", "license": "free", "maintainer": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 41029d9..2d2458d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -207,4 +207,14 @@ convert_ZabbixDB(){ do mysql --user=$db_user --password=$db_pwd --database=$db_name -e "ALTER TABLE $t CONVERT TO character set utf8 collate utf8_bin;" done -} \ No newline at end of file +} + +#if not already modified, add email media type with the yunohost server mail. +set_mediatype_default_yunohost(){ + set -x + if [ $($mysqlconn -BN -e "SELECT count(*) FROM media_type WHERE smtp_server LIKE 'mail.example.com' AND status=1;") -eq 1 ] ; then + $mysqlconn -BN -e "UPDATE media_type SET smtp_server = 'localhost', smtp_helo = '"$domain"', smtp_email = 'zabbix@"$domain"', smtp_port = '587', status=0 , smtp_security=1 WHERE smtp_server LIKE 'mail.example.com' AND status=1;" + ynh_print_info "Default Media type added !" + fi + set +x +} diff --git a/scripts/install b/scripts/install index 3c459cd..9b75307 100644 --- a/scripts/install +++ b/scripts/install @@ -172,6 +172,8 @@ done disable_guest_user +set_mediatype_default_yunohost + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 9160244..ce35dbc 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -188,6 +188,11 @@ update_initZabbixConf #================================================= convert_ZabbixDB +#================================================= +# Add settings for yunohost mail server +#================================================= +set_mediatype_default_yunohost + #================================================= # Update php-fpm confi #=================================================