diff --git a/manifest.toml b/manifest.toml index 73a5e07..e4b88c2 100644 --- a/manifest.toml +++ b/manifest.toml @@ -19,8 +19,11 @@ website = "https://tildegit.org/Sbgodin/htmgem" 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 fdaeff7..d84cc6e 100755 --- a/scripts/install +++ b/scripts/install @@ -11,6 +11,7 @@ source ynh_apps source /usr/share/yunohost/helpers ynh_install_apps --apps="gemserv" + #================================================= # CREATE DEDICATED USER #================================================= @@ -67,7 +68,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Configuring PHP-FPM..." # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low +ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config diff --git a/scripts/restore b/scripts/restore index eee6b79..3026eb0 100755 --- a/scripts/restore +++ b/scripts/restore @@ -40,24 +40,9 @@ ynh_script_progression --message="Restoring the app main directory..." ynh_restore_file --origin_path="$install_dir" -#chmod 750 "$install_dir" -#chmod -R o-rwx "$install_dir" +chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# RESTORE THE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the PHP-FPM configuration..." - -ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" - -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RESTORE THE MYSQL DATABASE #================================================= @@ -69,9 +54,13 @@ if [ $with_mysql -eq 1 ]; then fi #================================================= -# RESTORE VARIOUS FILES +# RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Restoring various files..." +ynh_script_progression --message="Restoring the PHP-FPM configuration..." + +ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_restore_file --origin_path="/etc/gemserv/config.d/$domain.toml" ynh_systemd_action --service_name=gemserv --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index 09fcaf1..68e59ae 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -61,7 +61,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Upgrading PHP-FPM configuration..." # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low +ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config