diff --git a/manifest.toml b/manifest.toml index 4ae4918..712225b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,12 +17,15 @@ admindoc = "https://wiki.kiwix.org/wiki/Kiwix-serve/" code = "https://github.com/kiwix/kiwix-tools" [integration] -yunohost = ">= 11.2.18" +yunohost = ">= 11.2.29" helpers_version = "2.1" architectures = ["amd64", "armhf", "arm64"] multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "100M" ram.runtime = "50M" diff --git a/scripts/backup b/scripts/backup index 8f04146..19359f8 100755 --- a/scripts/backup +++ b/scripts/backup @@ -1,6 +1,5 @@ #!/bin/bash -# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers diff --git a/scripts/change_url b/scripts/change_url index a216e79..84fe976 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -22,7 +22,6 @@ ynh_config_change_url_nginx #================================================= ynh_script_progression "Starting $app's systemd service..." -# Start a systemd service ynh_systemctl --service=$app --action="start" --log_path="systemd" #================================================= diff --git a/scripts/install b/scripts/install index 69d3723..6c6c73b 100755 --- a/scripts/install +++ b/scripts/install @@ -8,10 +8,8 @@ source /usr/share/yunohost/helpers #================================================= 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" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir" chmod +x $install_dir/{kiwix-manage,kiwix-serve,kiwix-search} #================================================= @@ -19,10 +17,8 @@ chmod +x $install_dir/{kiwix-manage,kiwix-serve,kiwix-search} #================================================= ynh_script_progression "Adding system configurations related to $app..." -# Create a dedicated NGINX config ynh_config_add_nginx -# Create a dedicated systemd config ynh_config_add_systemd yunohost service add $app --description="Internet without Internet access" --log="systemd" diff --git a/scripts/remove b/scripts/remove index 098e9c9..98764ca 100755 --- a/scripts/remove +++ b/scripts/remove @@ -5,23 +5,17 @@ source /usr/share/yunohost/helpers #================================================= # REMOVE SYSTEM CONFIGURATIONS -#================================================= -# REMOVE SYSTEMD SERVICE - #================================================= 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 dedicated systemd config ynh_config_remove_systemd -# Remove the dedicated NGINX config ynh_config_remove_nginx #================================================= diff --git a/scripts/restore b/scripts/restore index 60a0bc0..bc29736 100755 --- a/scripts/restore +++ b/scripts/restore @@ -1,6 +1,5 @@ #!/bin/bash -# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -11,7 +10,6 @@ ynh_script_progression "Restoring the app main directory..." ynh_restore "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir" #================================================= # RESTORE THE DATA DIRECTORY #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index db2b1a2..bb65804 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -16,10 +16,8 @@ ynh_systemctl --service=$app --action="stop" --log_path="systemd" ynh_script_progression "Upgrading source files..." mkdir -p $install_dir/bin -# Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir" chmod +x $install_dir/{kiwix-manage,kiwix-serve,kiwix-search} #================================================= @@ -27,10 +25,8 @@ chmod +x $install_dir/{kiwix-manage,kiwix-serve,kiwix-search} #================================================= ynh_script_progression "Upgrading system configurations related to $app..." -# Create a dedicated NGINX config ynh_config_add_nginx -# Create a dedicated systemd config ynh_config_add_systemd yunohost service add $app --description="Internet without Internet access" --log="systemd"