diff --git a/manifest.toml b/manifest.toml index c5c10b0..b30f641 100644 --- a/manifest.toml +++ b/manifest.toml @@ -18,7 +18,7 @@ userdoc = "https://galene.org/faq.html" code = "https://github.com/jech/galene" [integration] -yunohost = ">= 11.2.14" +yunohost = ">= 11.2.15" helpers_version = "2.1" architectures = "all" multi_instance = false diff --git a/scripts/install b/scripts/install index cfdaaba..77f01a5 100755 --- a/scripts/install +++ b/scripts/install @@ -23,7 +23,6 @@ ynh_hide_warnings yunohost firewall allow UDP -4 49152:65535 #================================================= ynh_script_progression "Setting up source files..." -# Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir/build" ynh_setup_source --dest_dir="$install_dir/build_ldap" --source_id="ldap" @@ -41,7 +40,7 @@ chown -R $app:www-data "$install_dir" #================================================= # BUILD APP #================================================= -ynh_script_progression "Building app..." +ynh_script_progression "Building $app..." ynh_go_install @@ -103,10 +102,8 @@ ynh_script_progression "Adding system configurations related to $app..." public_ip4="$(curl -s ip.yunohost.org)" || true -# Create a dedicated NGINX config ynh_config_add_nginx -# Create a dedicated systemd config ynh_config_add_systemd ynh_config_add_systemd --service=${app}_ldap --template="ldap.service" diff --git a/scripts/remove b/scripts/remove index 6e8756c..56fbf37 100755 --- a/scripts/remove +++ b/scripts/remove @@ -4,30 +4,24 @@ source _common.sh source /usr/share/yunohost/helpers #================================================= -# STANDARD REMOVE -#================================================= -# REMOVE SERVICE INTEGRATION IN YUNOHOST +# REMOVE SYSTEM CONFIGURATIONS #================================================= ynh_script_progression "Removing system configurations related to $app..." -# Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_hide_warnings yunohost service status $app >/dev/null then ynh_script_progression "Removing $app service integration..." yunohost service remove $app fi -# Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_hide_warnings yunohost service status ${app}_ldap >/dev/null then ynh_script_progression "Removing ${app}_ldap service integration..." yunohost service remove ${app}_ldap fi -# Remove the dedicated systemd config ynh_config_remove_systemd ynh_config_remove_systemd${app}_ldap -# Remove the dedicated NGINX config ynh_config_remove_nginx #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 89edb5a..2078d08 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -122,10 +122,8 @@ ynh_script_progression "Upgrading system configurations related to $app..." public_ip4="$(curl -s ip.yunohost.org)" || true -# Create a dedicated NGINX config ynh_config_add_nginx -# Create a dedicated systemd config ynh_config_add_systemd ynh_config_add_systemd --service=${app}_ldap --template="ldap.service"