diff --git a/manifest.toml b/manifest.toml index 1dbcb41..fb36021 100644 --- a/manifest.toml +++ b/manifest.toml @@ -18,11 +18,14 @@ website = "https://framalibre.org/notices/prettynoemiecms.html" fund = "https://framasoft.org/fr/#support" [integration] -yunohost = ">= 4.3.0" +yunohost = ">= 11.2" architectures = "all" multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "50M" ram.runtime = "50M" diff --git a/scripts/install b/scripts/install index 5bfce23..ea1a6a7 100755 --- a/scripts/install +++ b/scripts/install @@ -51,7 +51,7 @@ ynh_install_composer --phpversion="$phpversion" --workdir="$install_dir" ynh_script_progression --message="Adding a configuration file..." mkdir -p "$install_dir/sites/$domain" -ynh_add_config --template="../conf/config.json" --destination="$install_dir/sites/$domain/config.json" +ynh_add_config --template="config.json" --destination="$install_dir/sites/$domain/config.json" # Set permissions to app files chmod 750 "$install_dir" diff --git a/scripts/remove b/scripts/remove index 20801b1..dd7376b 100755 --- a/scripts/remove +++ b/scripts/remove @@ -9,7 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers - #================================================= # REMOVE NGINX CONFIGURATION #================================================= diff --git a/scripts/restore b/scripts/restore index 1e8ee0a..d0adac8 100755 --- a/scripts/restore +++ b/scripts/restore @@ -20,7 +20,6 @@ ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" - #================================================= # RESTORE SYSTEM CONFIGURATIONS #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 7b49a72..929e328 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,12 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # STANDARD UPGRADE STEPS #================================================= @@ -25,14 +19,10 @@ ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=4 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=4 - - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep="sites/" -fi +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir="$install_dir" --keep="sites/" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir"