Merge pull request #85 from YunoHost-Apps/testing

Update to 6.4~ynh1

README.md

@@ -20,7 +20,7 @@ It shall NOT be edited by hand.
 
 A monitoring tool for diverse IT components, including networks, servers, VMs and cloud services.
 
-**Shipped version:** 6.0~ynh2
+**Shipped version:** 6.4~ynh1
 
 ## Screenshots
 

README_es.md

@@ -20,7 +20,7 @@ No se debe editar a mano.
 
 A monitoring tool for diverse IT components, including networks, servers, VMs and cloud services.
 
-**Versión actual:** 6.0~ynh2
+**Versión actual:** 6.4~ynh1
 
 ## Capturas
 

README_eu.md

@@ -20,7 +20,7 @@ EZ editatu eskuz.
 
 A monitoring tool for diverse IT components, including networks, servers, VMs and cloud services.
 
-**Paketatutako bertsioa:** 6.0~ynh2
+**Paketatutako bertsioa:** 6.4~ynh1
 
 ## Pantaila-argazkiak
 

README_fr.md

@@ -21,7 +21,7 @@ Il NE doit PAS être modifié à la main.
 Un outil de surveillance pour divers composants informatiques, notamment les réseaux, les serveurs, les machines virtuelles et les services en nuage.
 
 
-**Version incluse :** 6.0~ynh2
+**Version incluse :** 6.4~ynh1
 
 ## Captures d’écran
 

README_gl.md

@@ -20,7 +20,7 @@ NON debe editarse manualmente.
 
 A monitoring tool for diverse IT components, including networks, servers, VMs and cloud services.
 
-**Versión proporcionada:** 6.0~ynh2
+**Versión proporcionada:** 6.4~ynh1
 
 ## Capturas de pantalla
 

README_id.md

@@ -20,7 +20,7 @@ Ini TIDAK boleh diedit dengan tangan.
 
 A monitoring tool for diverse IT components, including networks, servers, VMs and cloud services.
 
-**Versi terkirim:** 6.0~ynh2
+**Versi terkirim:** 6.4~ynh1
 
 ## Tangkapan Layar
 

README_nl.md

@@ -20,7 +20,7 @@ Hij mag NIET handmatig aangepast worden.
 
 A monitoring tool for diverse IT components, including networks, servers, VMs and cloud services.
 
-**Geleverde versie:** 6.0~ynh2
+**Geleverde versie:** 6.4~ynh1
 
 ## Schermafdrukken
 

README_pl.md

@@ -20,7 +20,7 @@ Nie powinno być ono edytowane ręcznie.
 
 A monitoring tool for diverse IT components, including networks, servers, VMs and cloud services.
 
-**Dostarczona wersja:** 6.0~ynh2
+**Dostarczona wersja:** 6.4~ynh1
 
 ## Zrzuty ekranu
 

README_ru.md

@@ -20,7 +20,7 @@
 
 A monitoring tool for diverse IT components, including networks, servers, VMs and cloud services.
 
-**Поставляемая версия:** 6.0~ynh2
+**Поставляемая версия:** 6.4~ynh1
 
 ## Снимки экрана
 

README_zh_Hans.md

@@ -20,7 +20,7 @@
 
 A monitoring tool for diverse IT components, including networks, servers, VMs and cloud services.
 
-**分发版本：** 6.0~ynh2
+**分发版本：** 6.4~ynh1
 
 ## 截图
 

conf/Template_Yunohost.xml

@@ -573,4 +573,4 @@ fi</description>
             </mappings>
         </value_map>
     </value_maps>
-</zabbix_export>
+</zabbix_export>

manifest.toml

@@ -7,7 +7,7 @@ name = "Zabbix"
 description.en = "Monitoring tool for diverse IT components, including networks, servers, VMs and cloud services"
 description.fr = "Outil pour monitorer des réseaux, des serveurs, des VMs et autres services en ligne"
 
-version = "6.0~ynh2"
+version = "6.4~ynh1"
 
 maintainers = []
 
@@ -76,7 +76,7 @@ ram.runtime = "200M"
     ]
 
     [resources.apt.extras.zabbix]
-    repo = "deb https://repo.zabbix.com/zabbix/6.0/debian __YNH_DEBIAN_VERSION__ main"
+    repo = "deb https://repo.zabbix.com/zabbix/6.4/debian __YNH_DEBIAN_VERSION__ main"
     key = "https://repo.zabbix.com/zabbix-official-repo.key"
     packages = [
         "zabbix-server-mysql",

scripts/install

@@ -100,7 +100,9 @@ ynh_secure_remove --file="/usr/share/zabbix-cli/.zabbix-cli_auth_token"
 ynh_print_info --message="Enabling LDAP authentication"
 $mysqlconn -e "UPDATE \`config\` SET \`http_auth_enabled\` = '1', \`http_login_form\` = '1' WHERE \`config\`.\`configid\` = 1;"
 #Ldap integration activation
-$mysqlconn -e "UPDATE \`config\` SET \`authentication_type\` = '1', \`ldap_host\` = '127.0.0.1', \`ldap_port\` = '389', \`ldap_base_dn\` = 'ou=users,dc=yunohost,dc=org', \`ldap_search_attribute\` = 'uid' WHERE \`config\`.\`configid\` = 1;"
+$mysqlconn -e "INSERT INTO \`userdirectory\` (\`userdirectoryid\`,\`name\`, \`description\`, \`idp_type\`, \`provision_status\`) VALUES (1,'localhost', '', '1', '0');"
+$mysqlconn -e "INSERT INTO \`userdirectory_ldap\` (\`userdirectoryid\`,\`host\`, \`port\`, \`base_dn\`, \`search_attribute\`, \`bind_dn\`, \`bind_password\`, \`start_tls\`, \`search_filter\`, \`group_basedn\`, \`group_name\`, \`group_member\`, \`user_ref_attr\`, \`group_filter\`, \`group_membership\`, \`user_username\`, \`user_lastname\`) VALUES (1,'127.0.0.1', '389', 'ou=users,dc=yunohost,dc=org', 'uid', '', '', '0', '', '', '', '', '', '', '', '', '');"
+$mysqlconn -e "UPDATE \`config\` SET \`authentication_type\` = '1', \`ldap_auth_enabled\` = '1', \`ldap_userdirectoryid\` = '1' WHERE \`config\`.\`configid\` = 1;"
 
 # admin user creation
 ynh_print_info --message="Creating admin user"

scripts/upgrade

@@ -117,9 +117,9 @@ if [ ! -d "/usr/share/zabbix-cli" ]; then
     ynh_secure_remove --file="/usr/share/zabbix-cli/.zabbix-cli_auth_token"
 fi
 
-import_template
+#import_template
 
-link_template
+#link_template
 
 #=================================================
 # START SYSTEMD SERVICE

tests.toml

@@ -20,3 +20,4 @@ test_format = 1.0
 
     test_upgrade_from.8f8961c239f890069c867e40005db98465add0c9.name = "5.0.20~ynh2"
     test_upgrade_from.2791ab29129baca48685277ce82ef763058b10cf.name = "5.0.41~ynh3"
+    test_upgrade_from.2ee2da0e3e8c95e90d78e234bcf2193869d115f8.name = "6.0~ynh2"