From 24f3ec23e9d324e21b75416aad230cf3f18223ca Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 13 Aug 2023 08:36:25 +0000 Subject: [PATCH 01/17] Auto-update README --- README.md | 3 ++- README_fr.md | 15 ++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 84046b8..8f52e62 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ It shall NOT be edited by hand. # Framaforms for YunoHost -[![Integration level](https://dash.yunohost.org/integration/framaforms.svg)](https://dash.yunohost.org/appci/app/framaforms) ![Working status](https://ci-apps.yunohost.org/ci/badges/framaforms.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/framaforms.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/framaforms.svg)](https://dash.yunohost.org/appci/app/framaforms) ![Working status](https://ci-apps.yunohost.org/ci/badges/framaforms.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/framaforms.maintain.svg) + [![Install Framaforms with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=framaforms) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index 9e1b51b..fbabc87 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,15 +5,16 @@ It shall NOT be edited by hand. # Framaforms pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/framaforms.svg)](https://dash.yunohost.org/appci/app/framaforms) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/framaforms.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/framaforms.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/framaforms.svg)](https://dash.yunohost.org/appci/app/framaforms) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/framaforms.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/framaforms.maintain.svg) + [![Installer Framaforms avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=framaforms) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Framaforms rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer Framaforms rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble Framaforms is an online forms and surveys service. Registered users are allowed to create forms, share them, collect and visualize results through a simple interface. See this [article](https://framablog.org/2016/10/05/framaforms-noffrez-plus-les-reponses-que-vous-collectez-a-google/) and this [interview](https://framablog.org/2016/10/05/en-savoir-un-peu-plus-sur-le-projet-framaforms/) (in French) for further informations. @@ -28,8 +29,8 @@ You can modify some configurations using the Framaforms administration panel. Yo ## Documentations et ressources -* Site officiel de l'app : -* Dépôt de code officiel de l'app : +* Site officiel de l’app : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -45,4 +46,4 @@ ou sudo yunohost app upgrade framaforms -u https://github.com/YunoHost-Apps/framaforms_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From 834ba21a4cdb2efb2f54245c47a48669a2daca38 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 13 Aug 2023 10:38:24 +0200 Subject: [PATCH 02/17] packaging_v2 --- conf/cron | 2 +- conf/default.settings.php | 2 +- conf/nginx.conf | 2 +- conf/yoursite.aliases.drushrc.php | 2 +- manifest.toml | 95 +++++++++++++++++++++++ scripts/_common.sh | 4 +- scripts/backup | 20 ++--- scripts/change_url | 68 ++++++++-------- scripts/install | 124 +++++++++++++++--------------- scripts/remove | 32 ++++---- scripts/restore | 64 +++++++-------- scripts/upgrade | 100 ++++++++++++------------ 12 files changed, 306 insertions(+), 209 deletions(-) create mode 100644 manifest.toml diff --git a/conf/cron b/conf/cron index 4009261..00ac20e 100644 --- a/conf/cron +++ b/conf/cron @@ -1,5 +1,5 @@ SHELL=/bin/sh -PATH=__FINALPATH__/.composer/vendor/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin +PATH=__INSTALL_DIR__/.composer/vendor/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin # m h dom mon dow user command 30 * * * * __APP__ drush --quiet @__APP__ core-cron diff --git a/conf/default.settings.php b/conf/default.settings.php index 61d9419..b355445 100644 --- a/conf/default.settings.php +++ b/conf/default.settings.php @@ -679,4 +679,4 @@ $conf['file_scan_ignore_directories'] = array( */ $conf['x_frame_options'] = ''; -$conf['file_temporary_path'] = '__FINALPATH__/app/sites/default/files/tmp'; +$conf['file_temporary_path'] = '__INSTALL_DIR__/app/sites/default/files/tmp'; diff --git a/conf/nginx.conf b/conf/nginx.conf index 8293184..957d8fe 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -2,7 +2,7 @@ location __PATH__/ { # Path to source - alias __FINALPATH__/app/ ; + alias __INSTALL_DIR__/app/ ; index index.php; diff --git a/conf/yoursite.aliases.drushrc.php b/conf/yoursite.aliases.drushrc.php index 2c91f35..4b5b5ac 100644 --- a/conf/yoursite.aliases.drushrc.php +++ b/conf/yoursite.aliases.drushrc.php @@ -28,7 +28,7 @@ * Set the root and site_path values to point to your local site */ $aliases['__APP__'] = array( - 'root' => '__FINALPATH__/app/', + 'root' => '__INSTALL_DIR__/app/', 'uri' => 'https://__DOMAIN____PATH__', 'path-aliases' => array( '%dump-dir' => '/tmp', diff --git a/manifest.toml b/manifest.toml new file mode 100644 index 0000000..107dc9a --- /dev/null +++ b/manifest.toml @@ -0,0 +1,95 @@ +packaging_format = 2 + +id = "framaforms" +name = "Framaforms" +description.en = "Create online webforms and surveys" +description.fr = "Créez des formulaires et questionnaires en ligne" + +version = "1.1~ynh1" + +maintainers = ["ljf"] + +[upstream] +license = "GPL-2.0-only" +website = "https://yakforms.org" +code = "https://framagit.org/yakforms/yakforms" +cpe = "???" # FIXME: optional but recommended if relevant, this is meant to contain the Common Platform Enumeration, which is sort of a standard id for applications defined by the NIST. In particular, Yunohost may use this is in the future to easily track CVE (=security reports) related to apps. The CPE may be obtained by searching here: https://nvd.nist.gov/products/cpe/search. For example, for Nextcloud, the CPE is 'cpe:2.3:a:nextcloud:nextcloud' (no need to include the version number) +fund = "???" # FIXME: optional but recommended (or remove if irrelevant / not applicable). This is meant to be an URL where people can financially support this app, especially when its development is based on volunteers and/or financed by its community. YunoHost may later advertise it in the webadmin. + +[integration] +yunohost = ">= 4.3.0" +architectures = "all" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64), for example: ["amd64", "i386"] +multi_instance = true +ldap = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "sso" key : the "ldap" key corresponds to wether or not a user *can* login on the app using its YunoHost credentials. +sso = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "ldap" key : the "sso" key corresponds to wether or not a user is *automatically logged-in* on the app when logged-in on the YunoHost portal. +disk = "50M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ... +ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... +ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... + +[install] + [install.domain] + # this is a generic question - ask strings are automatically handled by Yunohost's core + type = "domain" + + [install.path] + # this is a generic question - ask strings are automatically handled by Yunohost's core + type = "path" + default = "/poll" + + [install.init_main_permission] + help.en = "If no, only person with an account on your server will be able to create forms. In all cases, visitors will be able to reply to form." + help.fr = "Si non, seule la personne disposant d'un compte sur votre serveur pourra créer des formulaires. Dans tous les cas, les visiteurs pourront répondre au formulaire." + type = "group" + default = "visitors" + + [install.language] + ask.en = "Choose the application language" + ask.fr = "Choisissez la langue de l'application" + type = "string" + choices = ["de", "en", "es", "fr", "it", "pt"] + default = "en" + + [install.admin] + # this is a generic question - ask strings are automatically handled by Yunohost's core + type = "user" + + [install.password] + # this is a generic question - ask strings are automatically handled by Yunohost's core + type = "password" + + [install.expiration] + ask.en = "After how many weeks do the forms expire?" + ask.fr = "Après combien de semaines les formulaires expirent-ils ?" + help.en = "Set 0 to disable expiration" + help.fr = "Mettre 0 pour désactiver l'expiration" + type = "string" + default = "0" + + [install.deletion] + ask.en = "After how many weeks is the forms deleted?" + ask.fr = "Après combien de semaines les formulaires sont-ils supprimés ?" + help.en = "Set 0 to disable deletion" + help.fr = "Mettre 0 pour désactiver la suppression" + type = "string" + default = "0" + +[resources] + [resources.sources.main] + url = "https://framagit.org/yakforms/yakforms/-/archive/1.0.3/yakforms-1.0.3.tar.gz" + sha256 = "f8a8ac8789c36f07f2d1a03d13f9f6d947e499967b79ea626f7f87271a357703" + + + [resources.system_user] + + [resources.install_dir] + + [resources.data_dir] + + [resources.permissions] + main.url = "/" + + [resources.apt] + packages = "postgresql, curl, libzip-dev, php7.3-fpm, php7.3-cli, php7.3-gd, php7.3-mysql, php7.3-xml, php7.3-ldap, php7.3-mbstring, php7.3-pgsql" + + [resources.database] + type = "postgresql" diff --git a/scripts/_common.sh b/scripts/_common.sh index 9d64b33..c5408e9 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,9 +4,9 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.3" +#REMOVEME? YNH_PHP_VERSION="7.3" -pkg_dependencies="postgresql curl libzip-dev php${YNH_PHP_VERSION}-fpm php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pgsql" +#REMOVEME? pkg_dependencies="postgresql curl libzip-dev php${YNH_PHP_VERSION}-fpm php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pgsql" YNH_COMPOSER_VERSION="1.10.17" diff --git a/scripts/backup b/scripts/backup index 1ebbcaf..20bd0df 100644 --- a/scripts/backup +++ b/scripts/backup @@ -15,20 +15,20 @@ source /usr/share/yunohost/helpers #================================================= # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_print_info --message="Loading installation settings..." +#REMOVEME? ynh_print_info --message="Loading installation settings..." -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -domain=$(ynh_app_setting_get --app=$app --key=domain) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -datadir=$(ynh_app_setting_get --app=$app --key=datadir) +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) +#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) +#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) +#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#REMOVEME? data_dir=$(ynh_app_setting_get --app=$app --key=data_dir) #================================================= # DECLARE DATA AND CONF FILES TO BACKUP @@ -39,13 +39,13 @@ ynh_print_info --message="Declaring files to be backed up..." # BACKUP THE APP MAIN DIR #================================================= -ynh_backup --src_path="$final_path" +ynh_backup --src_path="$install_dir" #================================================= # BACKUP THE DATA DIR #================================================= -ynh_backup --src_path="$datadir" --is_big +ynh_backup --src_path="$data_dir" --is_big #================================================= # BACKUP THE NGINX CONFIGURATION diff --git a/scripts/change_url b/scripts/change_url index 9ddd691..2acad7d 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -13,55 +13,55 @@ source /usr/share/yunohost/helpers # RETRIEVE ARGUMENTS #================================================= -old_domain=$YNH_APP_OLD_DOMAIN -old_path=$YNH_APP_OLD_PATH +#REMOVEME? old_domain=$YNH_APP_OLD_DOMAIN +#REMOVEME? old_path=$YNH_APP_OLD_PATH -new_domain=$YNH_APP_NEW_DOMAIN -new_path=$YNH_APP_NEW_PATH +#REMOVEME? new_domain=$YNH_APP_NEW_DOMAIN +#REMOVEME? new_path=$YNH_APP_NEW_PATH -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 -# Needed for helper "ynh_add_nginx_config" -final_path=$(ynh_app_setting_get --app=$app --key=final_path) +#REMOVEME? # Needed for helper "ynh_add_nginx_config" +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) # Add settings here as needed by your application #================================================= # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." +#REMOVEME? ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." # Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { +#REMOVEME? ynh_backup_before_upgrade +#REMOVEME? ynh_clean_setup () { # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. - ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" +#REMOVEME? ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" # Restore it if the upgrade fails - ynh_restore_upgradebackup +#REMOVEME? ynh_restore_upgradebackup } # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # CHECK WHICH PARTS SHOULD BE CHANGED #================================================= -change_domain=0 -if [ "$old_domain" != "$new_domain" ] +#REMOVEME? change_domain=0 +#REMOVEME? if [ "$old_domain" != "$new_domain" ] then - change_domain=1 + #REMOVEME? change_domain=1 fi -change_path=0 -if [ "$old_path" != "$new_path" ] +#REMOVEME? change_path=0 +#REMOVEME? if [ "$old_path" != "$new_path" ] then - change_path=1 + #REMOVEME? change_path=1 fi #================================================= @@ -71,28 +71,30 @@ fi #================================================= ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 -nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf +ynh_change_url_nginx_config + +#REMOVEME? nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf # Change the path in the NGINX config file if [ $change_path -eq 1 ] then # Make a backup of the original NGINX config file if modified - ynh_backup_if_checksum_is_different --file="$nginx_conf_path" +#REMOVEME? ynh_backup_if_checksum_is_different --file="$nginx_conf_path" # Set global variables for NGINX helper - domain="$old_domain" - path_url="$new_path" +#REMOVEME? domain="$old_domain" +#REMOVEME? path="$new_path" # Create a dedicated NGINX config - ynh_add_nginx_config +#REMOVEME? ynh_add_nginx_config fi # Change the domain for NGINX if [ $change_domain -eq 1 ] then # Delete file checksum for the old conf file location - ynh_delete_file_checksum --file="$nginx_conf_path" - mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf +#REMOVEME? ynh_delete_file_checksum --file="$nginx_conf_path" +#REMOVEME? mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf # Store file checksum for the new config file location - ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" +#REMOVEME? ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" fi #================================================= @@ -101,20 +103,20 @@ fi # UPDATE DRUSH ALIAS #================================================= ynh_script_progression --message="Updating Drush alias..." --weight=1 - +#REMOVEME? domain="$new_domain" -path_url="$new_path" +path="$new_path" -ynh_add_config --template="../conf/yoursite.aliases.drushrc.php" --destination="$final_path/.drush/$app.aliases.drushrc.php" +ynh_add_config --template="../conf/yoursite.aliases.drushrc.php" --destination="$install_dir/.drush/$app.aliases.drushrc.php" #================================================= # GENERIC FINALISATION #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 +#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 -ynh_systemd_action --service_name=nginx --action=reload +#REMOVEME? #REMOVEME? ynh_systemd_action --service_name=nginx --action=reload #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index 878eb75..c15932c 100644 --- a/scripts/install +++ b/scripts/install @@ -14,46 +14,46 @@ source /usr/share/yunohost/helpers #================================================= # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= -domain=$YNH_APP_ARG_DOMAIN -path_url=$YNH_APP_ARG_PATH -is_public=$YNH_APP_ARG_IS_PUBLIC -language=$YNH_APP_ARG_LANGUAGE -admin=$YNH_APP_ARG_ADMIN -password=$YNH_APP_ARG_PASSWORD -expiration=$YNH_APP_ARG_EXPIRATION -deletion=$YNH_APP_ARG_DELETION +#REMOVEME? domain=$YNH_APP_ARG_DOMAIN +#REMOVEME? path=$YNH_APP_ARG_PATH +#REMOVEME? is_public=$YNH_APP_ARG_IS_PUBLIC +#REMOVEME? language=$YNH_APP_ARG_LANGUAGE +#REMOVEME? admin=$YNH_APP_ARG_ADMIN +#REMOVEME? password=$YNH_APP_ARG_PASSWORD +#REMOVEME? expiration=$YNH_APP_ARG_EXPIRATION +#REMOVEME? deletion=$YNH_APP_ARG_DELETION -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME admin_mail=$(ynh_user_get_info --username=$admin --key=mail) #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= -ynh_script_progression --message="Validating installation parameters..." --weight=1 +#REMOVEME? ynh_script_progression --message="Validating installation parameters..." --weight=1 -final_path=/var/www/$app -test ! -e "$final_path" || ynh_die --message="This path already contains a folder" +#REMOVEME? install_dir=/var/www/$app +#REMOVEME? test ! -e "$install_dir" || ynh_die --message="This path already contains a folder" # Register (book) web path -ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url +#REMOVEME? ynh_webpath_register --app=$app --domain=$domain --path=$path #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -ynh_script_progression --message="Storing installation settings..." --weight=1 +#REMOVEME? ynh_script_progression --message="Storing installation settings..." --weight=1 -ynh_app_setting_set --app=$app --key=domain --value=$domain -ynh_app_setting_set --app=$app --key=path --value=$path_url +#REMOVEME? ynh_app_setting_set --app=$app --key=domain --value=$domain +#REMOVEME? ynh_app_setting_set --app=$app --key=path --value=$path ynh_app_setting_set --app=$app --key=language --value=$language -ynh_app_setting_set --app=$app --key=admin --value=$admin -ynh_app_setting_set --app=$app --key=password --value=$password +#REMOVEME? ynh_app_setting_set --app=$app --key=admin --value=$admin +#REMOVEME? ynh_app_setting_set --app=$app --key=password --value=$password ynh_app_setting_set --app=$app --key=expiration --value=$expiration ynh_app_setting_set --app=$app --key=deletion --value=$deletion @@ -62,42 +62,42 @@ ynh_app_setting_set --app=$app --key=deletion --value=$deletion #================================================= # INSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Installing dependencies..." --weight=7 +#REMOVEME? ynh_script_progression --message="Installing dependencies..." --weight=7 -ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies +#REMOVEME? ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE DEDICATED USER #================================================= -ynh_script_progression --message="Configuring system user..." --weight=3 +#REMOVEME? ynh_script_progression --message="Configuring system user..." --weight=3 # Create a system user -ynh_system_user_create --username=$app --home_dir=$final_path +#REMOVEME? ynh_system_user_create --username=$app --home_dir=$install_dir #================================================= # CREATE A POSTGRESQL DATABASE #================================================= -ynh_script_progression --message="Creating a PostgreSQL database..." --weight=2 +#REMOVEME? ynh_script_progression --message="Creating a PostgreSQL database..." --weight=2 -ynh_psql_test_if_first_run +#REMOVEME? ynh_psql_test_if_first_run -db_name=$(ynh_sanitize_dbid --db_name=$app) -db_user=$db_name -ynh_app_setting_set --app=$app --key=db_name --value=$db_name -ynh_psql_setup_db --db_user=$db_user --db_name=$db_name +#REMOVEME? db_name=$(ynh_sanitize_dbid --db_name=$app) +#REMOVEME? db_user=$db_name +#REMOVEME? ynh_app_setting_set --app=$app --key=db_name --value=$db_name +#REMOVEME? ynh_psql_setup_db --db_user=$db_user --db_name=$db_name #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= ynh_script_progression --message="Setting up source files..." --weight=9 -ynh_app_setting_set --app=$app --key=final_path --value=$final_path +#REMOVEME? ynh_app_setting_set --app=$app --key=install_dir --value=$install_dir # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$final_path/app" +ynh_setup_source --dest_dir="$install_dir/app" -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" +chmod 750 "$install_dir" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" #================================================= # PHP-FPM CONFIGURATION @@ -106,7 +106,7 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=low --footprint=low -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # NGINX CONFIGURATION @@ -123,8 +123,8 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Creating Drush alias..." --weight=2 -mkdir -p "$final_path/.drush" -drush_aliasconfig="$final_path/.drush/$app.aliases.drushrc.php" +mkdir -p "$install_dir/.drush" +drush_aliasconfig="$install_dir/.drush/$app.aliases.drushrc.php" ynh_add_config --template="../conf/yoursite.aliases.drushrc.php" --destination="$drush_aliasconfig" @@ -136,50 +136,50 @@ chown $app:$app "$drush_aliasconfig" #================================================= ynh_script_progression --message="Installing Composer..." --weight=31 -mkdir -p "$final_path/.composer" +mkdir -p "$install_dir/.composer" -ynh_add_config --template="../conf/composer.json" --destination="$final_path/.composer/composer.json" +ynh_add_config --template="../conf/composer.json" --destination="$install_dir/.composer/composer.json" -ynh_install_composer --phpversion="$phpversion" --workdir="$final_path/.composer" +ynh_install_composer --phpversion="$phpversion" --workdir="$install_dir/.composer" -export PATH="$final_path/.composer/vendor/bin:$PATH" +export PATH="$install_dir/.composer/vendor/bin:$PATH" #================================================= # INITIALIZE TMP AND PRIVATE DIRECTORY #================================================= ynh_script_progression --message="Initializing tmp and private directory..." --weight=1 -mkdir -p "$final_path/app/sites/default/files" -mkdir -p "$final_path/app/sites/default/files/tmp" +mkdir -p "$install_dir/app/sites/default/files" +mkdir -p "$install_dir/app/sites/default/files/tmp" -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" -chmod 2775 "$final_path/app/sites/default/files" +chmod 750 "$install_dir" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" +chmod 2775 "$install_dir/app/sites/default/files" #================================================= # CREATE DATA DIRECTORY #================================================= ynh_script_progression --message="Creating a data directory..." -datadir=/home/yunohost.app/$app -ynh_app_setting_set --app=$app --key=datadir --value=$datadir +#REMOVEME? data_dir=/home/yunohost.app/$app +#REMOVEME? ynh_app_setting_set --app=$app --key=data_dir --value=$data_dir -mkdir -p $datadir +mkdir -p $data_dir -chmod 750 "$datadir" -chmod -R o-rwx "$datadir" -chown -R $app:www-data "$datadir" +chmod 750 "$data_dir" +chmod -R o-rwx "$data_dir" +chown -R $app:www-data "$data_dir" #================================================= # ADD A CONFIGURATION #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="../conf/default.settings.php" --destination="$final_path/app/sites/default/settings.php" +ynh_add_config --template="../conf/default.settings.php" --destination="$install_dir/app/sites/default/settings.php" -chmod 600 "$final_path/app/sites/default/settings.php" -chown $app:$app "$final_path/app/sites/default/settings.php" +chmod 600 "$install_dir/app/sites/default/settings.php" +chown $app:$app "$install_dir/app/sites/default/settings.php" #================================================= # INSTALLING FRAMAFORMS WITH DRUSH @@ -250,25 +250,25 @@ ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring permissions..." --weight=1 +#REMOVEME? ynh_script_progression --message="Configuring permissions..." --weight=1 # Make app public if necessary -if [ $is_public -eq 1 ] +#REMOVEME? if [ $is_public -eq 1 ] then # Everyone can access the app. # The "main" permission is automatically created before the install script. - ynh_permission_update --permission="main" --add="visitors" +#REMOVEME? ynh_permission_update --permission="main" --add="visitors" fi # Only the admin can access the admin panel of the app (if the app has an admin panel) -ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin +#REMOVEME? ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 +#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 -ynh_systemd_action --service_name=nginx --action=reload +#REMOVEME? ynh_systemd_action --service_name=nginx --action=reload #================================================= # END OF SCRIPT diff --git a/scripts/remove b/scripts/remove index 29fdc7b..3acd9d3 100644 --- a/scripts/remove +++ b/scripts/remove @@ -12,33 +12,33 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get --app=$app --key=domain) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$db_name -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -datadir=$(ynh_app_setting_get --app=$app --key=datadir) +#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) +#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) +#REMOVEME? db_user=$db_name +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) +#REMOVEME? data_dir=$(ynh_app_setting_get --app=$app --key=data_dir) #================================================= # STANDARD REMOVE #================================================= # REMOVE THE POSTGRESQL DATABASE #================================================= -ynh_script_progression --message="Removing the PostgreSQL database..." --weight=1 +#REMOVEME? ynh_script_progression --message="Removing the PostgreSQL database..." --weight=1 # Remove a database if it exists, along with the associated user -ynh_psql_remove_db --db_user=$db_user --db_name=$db_name +#REMOVEME? ynh_psql_remove_db --db_user=$db_user --db_name=$db_name #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing app main directory..." --weight=1 +#REMOVEME? ynh_script_progression --message="Removing app main directory..." --weight=1 # Remove the app directory securely -ynh_secure_remove --file="$final_path" +#REMOVEME? ynh_secure_remove --file="$install_dir" #================================================= # REMOVE DATA DIR @@ -48,7 +48,7 @@ ynh_secure_remove --file="$final_path" if [ "${YNH_APP_PURGE:-0}" -eq 1 ] then ynh_script_progression --message="Removing app data directory..." - ynh_secure_remove --file="$datadir" +#REMOVEME? ynh_secure_remove --file="$data_dir" fi #================================================= @@ -70,10 +70,10 @@ ynh_remove_fpm_config #================================================= # REMOVE DEPENDENCIES #================================================= -ynh_script_progression --message="Removing dependencies..." --weight=7 +#REMOVEME? ynh_script_progression --message="Removing dependencies..." --weight=7 # Remove metapackage and its dependencies -ynh_remove_app_dependencies +#REMOVEME? ynh_remove_app_dependencies #================================================= # SPECIFIC REMOVE @@ -90,10 +90,10 @@ ynh_secure_remove --file="/etc/cron.d/$app" #================================================= # REMOVE DEDICATED USER #================================================= -ynh_script_progression --message="Removing the dedicated system user..." --weight=1 +#REMOVEME? ynh_script_progression --message="Removing the dedicated system user..." --weight=1 # Delete a system user -ynh_system_user_delete --username=$app +#REMOVEME? ynh_system_user_delete --username=$app #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index 889e89d..e13d125 100644 --- a/scripts/restore +++ b/scripts/restore @@ -15,76 +15,76 @@ source /usr/share/yunohost/helpers #================================================= # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 +#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url=$(ynh_app_setting_get --app=$app --key=path) -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_user=$db_name -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -datadir=$(ynh_app_setting_get --app=$app --key=datadir) +#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) +#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path) +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) +#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) +#REMOVEME? db_user=$db_name +#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#REMOVEME? data_dir=$(ynh_app_setting_get --app=$app --key=data_dir) #================================================= # CHECK IF THE APP CAN BE RESTORED #================================================= -ynh_script_progression --message="Validating restoration parameters..." --weight=1 +#REMOVEME? ynh_script_progression --message="Validating restoration parameters..." --weight=1 -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " +#REMOVEME? test ! -d $install_dir \ + || ynh_die --message="There is already a directory: $install_dir " #================================================= # STANDARD RESTORATION STEPS #================================================= # RECREATE THE DEDICATED USER #================================================= -ynh_script_progression --message="Recreating the dedicated system user..." --weight=1 +#REMOVEME? ynh_script_progression --message="Recreating the dedicated system user..." --weight=1 # Create the dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir="$final_path" +#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" #================================================= # RESTORE THE APP MAIN DIR #================================================= ynh_script_progression --message="Restoring the app main directory..." --weight=1 -ynh_restore_file --origin_path="$final_path" +ynh_restore_file --origin_path="$install_dir" -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" +chmod 750 "$install_dir" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" -chmod 2775 "$final_path/app/sites/default/files" +chmod 2775 "$install_dir/app/sites/default/files" #================================================= # RESTORE THE DATA DIRECTORY #================================================= ynh_script_progression --message="Restoring the data directory..." -ynh_restore_file --origin_path="$datadir" --not_mandatory +ynh_restore_file --origin_path="$data_dir" --not_mandatory -mkdir -p $datadir +mkdir -p $data_dir -chmod 750 "$datadir" -chmod -R o-rwx "$datadir" -chown -R $app:www-data "$datadir" +chmod 750 "$data_dir" +chmod -R o-rwx "$data_dir" +chown -R $app:www-data "$data_dir" #================================================= # SPECIFIC RESTORATION #================================================= # REINSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Reinstalling dependencies..." --weight=1 +#REMOVEME? ynh_script_progression --message="Reinstalling dependencies..." --weight=1 # Define and install dependencies -ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies +#REMOVEME? ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE THE PHP-FPM CONFIGURATION @@ -96,7 +96,7 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" # Recreate a dedicated php-fpm config ynh_add_fpm_config --usage=low --footprint=low -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # RESTORE THE NGINX CONFIGURATION @@ -108,11 +108,11 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # RESTORE THE POSTGRESQL DATABASE #================================================= -ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=2 +#REMOVEME? ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=2 -ynh_psql_test_if_first_run -db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) -ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd +#REMOVEME? ynh_psql_test_if_first_run +#REMOVEME? db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) +#REMOVEME? ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd ynh_psql_execute_file_as_root --database=$db_name --file="./db.sql" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 96e758a..190a63f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,17 +12,17 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=2 +#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=2 -app=$YNH_APP_INSTANCE_NAME +#REMOVEME? app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get --app=$app --key=domain) -path_url=$(ynh_app_setting_get --app=$app --key=path) -admin=$(ynh_app_setting_get --app=$app --key=admin) -final_path=$(ynh_app_setting_get --app=$app --key=final_path) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -datadir=$(ynh_app_setting_get --app=$app --key=datadir) +#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) +#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path) +#REMOVEME? admin=$(ynh_app_setting_get --app=$app --key=admin) +#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) +#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) +#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +#REMOVEME? data_dir=$(ynh_app_setting_get --app=$app --key=data_dir) #================================================= # CHECK VERSION @@ -34,16 +34,16 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=21 +#REMOVEME? ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=21 # Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { +#REMOVEME? ynh_backup_before_upgrade +#REMOVEME? ynh_clean_setup () { # Restore it if the upgrade fails - ynh_restore_upgradebackup +#REMOVEME? ynh_restore_upgradebackup } # Exit if an error occurs during the execution of the script -ynh_abort_if_errors +#REMOVEME? ynh_abort_if_errors #================================================= # STANDARD UPGRADE STEPS @@ -53,50 +53,50 @@ ynh_abort_if_errors ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 # Cleaning legacy permissions -if ynh_legacy_permissions_exists; then - ynh_legacy_permissions_delete_all +#REMOVEME? if ynh_legacy_permissions_exists; then +#REMOVEME? ynh_legacy_permissions_delete_all ynh_app_setting_delete --app=$app --key=is_public fi -if ! ynh_permission_exists --permission="admin"; then +#REMOVEME? if ! ynh_permission_exists --permission="admin"; then # Create the required permissions - ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin +#REMOVEME? ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin fi # If db_name doesn't exist, create it if [ -z "$db_name" ]; then db_name=$(ynh_sanitize_dbid --db_name=$app) - ynh_app_setting_set --app=$app --key=db_name --value=$db_name +#REMOVEME? ynh_app_setting_set --app=$app --key=db_name --value=$db_name fi -# If final_path doesn't exist, create it -if [ -z "$final_path" ]; then - final_path=/var/www/$app - ynh_app_setting_set --app=$app --key=final_path --value=$final_path +# If install_dir doesn't exist, create it +if [ -z "$install_dir" ]; then +#REMOVEME? install_dir=/var/www/$app +#REMOVEME? ynh_app_setting_set --app=$app --key=install_dir --value=$install_dir fi -# If datadir doesn't exist, create it -if [ -z "$datadir" ]; then - datadir=/home/yunohost.app/$app - ynh_app_setting_set --app=$app --key=datadir --value=$datadir +# If data_dir doesn't exist, create it +if [ -z "$data_dir" ]; then + data_dir=/home/yunohost.app/$app +#REMOVEME? ynh_app_setting_set --app=$app --key=data_dir --value=$data_dir fi #================================================= # CREATE DEDICATED USER #================================================= -ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 +#REMOVEME? ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 # Create a dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir=$final_path +#REMOVEME? ynh_system_user_create --username=$app --home_dir=$install_dir #================================================= # UPGRADE DEPENDENCIES #================================================= -ynh_script_progression --message="Upgrading dependencies..." --weight=5 +#REMOVEME? ynh_script_progression --message="Upgrading dependencies..." --weight=5 -ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies +#REMOVEME? ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # PHP-FPM CONFIGURATION @@ -121,21 +121,21 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Creating a data directory..." -mkdir -p $datadir -chmod 750 "$datadir" -chmod -R o-rwx "$datadir" -chown -R $app:www-data "$datadir" +mkdir -p $data_dir +chmod 750 "$data_dir" +chmod -R o-rwx "$data_dir" +chown -R $app:www-data "$data_dir" #================================================= # Framaforms 2 Yakforms Backup #================================================= upgrade_to_yakforms=false -if test -d "$final_path/app/CHANGELOG-FRAMAFORMS.md" +#REMOVEME? if test -d "$install_dir/app/CHANGELOG-FRAMAFORMS.md" then update-alternatives --set php /usr/bin/php$phpversion upgrade_to_yakforms=true - pushd "$final_path" + pushd "$install_dir" ynh_exec_as $app env PATH=$PATH php framaforms2yakforms.php backup ynh_exec_as $app env PATH=$PATH drush @$app dis framaforms ynh_exec_as $app env PATH=$PATH drush @$app pm-uninstall framaforms @@ -158,21 +158,21 @@ then ynh_script_progression --message="Upgrading source files..." --weight=9 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path/app" + ynh_setup_source --dest_dir="$install_dir/app" fi -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" +chmod 750 "$install_dir" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" #================================================= # UPGRADE COMPOSER #================================================= ynh_script_progression --message="Upgrading Composer..." --weight=3 -ynh_install_composer --phpversion="$phpversion" --workdir="$final_path/.composer" +ynh_install_composer --phpversion="$phpversion" --workdir="$install_dir/.composer" -export PATH="$final_path/.composer/vendor/bin:$PATH" +export PATH="$install_dir/.composer/vendor/bin:$PATH" #================================================= # Framaforms 2 Yakforms Restore @@ -181,7 +181,7 @@ if [ "$upgrade_to_yakforms" = true ] then update-alternatives --set php /usr/bin/php$phpversion - pushd "$final_path" + pushd "$install_dir" ynh_exec_as $app env PATH=$PATH drush @$app en yakforms ynh_exec_as $app env PATH=$PATH drush @$app dis yakforms_share_results ynh_exec_as $app env PATH=$PATH drush @$app dis yakforms_public_results @@ -199,11 +199,11 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading Drupal..." --weight=30 - ynh_backup_if_checksum_is_different --file="$final_path/app/sites/default/settings.php" + ynh_backup_if_checksum_is_different --file="$install_dir/app/sites/default/settings.php" update-alternatives --set php /usr/bin/php$phpversion - pushd "$final_path" + pushd "$install_dir" ynh_exec_as $app env PATH=$PATH drush @$app variable-set --exact maintenance_mode 1 ynh_exec_as $app env PATH=$PATH drush @$app cache-clear all # ynh_exec_as $app env PATH=$PATH drush @$app pm-update -y drupal @@ -220,17 +220,17 @@ fi #================================================= ynh_script_progression --message="Updating a configuration file..." -chmod 600 "$final_path/app/sites/default/settings.php" -chown $app:$app "$final_path/app/sites/default/settings.php" +chmod 600 "$install_dir/app/sites/default/settings.php" +chown $app:$app "$install_dir/app/sites/default/settings.php" #================================================= # GENERIC FINALIZATION #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 +#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 -ynh_systemd_action --service_name=nginx --action=reload +#REMOVEME? ynh_systemd_action --service_name=nginx --action=reload #================================================= # END OF SCRIPT From 7ca2b6a064b48627f6690ddc8285fc3e176796c9 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 13 Aug 2023 10:39:01 +0200 Subject: [PATCH 03/17] packaging_v2 --- manifest.json | 98 --------------------------------------------------- 1 file changed, 98 deletions(-) delete mode 100644 manifest.json diff --git a/manifest.json b/manifest.json deleted file mode 100644 index 39dba71..0000000 --- a/manifest.json +++ /dev/null @@ -1,98 +0,0 @@ -{ - "name": "Framaforms", - "id": "framaforms", - "packaging_format": 1, - "description": { - "en": "Create online webforms and surveys", - "fr": "Créez des formulaires et questionnaires en ligne" - }, - "version": "1.1~ynh1", - "url": "https://yakforms.org", - "upstream": { - "license": "GPL-2.0-only", - "website": "https://yakforms.org", - "code": "https://framagit.org/yakforms/yakforms" - }, - "license": "GPL-2.0-only", - "maintainer": { - "name": "ljf", - "email": "ljf+framaforms_ynh@reflexlibre.net", - "url": "https://reflexlibre.net" - }, - "requirements": { - "yunohost": ">= 4.3.0" - }, - "multi_instance": true, - "services": [ - "nginx", - "php7.3-fpm", - "mysql" - ], - "arguments": { - "install": [ - { - "name": "domain", - "type": "domain" - }, - { - "name": "path", - "type": "path", - "example": "/poll", - "default": "/poll" - }, - { - "name": "is_public", - "type": "boolean", - "help": { - "en": "If no, only person with an account on your server will be able to create forms. In all cases, visitors will be able to reply to form.", - "fr": "Si non, seule la personne disposant d'un compte sur votre serveur pourra créer des formulaires. Dans tous les cas, les visiteurs pourront répondre au formulaire." - }, - "default": true - }, - { - "name": "language", - "type": "string", - "ask": { - "en": "Choose the application language", - "fr": "Choisissez la langue de l'application" - }, - "choices": ["de", "en", "es", "fr", "it", "pt"], - "default": "en" - }, - { - "name": "admin", - "type": "user" - }, - { - "name": "password", - "type": "password" - }, - { - "name": "expiration", - "type": "string", - "ask": { - "en": "After how many weeks do the forms expire?", - "fr": "Après combien de semaines les formulaires expirent-ils ?" - }, - "help": { - "en": "Set 0 to disable expiration", - "fr": "Mettre 0 pour désactiver l'expiration" - }, - "default": "0" - }, - { - "name": "deletion", - "type": "string", - "ask": { - "en": "After how many weeks is the forms deleted?", - "fr": "Après combien de semaines les formulaires sont-ils supprimés ?" - }, - "help": { - "en": "Set 0 to disable deletion", - "fr": "Mettre 0 pour désactiver la suppression" - }, - "default": "0" - } - ] - } -} From f7d407f872b203c742564a39c07628f920235337 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 13 Aug 2023 10:44:38 +0200 Subject: [PATCH 04/17] cleaning --- manifest.toml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 107dc9a..60396f1 100644 --- a/manifest.toml +++ b/manifest.toml @@ -13,16 +13,14 @@ maintainers = ["ljf"] license = "GPL-2.0-only" website = "https://yakforms.org" code = "https://framagit.org/yakforms/yakforms" -cpe = "???" # FIXME: optional but recommended if relevant, this is meant to contain the Common Platform Enumeration, which is sort of a standard id for applications defined by the NIST. In particular, Yunohost may use this is in the future to easily track CVE (=security reports) related to apps. The CPE may be obtained by searching here: https://nvd.nist.gov/products/cpe/search. For example, for Nextcloud, the CPE is 'cpe:2.3:a:nextcloud:nextcloud' (no need to include the version number) -fund = "???" # FIXME: optional but recommended (or remove if irrelevant / not applicable). This is meant to be an URL where people can financially support this app, especially when its development is based on volunteers and/or financed by its community. YunoHost may later advertise it in the webadmin. [integration] yunohost = ">= 4.3.0" -architectures = "all" # FIXME: can be replaced by a list of supported archs using the dpkg --print-architecture nomenclature (amd64/i386/armhf/arm64), for example: ["amd64", "i386"] +architectures = "all" multi_instance = true -ldap = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "sso" key : the "ldap" key corresponds to wether or not a user *can* login on the app using its YunoHost credentials. +ldap = "true" sso = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "ldap" key : the "sso" key corresponds to wether or not a user is *automatically logged-in* on the app when logged-in on the YunoHost portal. -disk = "50M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ... +disk = "500M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ... ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... From e27d4428e799518f593b3494dd54c5fa190a5e34 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 13 Aug 2023 11:08:31 +0200 Subject: [PATCH 05/17] Remove all RemoveMe MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Brute force, need to clean and check it… --- scripts/_common.sh | 4 +-- scripts/backup | 16 ++++----- scripts/change_url | 62 +++++++++++++++++----------------- scripts/install | 80 +++++++++++++++++++++---------------------- scripts/remove | 32 +++++++++--------- scripts/restore | 42 +++++++++++------------ scripts/upgrade | 84 +++++++++++++++++++++++----------------------- 7 files changed, 160 insertions(+), 160 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index c5408e9..b1a41c7 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,9 +4,9 @@ # COMMON VARIABLES #================================================= -#REMOVEME? YNH_PHP_VERSION="7.3" -#REMOVEME? pkg_dependencies="postgresql curl libzip-dev php${YNH_PHP_VERSION}-fpm php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pgsql" + + YNH_COMPOSER_VERSION="1.10.17" diff --git a/scripts/backup b/scripts/backup index 20bd0df..0f04eb8 100644 --- a/scripts/backup +++ b/scripts/backup @@ -15,20 +15,20 @@ source /usr/share/yunohost/helpers #================================================= # Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors + #================================================= # LOAD SETTINGS #================================================= -#REMOVEME? ynh_print_info --message="Loading installation settings..." -#REMOVEME? app=$YNH_APP_INSTANCE_NAME -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) -#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) -#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -#REMOVEME? data_dir=$(ynh_app_setting_get --app=$app --key=data_dir) + + + + + + + #================================================= # DECLARE DATA AND CONF FILES TO BACKUP diff --git a/scripts/change_url b/scripts/change_url index 2acad7d..ff74e8e 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -13,55 +13,55 @@ source /usr/share/yunohost/helpers # RETRIEVE ARGUMENTS #================================================= -#REMOVEME? old_domain=$YNH_APP_OLD_DOMAIN -#REMOVEME? old_path=$YNH_APP_OLD_PATH -#REMOVEME? new_domain=$YNH_APP_NEW_DOMAIN -#REMOVEME? new_path=$YNH_APP_NEW_PATH -#REMOVEME? app=$YNH_APP_INSTANCE_NAME + + + + + #================================================= # LOAD SETTINGS #================================================= -#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 -#REMOVEME? # Needed for helper "ynh_add_nginx_config" -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) + + + # Add settings here as needed by your application #================================================= # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP #================================================= -#REMOVEME? ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." + # Backup the current version of the app -#REMOVEME? ynh_backup_before_upgrade -#REMOVEME? ynh_clean_setup () { + + # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. -#REMOVEME? ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" + # Restore it if the upgrade fails -#REMOVEME? ynh_restore_upgradebackup + } # Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors + #================================================= # CHECK WHICH PARTS SHOULD BE CHANGED #================================================= -#REMOVEME? change_domain=0 -#REMOVEME? if [ "$old_domain" != "$new_domain" ] + + then - #REMOVEME? change_domain=1 + fi -#REMOVEME? change_path=0 -#REMOVEME? if [ "$old_path" != "$new_path" ] + + then - #REMOVEME? change_path=1 + fi #================================================= @@ -73,28 +73,28 @@ ynh_script_progression --message="Updating NGINX web server configuration..." -- ynh_change_url_nginx_config -#REMOVEME? nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf + # Change the path in the NGINX config file if [ $change_path -eq 1 ] then # Make a backup of the original NGINX config file if modified -#REMOVEME? ynh_backup_if_checksum_is_different --file="$nginx_conf_path" + # Set global variables for NGINX helper -#REMOVEME? domain="$old_domain" -#REMOVEME? path="$new_path" + + # Create a dedicated NGINX config -#REMOVEME? ynh_add_nginx_config + fi # Change the domain for NGINX if [ $change_domain -eq 1 ] then # Delete file checksum for the old conf file location -#REMOVEME? ynh_delete_file_checksum --file="$nginx_conf_path" -#REMOVEME? mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf + + # Store file checksum for the new config file location -#REMOVEME? ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" + fi #================================================= @@ -103,7 +103,7 @@ fi # UPDATE DRUSH ALIAS #================================================= ynh_script_progression --message="Updating Drush alias..." --weight=1 -#REMOVEME? + domain="$new_domain" path="$new_path" @@ -114,9 +114,9 @@ ynh_add_config --template="../conf/yoursite.aliases.drushrc.php" --destination=" #================================================= # RELOAD NGINX #================================================= -#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 -#REMOVEME? #REMOVEME? ynh_systemd_action --service_name=nginx --action=reload + + #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index c15932c..b33b3c7 100644 --- a/scripts/install +++ b/scripts/install @@ -14,46 +14,46 @@ source /usr/share/yunohost/helpers #================================================= # Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors + #================================================= # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= -#REMOVEME? domain=$YNH_APP_ARG_DOMAIN -#REMOVEME? path=$YNH_APP_ARG_PATH -#REMOVEME? is_public=$YNH_APP_ARG_IS_PUBLIC -#REMOVEME? language=$YNH_APP_ARG_LANGUAGE -#REMOVEME? admin=$YNH_APP_ARG_ADMIN -#REMOVEME? password=$YNH_APP_ARG_PASSWORD -#REMOVEME? expiration=$YNH_APP_ARG_EXPIRATION -#REMOVEME? deletion=$YNH_APP_ARG_DELETION -#REMOVEME? app=$YNH_APP_INSTANCE_NAME + + + + + + + + + admin_mail=$(ynh_user_get_info --username=$admin --key=mail) #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= -#REMOVEME? ynh_script_progression --message="Validating installation parameters..." --weight=1 -#REMOVEME? install_dir=/var/www/$app -#REMOVEME? test ! -e "$install_dir" || ynh_die --message="This path already contains a folder" + + + # Register (book) web path -#REMOVEME? ynh_webpath_register --app=$app --domain=$domain --path=$path + #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -#REMOVEME? ynh_script_progression --message="Storing installation settings..." --weight=1 -#REMOVEME? ynh_app_setting_set --app=$app --key=domain --value=$domain -#REMOVEME? ynh_app_setting_set --app=$app --key=path --value=$path + + + ynh_app_setting_set --app=$app --key=language --value=$language -#REMOVEME? ynh_app_setting_set --app=$app --key=admin --value=$admin -#REMOVEME? ynh_app_setting_set --app=$app --key=password --value=$password + + ynh_app_setting_set --app=$app --key=expiration --value=$expiration ynh_app_setting_set --app=$app --key=deletion --value=$deletion @@ -62,36 +62,36 @@ ynh_app_setting_set --app=$app --key=deletion --value=$deletion #================================================= # INSTALL DEPENDENCIES #================================================= -#REMOVEME? ynh_script_progression --message="Installing dependencies..." --weight=7 -#REMOVEME? ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies + + #================================================= # CREATE DEDICATED USER #================================================= -#REMOVEME? ynh_script_progression --message="Configuring system user..." --weight=3 + # Create a system user -#REMOVEME? ynh_system_user_create --username=$app --home_dir=$install_dir + #================================================= # CREATE A POSTGRESQL DATABASE #================================================= -#REMOVEME? ynh_script_progression --message="Creating a PostgreSQL database..." --weight=2 -#REMOVEME? ynh_psql_test_if_first_run -#REMOVEME? db_name=$(ynh_sanitize_dbid --db_name=$app) -#REMOVEME? db_user=$db_name -#REMOVEME? ynh_app_setting_set --app=$app --key=db_name --value=$db_name -#REMOVEME? ynh_psql_setup_db --db_user=$db_user --db_name=$db_name + + + + + + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= ynh_script_progression --message="Setting up source files..." --weight=9 -#REMOVEME? ynh_app_setting_set --app=$app --key=install_dir --value=$install_dir + # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir/app" @@ -106,7 +106,7 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=low --footprint=low -#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) + #================================================= # NGINX CONFIGURATION @@ -162,8 +162,8 @@ chmod 2775 "$install_dir/app/sites/default/files" #================================================= ynh_script_progression --message="Creating a data directory..." -#REMOVEME? data_dir=/home/yunohost.app/$app -#REMOVEME? ynh_app_setting_set --app=$app --key=data_dir --value=$data_dir + + mkdir -p $data_dir @@ -207,7 +207,7 @@ ynh_exec_as $app env PATH=$PATH drush @$app cache-clear drush -y 2>&1 ynh_exec_as $app env PATH=$PATH drush @$app l10n-update-refresh -y 2>&1 ynh_exec_as $app env PATH=$PATH drush @$app l10n-update -y 2>&1 -# We don't upgrade module to avoid to erase framaforms change +# We don't upgrade module to avoid to erase framaforms change # in drupal core and modules code # see https://framagit.org/framasoft/framaforms/-/wikis/modifications #ynh_exec_as $app env PATH=$PATH drush @$app pm-update -y @@ -250,25 +250,25 @@ ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" #================================================= # SETUP SSOWAT #================================================= -#REMOVEME? ynh_script_progression --message="Configuring permissions..." --weight=1 + # Make app public if necessary -#REMOVEME? if [ $is_public -eq 1 ] + then # Everyone can access the app. # The "main" permission is automatically created before the install script. -#REMOVEME? ynh_permission_update --permission="main" --add="visitors" + fi # Only the admin can access the admin panel of the app (if the app has an admin panel) -#REMOVEME? ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin + #================================================= # RELOAD NGINX #================================================= -#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 -#REMOVEME? ynh_systemd_action --service_name=nginx --action=reload + + #================================================= # END OF SCRIPT diff --git a/scripts/remove b/scripts/remove index 3acd9d3..bba0a91 100644 --- a/scripts/remove +++ b/scripts/remove @@ -12,33 +12,33 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 -#REMOVEME? app=$YNH_APP_INSTANCE_NAME -#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) -#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#REMOVEME? db_user=$db_name -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) -#REMOVEME? data_dir=$(ynh_app_setting_get --app=$app --key=data_dir) + + + + + + + #================================================= # STANDARD REMOVE #================================================= # REMOVE THE POSTGRESQL DATABASE #================================================= -#REMOVEME? ynh_script_progression --message="Removing the PostgreSQL database..." --weight=1 + # Remove a database if it exists, along with the associated user -#REMOVEME? ynh_psql_remove_db --db_user=$db_user --db_name=$db_name + #================================================= # REMOVE APP MAIN DIR #================================================= -#REMOVEME? ynh_script_progression --message="Removing app main directory..." --weight=1 + # Remove the app directory securely -#REMOVEME? ynh_secure_remove --file="$install_dir" + #================================================= # REMOVE DATA DIR @@ -48,7 +48,7 @@ source /usr/share/yunohost/helpers if [ "${YNH_APP_PURGE:-0}" -eq 1 ] then ynh_script_progression --message="Removing app data directory..." -#REMOVEME? ynh_secure_remove --file="$data_dir" + fi #================================================= @@ -70,10 +70,10 @@ ynh_remove_fpm_config #================================================= # REMOVE DEPENDENCIES #================================================= -#REMOVEME? ynh_script_progression --message="Removing dependencies..." --weight=7 + # Remove metapackage and its dependencies -#REMOVEME? ynh_remove_app_dependencies + #================================================= # SPECIFIC REMOVE @@ -90,10 +90,10 @@ ynh_secure_remove --file="/etc/cron.d/$app" #================================================= # REMOVE DEDICATED USER #================================================= -#REMOVEME? ynh_script_progression --message="Removing the dedicated system user..." --weight=1 + # Delete a system user -#REMOVEME? ynh_system_user_delete --username=$app + #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index e13d125..240cdb0 100644 --- a/scripts/restore +++ b/scripts/restore @@ -15,29 +15,29 @@ source /usr/share/yunohost/helpers #================================================= # Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors + #================================================= # LOAD SETTINGS #================================================= -#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=1 -#REMOVEME? app=$YNH_APP_INSTANCE_NAME -#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) -#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path) -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) -#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#REMOVEME? db_user=$db_name -#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -#REMOVEME? data_dir=$(ynh_app_setting_get --app=$app --key=data_dir) + + + + + + + + + #================================================= # CHECK IF THE APP CAN BE RESTORED #================================================= -#REMOVEME? ynh_script_progression --message="Validating restoration parameters..." --weight=1 -#REMOVEME? test ! -d $install_dir \ + + || ynh_die --message="There is already a directory: $install_dir " #================================================= @@ -45,10 +45,10 @@ source /usr/share/yunohost/helpers #================================================= # RECREATE THE DEDICATED USER #================================================= -#REMOVEME? ynh_script_progression --message="Recreating the dedicated system user..." --weight=1 + # Create the dedicated user (if not existing) -#REMOVEME? ynh_system_user_create --username=$app --home_dir="$install_dir" + #================================================= # RESTORE THE APP MAIN DIR @@ -81,10 +81,10 @@ chown -R $app:www-data "$data_dir" #================================================= # REINSTALL DEPENDENCIES #================================================= -#REMOVEME? ynh_script_progression --message="Reinstalling dependencies..." --weight=1 + # Define and install dependencies -#REMOVEME? ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies + #================================================= # RESTORE THE PHP-FPM CONFIGURATION @@ -96,7 +96,7 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" # Recreate a dedicated php-fpm config ynh_add_fpm_config --usage=low --footprint=low -#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) + #================================================= # RESTORE THE NGINX CONFIGURATION @@ -108,11 +108,11 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # RESTORE THE POSTGRESQL DATABASE #================================================= -#REMOVEME? ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=2 -#REMOVEME? ynh_psql_test_if_first_run -#REMOVEME? db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) -#REMOVEME? ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd + + + + ynh_psql_execute_file_as_root --database=$db_name --file="./db.sql" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 190a63f..01d9dce 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,17 +12,17 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -#REMOVEME? ynh_script_progression --message="Loading installation settings..." --weight=2 -#REMOVEME? app=$YNH_APP_INSTANCE_NAME -#REMOVEME? domain=$(ynh_app_setting_get --app=$app --key=domain) -#REMOVEME? path=$(ynh_app_setting_get --app=$app --key=path) -#REMOVEME? admin=$(ynh_app_setting_get --app=$app --key=admin) -#REMOVEME? #REMOVEME? install_dir=$(ynh_app_setting_get --app=$app --key=install_dir) -#REMOVEME? db_name=$(ynh_app_setting_get --app=$app --key=db_name) -#REMOVEME? phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -#REMOVEME? data_dir=$(ynh_app_setting_get --app=$app --key=data_dir) + + + + + + + + + #================================================= # CHECK VERSION @@ -34,16 +34,16 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -#REMOVEME? ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=21 + # Backup the current version of the app -#REMOVEME? ynh_backup_before_upgrade -#REMOVEME? ynh_clean_setup () { + + # Restore it if the upgrade fails -#REMOVEME? ynh_restore_upgradebackup + } # Exit if an error occurs during the execution of the script -#REMOVEME? ynh_abort_if_errors + #================================================= # STANDARD UPGRADE STEPS @@ -53,50 +53,50 @@ upgrade_type=$(ynh_check_app_version_changed) ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 # Cleaning legacy permissions -#REMOVEME? if ynh_legacy_permissions_exists; then -#REMOVEME? ynh_legacy_permissions_delete_all + + ynh_app_setting_delete --app=$app --key=is_public fi -#REMOVEME? if ! ynh_permission_exists --permission="admin"; then + # Create the required permissions -#REMOVEME? ynh_permission_create --permission="admin" --url="/admin" --allowed=$admin + fi # If db_name doesn't exist, create it if [ -z "$db_name" ]; then db_name=$(ynh_sanitize_dbid --db_name=$app) -#REMOVEME? ynh_app_setting_set --app=$app --key=db_name --value=$db_name + fi # If install_dir doesn't exist, create it if [ -z "$install_dir" ]; then -#REMOVEME? install_dir=/var/www/$app -#REMOVEME? ynh_app_setting_set --app=$app --key=install_dir --value=$install_dir + + fi # If data_dir doesn't exist, create it if [ -z "$data_dir" ]; then data_dir=/home/yunohost.app/$app -#REMOVEME? ynh_app_setting_set --app=$app --key=data_dir --value=$data_dir + fi #================================================= # CREATE DEDICATED USER #================================================= -#REMOVEME? ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 + # Create a dedicated user (if not existing) -#REMOVEME? ynh_system_user_create --username=$app --home_dir=$install_dir + #================================================= # UPGRADE DEPENDENCIES #================================================= -#REMOVEME? ynh_script_progression --message="Upgrading dependencies..." --weight=5 -#REMOVEME? ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies + + #================================================= # PHP-FPM CONFIGURATION @@ -130,20 +130,20 @@ chown -R $app:www-data "$data_dir" # Framaforms 2 Yakforms Backup #================================================= upgrade_to_yakforms=false -#REMOVEME? if test -d "$install_dir/app/CHANGELOG-FRAMAFORMS.md" + then update-alternatives --set php /usr/bin/php$phpversion upgrade_to_yakforms=true pushd "$install_dir" ynh_exec_as $app env PATH=$PATH php framaforms2yakforms.php backup - ynh_exec_as $app env PATH=$PATH drush @$app dis framaforms - ynh_exec_as $app env PATH=$PATH drush @$app pm-uninstall framaforms + ynh_exec_as $app env PATH=$PATH drush @$app dis framaforms + ynh_exec_as $app env PATH=$PATH drush @$app pm-uninstall framaforms ynh_exec_as $app env PATH=$PATH drush @$app dis framaforms_share_results - ynh_exec_as $app env PATH=$PATH drush @$app pm-uninstall framaforms_share_results - ynh_exec_as $app env PATH=$PATH drush @$app dis framaforms_public_results - ynh_exec_as $app env PATH=$PATH drush @$app pm-uninstall framaforms_public_results - ynh_exec_as $app env PATH=$PATH drush @$app dis framaforms_spam + ynh_exec_as $app env PATH=$PATH drush @$app pm-uninstall framaforms_share_results + ynh_exec_as $app env PATH=$PATH drush @$app dis framaforms_public_results + ynh_exec_as $app env PATH=$PATH drush @$app pm-uninstall framaforms_public_results + ynh_exec_as $app env PATH=$PATH drush @$app dis framaforms_spam ynh_exec_as $app env PATH=$PATH drush @$app pm-uninstall framaforms_spam popd update-alternatives --set php /usr/bin/php${YNH_DEFAULT_PHP_VERSION} @@ -182,10 +182,10 @@ then update-alternatives --set php /usr/bin/php$phpversion pushd "$install_dir" - ynh_exec_as $app env PATH=$PATH drush @$app en yakforms + ynh_exec_as $app env PATH=$PATH drush @$app en yakforms ynh_exec_as $app env PATH=$PATH drush @$app dis yakforms_share_results - ynh_exec_as $app env PATH=$PATH drush @$app dis yakforms_public_results - ynh_exec_as $app env PATH=$PATH drush @$app dis yakforms_spam + ynh_exec_as $app env PATH=$PATH drush @$app dis yakforms_public_results + ynh_exec_as $app env PATH=$PATH drush @$app dis yakforms_spam ynh_exec_as $app env PATH=$PATH php framaforms2yakforms.php restore ynh_exec_as $app env PATH=$PATH php framaforms2yakforms.php clean popd @@ -204,12 +204,12 @@ then update-alternatives --set php /usr/bin/php$phpversion pushd "$install_dir" - ynh_exec_as $app env PATH=$PATH drush @$app variable-set --exact maintenance_mode 1 - ynh_exec_as $app env PATH=$PATH drush @$app cache-clear all + ynh_exec_as $app env PATH=$PATH drush @$app variable-set --exact maintenance_mode 1 + ynh_exec_as $app env PATH=$PATH drush @$app cache-clear all # ynh_exec_as $app env PATH=$PATH drush @$app pm-update -y drupal # ynh_exec_as $app env PATH=$PATH drush @$app updatedb -y - ynh_exec_as $app env PATH=$PATH drush @$app cache-clear all - ynh_exec_as $app env PATH=$PATH drush @$app variable-set --exact maintenance_mode 0 + ynh_exec_as $app env PATH=$PATH drush @$app cache-clear all + ynh_exec_as $app env PATH=$PATH drush @$app variable-set --exact maintenance_mode 0 popd update-alternatives --set php /usr/bin/php${YNH_DEFAULT_PHP_VERSION} @@ -228,9 +228,9 @@ chown $app:$app "$install_dir/app/sites/default/settings.php" #================================================= # RELOAD NGINX #================================================= -#REMOVEME? ynh_script_progression --message="Reloading NGINX web server..." --weight=1 -#REMOVEME? ynh_systemd_action --service_name=nginx --action=reload + + #================================================= # END OF SCRIPT From b0a81e74d78b15ed99075f9cf75ebc02cf8e3e7e Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 13 Aug 2023 12:44:06 +0200 Subject: [PATCH 06/17] cleaning --- scripts/install | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/scripts/install b/scripts/install index b33b3c7..ebb7a8e 100644 --- a/scripts/install +++ b/scripts/install @@ -245,30 +245,6 @@ ynh_script_progression --message="Setuping the cron file..." ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" -#================================================= -# GENERIC FINALIZATION -#================================================= -# SETUP SSOWAT -#================================================= - - -# Make app public if necessary - -then - # Everyone can access the app. - # The "main" permission is automatically created before the install script. - -fi - -# Only the admin can access the admin panel of the app (if the app has an admin panel) - - -#================================================= -# RELOAD NGINX -#================================================= - - - #================================================= # END OF SCRIPT From a1ba023fd7a2142aec2afcdaaae14e2821e7f87c Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 13 Aug 2023 12:45:37 +0200 Subject: [PATCH 07/17] cleaning --- scripts/change_url | 87 ---------------------------------------------- 1 file changed, 87 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index ff74e8e..980aa65 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -9,61 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# RETRIEVE ARGUMENTS -#================================================= - - - - - - - - - -#================================================= -# LOAD SETTINGS -#================================================= - - - - - -# Add settings here as needed by your application - -#================================================= -# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP -#================================================= - - -# Backup the current version of the app - - - # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. - - - # Restore it if the upgrade fails - -} -# Exit if an error occurs during the execution of the script - - -#================================================= -# CHECK WHICH PARTS SHOULD BE CHANGED -#================================================= - - - -then - -fi - - - -then - -fi - #================================================= # STANDARD MODIFICATIONS #================================================= @@ -73,30 +18,6 @@ ynh_script_progression --message="Updating NGINX web server configuration..." -- ynh_change_url_nginx_config - - -# Change the path in the NGINX config file -if [ $change_path -eq 1 ] -then - # Make a backup of the original NGINX config file if modified - - # Set global variables for NGINX helper - - - # Create a dedicated NGINX config - -fi - -# Change the domain for NGINX -if [ $change_domain -eq 1 ] -then - # Delete file checksum for the old conf file location - - - # Store file checksum for the new config file location - -fi - #================================================= # SPECIFIC MODIFICATIONS #================================================= @@ -109,14 +30,6 @@ path="$new_path" ynh_add_config --template="../conf/yoursite.aliases.drushrc.php" --destination="$install_dir/.drush/$app.aliases.drushrc.php" -#================================================= -# GENERIC FINALISATION -#================================================= -# RELOAD NGINX -#================================================= - - - #================================================= # END OF SCRIPT From 572ded730d599b69e5b2c239e22603c9aa125b12 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 13 Aug 2023 12:45:57 +0200 Subject: [PATCH 08/17] cleaning --- scripts/upgrade | 78 ------------------------------------------------- 1 file changed, 78 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 01d9dce..47f3f24 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,20 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= - - - - - - - - - - - #================================================= # CHECK VERSION @@ -31,73 +17,18 @@ ynh_script_progression --message="Checking version..." --weight=1 upgrade_type=$(ynh_check_app_version_changed) -#================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP -#================================================= - - -# Backup the current version of the app - - - # Restore it if the upgrade fails - -} -# Exit if an error occurs during the execution of the script - - -#================================================= -# STANDARD UPGRADE STEPS -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 - -# Cleaning legacy permissions - - - - ynh_app_setting_delete --app=$app --key=is_public -fi - - - # Create the required permissions - -fi - # If db_name doesn't exist, create it if [ -z "$db_name" ]; then db_name=$(ynh_sanitize_dbid --db_name=$app) - fi -# If install_dir doesn't exist, create it -if [ -z "$install_dir" ]; then -fi - # If data_dir doesn't exist, create it if [ -z "$data_dir" ]; then data_dir=/home/yunohost.app/$app - fi -#================================================= -# CREATE DEDICATED USER -#================================================= - - -# Create a dedicated user (if not existing) - - - -#================================================= -# UPGRADE DEPENDENCIES -#================================================= - - - - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -223,15 +154,6 @@ ynh_script_progression --message="Updating a configuration file..." chmod 600 "$install_dir/app/sites/default/settings.php" chown $app:$app "$install_dir/app/sites/default/settings.php" -#================================================= -# GENERIC FINALIZATION -#================================================= -# RELOAD NGINX -#================================================= - - - - #================================================= # END OF SCRIPT #================================================= From bbde829e324fd3f522422a8c1b9e19f1c5f6b50b Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 13 Aug 2023 12:46:27 +0200 Subject: [PATCH 09/17] cleaning --- scripts/remove | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) diff --git a/scripts/remove b/scripts/remove index bba0a91..842fd4a 100644 --- a/scripts/remove +++ b/scripts/remove @@ -9,37 +9,9 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= - - - - - - - - - #================================================= # STANDARD REMOVE -#================================================= -# REMOVE THE POSTGRESQL DATABASE -#================================================= - - -# Remove a database if it exists, along with the associated user - - -#================================================= -# REMOVE APP MAIN DIR -#================================================= - - -# Remove the app directory securely - - #================================================= # REMOVE DATA DIR #================================================= @@ -67,14 +39,6 @@ ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1 # Remove the dedicated PHP-FPM config ynh_remove_fpm_config -#================================================= -# REMOVE DEPENDENCIES -#================================================= - - -# Remove metapackage and its dependencies - - #================================================= # SPECIFIC REMOVE #================================================= @@ -85,16 +49,6 @@ ynh_script_progression --message="Removing various files..." # Remove a cron file ynh_secure_remove --file="/etc/cron.d/$app" -#================================================= -# GENERIC FINALIZATION -#================================================= -# REMOVE DEDICATED USER -#================================================= - - -# Delete a system user - - #================================================= # END OF SCRIPT #================================================= From 6af21768b732014456f6d8b13fceee7fa4b605f9 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 13 Aug 2023 12:46:59 +0200 Subject: [PATCH 10/17] cleaning --- scripts/restore | 50 ------------------------------------------------- 1 file changed, 50 deletions(-) diff --git a/scripts/restore b/scripts/restore index 240cdb0..17179a1 100644 --- a/scripts/restore +++ b/scripts/restore @@ -10,46 +10,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit if an error occurs during the execution of the script - - -#================================================= -# LOAD SETTINGS -#================================================= - - - - - - - - - - - - -#================================================= -# CHECK IF THE APP CAN BE RESTORED -#================================================= - - - - || ynh_die --message="There is already a directory: $install_dir " - -#================================================= -# STANDARD RESTORATION STEPS -#================================================= -# RECREATE THE DEDICATED USER -#================================================= - - -# Create the dedicated user (if not existing) - - #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -79,11 +39,6 @@ chown -R $app:www-data "$data_dir" #================================================= # SPECIFIC RESTORATION #================================================= -# REINSTALL DEPENDENCIES -#================================================= - - -# Define and install dependencies #================================================= @@ -97,7 +52,6 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" # Recreate a dedicated php-fpm config ynh_add_fpm_config --usage=low --footprint=low - #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= @@ -109,10 +63,6 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" # RESTORE THE POSTGRESQL DATABASE #================================================= - - - - ynh_psql_execute_file_as_root --database=$db_name --file="./db.sql" #================================================= From 65e871080200fa87db32b6dab8dae3ba394512da Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 13 Aug 2023 12:47:33 +0200 Subject: [PATCH 11/17] cleaning --- scripts/backup | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/scripts/backup b/scripts/backup index 0f04eb8..4fe1139 100644 --- a/scripts/backup +++ b/scripts/backup @@ -10,26 +10,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit if an error occurs during the execution of the script - - -#================================================= -# LOAD SETTINGS -#================================================= - - - - - - - - - - #================================================= # DECLARE DATA AND CONF FILES TO BACKUP #================================================= From bd16c993941313a33c9f0a282d6d53c56f534221 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 13 Aug 2023 13:09:05 +0200 Subject: [PATCH 12/17] php 8.1 More secure version --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 60396f1..17540ea 100644 --- a/manifest.toml +++ b/manifest.toml @@ -87,7 +87,7 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen main.url = "/" [resources.apt] - packages = "postgresql, curl, libzip-dev, php7.3-fpm, php7.3-cli, php7.3-gd, php7.3-mysql, php7.3-xml, php7.3-ldap, php7.3-mbstring, php7.3-pgsql" + packages = "postgresql, curl, libzip-dev, php8.1-fpm, php8.1-cli, php8.1-gd, php8.1-mysql, php8.1-xml, php8.1-ldap, php8.1-mbstring, php8.1-pgsql" [resources.database] type = "postgresql" From 0791736ba659f87d849637736c6971494b39868d Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 18 Sep 2023 15:21:27 +0200 Subject: [PATCH 13/17] Attempt to finish packaging v2 ... --- check_process | 30 -------------- conf/extra_php-fpm.conf | 0 doc/DISCLAIMER.md | 3 -- manifest.toml | 10 ++--- scripts/_common.sh | 20 ---------- scripts/install | 87 +++-------------------------------------- scripts/remove | 31 +-------------- scripts/restore | 5 --- tests.toml | 5 +++ 9 files changed, 16 insertions(+), 175 deletions(-) delete mode 100644 check_process create mode 100644 conf/extra_php-fpm.conf delete mode 100644 doc/DISCLAIMER.md create mode 100644 tests.toml diff --git a/check_process b/check_process deleted file mode 100644 index 6878b03..0000000 --- a/check_process +++ /dev/null @@ -1,30 +0,0 @@ -;; Test complet - ; Manifest - domain="domain.tld" - path="/path" - is_public=1 - language="fr" - admin="john" - password="password" - expiration="0" - deletion="0" - ; Checks - pkg_linter=1 - setup_sub_dir=1 - setup_root=1 - setup_nourl=0 - setup_private=1 - setup_public=1 - upgrade=1 - # 1.0.3~ynh3 - upgrade=1 from_commit=79cdc1a139ff06805647cb56e5eab1d595ee0259 - backup_restore=1 - multi_instance=1 - port_already_use=0 - change_url=1 -;;; Options -Email=ljf+framaforms_ynh@reflexlibre.net -Notification=yes -;;; Upgrade options - ; commit=25e97123f0e82ec1b9375774f3e86b7d8f5d73cf - name=#34 from YunoHost-Apps/testing diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf new file mode 100644 index 0000000..e69de29 diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md deleted file mode 100644 index 08d2fff..0000000 --- a/doc/DISCLAIMER.md +++ /dev/null @@ -1,3 +0,0 @@ -## Configuration - -You can modify some configurations using the Framaforms administration panel. You can log in with the admin user and the password you gave during installation. diff --git a/manifest.toml b/manifest.toml index 17540ea..4b7f693 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ description.fr = "Créez des formulaires et questionnaires en ligne" version = "1.1~ynh1" -maintainers = ["ljf"] +maintainers = [] [upstream] license = "GPL-2.0-only" @@ -18,11 +18,11 @@ code = "https://framagit.org/yakforms/yakforms" yunohost = ">= 4.3.0" architectures = "all" multi_instance = true -ldap = "true" +ldap = true sso = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "ldap" key : the "sso" key corresponds to wether or not a user is *automatically logged-in* on the app when logged-in on the YunoHost portal. -disk = "500M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ... -ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... -ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... +disk = "500M" +ram.build = "50M" +ram.runtime = "50M" [install] [install.domain] diff --git a/scripts/_common.sh b/scripts/_common.sh index b1a41c7..a29d197 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,23 +1,3 @@ #!/bin/bash -#================================================= -# COMMON VARIABLES -#================================================= - - - - - YNH_COMPOSER_VERSION="1.10.17" - -#================================================= -# PERSONAL HELPERS -#================================================= - -#================================================= -# EXPERIMENTAL HELPERS -#================================================= - -#================================================= -# FUTURE OFFICIAL HELPERS -#================================================= diff --git a/scripts/install b/scripts/install index ebb7a8e..3dfc236 100644 --- a/scripts/install +++ b/scripts/install @@ -9,83 +9,8 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit if an error occurs during the execution of the script - - -#================================================= -# RETRIEVE ARGUMENTS FROM THE MANIFEST -#================================================= - - - - - - - - - - - - admin_mail=$(ynh_user_get_info --username=$admin --key=mail) -#================================================= -# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS -#================================================= - - - - - -# Register (book) web path - - -#================================================= -# STORE SETTINGS FROM MANIFEST -#================================================= - - - - -ynh_app_setting_set --app=$app --key=language --value=$language - - -ynh_app_setting_set --app=$app --key=expiration --value=$expiration -ynh_app_setting_set --app=$app --key=deletion --value=$deletion - -#================================================= -# STANDARD MODIFICATIONS -#================================================= -# INSTALL DEPENDENCIES -#================================================= - - - - -#================================================= -# CREATE DEDICATED USER -#================================================= - - -# Create a system user - - -#================================================= -# CREATE A POSTGRESQL DATABASE -#================================================= - - - - - - - - - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -105,8 +30,7 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low - +ynh_add_fpm_config #================================================= # NGINX CONFIGURATION @@ -162,9 +86,6 @@ chmod 2775 "$install_dir/app/sites/default/files" #================================================= ynh_script_progression --message="Creating a data directory..." - - - mkdir -p $data_dir chmod 750 "$data_dir" @@ -186,6 +107,9 @@ chown $app:$app "$install_dir/app/sites/default/settings.php" #================================================= ynh_script_progression --message="Installing database..." --weight=19 +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" + update-alternatives --set php /usr/bin/php$phpversion ynh_exec_as $app env PATH=$PATH drush @$app site-install framaforms_org install_configure_form.site_contact_url="https://forum.yunohost.org/t/framaforms-create-polls-using-drag-and-drop/8208" install_configure_form.site_default_country=FR -y --locale="$language" --account-name="admin" --account-pass="$password" --site-name="Framaforms" --site-mail="$admin_mail" 2>&1 ynh_exec_as $app env PATH=$PATH drush @$app variable-set update_notify_emails "$admin_mail" @@ -232,7 +156,7 @@ ynh_exec_as $app env PATH=$PATH drush @$app pm-download ldap ynh_exec_as $app env PATH=$PATH drush @$app pm-enable -y ldap_servers ldap_user ldap_authentication ldap_authorization ldap_authorization_drupal_role # Generated with sudo -u postgres pg_dump -a -t ldap_servers --inserts framaforms ynh_exec_as $app env PATH=$PATH drush @$app sql-query "INSERT INTO public.ldap_servers VALUES ('localhost', 1, 'localhost', 1, 'default', 'ldap://127.0.0.1', 389, 0, 0, 3, '', NULL, 'a:2:{i:0;s:27:\"ou=users,dc=yunohost,dc=org\";i:1;s:32:\"ou=permission,dc=yunohost,dc=org\";}', 'uid', 'uid', 'mail', '', '', '', 0, 'cn=%username,ou=users,dc=yunohost,dc=org', '', '', '', 0, 'permissionynh', 0, 1, 'permission', 'memberuid', 'dn', 0, '', '$app.main', '', 0, 1000, 0);" -ynh_exec_as $app env PATH=$PATH drush @$app sql-query "INSERT INTO public.ldap_authorization VALUES (1, 'localhost', 'drupal_role', 'ldap_authorization_drupal_role', 1, 1, 0, 'a:2:{i:0;a:6:{s:12:\"user_entered\";s:24:\"utilisateur authentifié\";s:4:\"from\";s:51:\"cn=framaforms.main,ou=permission,dc=yunohost,dc=org\";s:10:\"normalized\";s:24:\"utilisateur authentifié\";s:10:\"simplified\";s:24:\"utilisateur authentifié\";s:5:\"valid\";b:0;s:13:\"error_message\";s:112:\"Role utilisateur authentifié_name does not exist and role creation is not enabled.\";}i:1;a:6:{s:12:\"user_entered\";s:13:\"administrator\";s:4:\"from\";s:52:\"cn=framaforms.admin,ou=permission,dc=yunohost,dc=org\";s:10:\"normalized\";s:13:\"administrator\";s:10:\"simplified\";s:13:\"administrator\";s:5:\"valid\";b:0;s:13:\"error_message\";s:101:\"Role administrator_name does not exist and role creation is not enabled.\";}}', 1, 0, 1, 1, 1, 1);" +ynh_exec_as $app env PATH=$PATH drush @$app sql-query "INSERT INTO public.ldap_authorization VALUES (1, 'localhost', 'drupal_role', 'ldap_authorization_drupal_role', 1, 1, 0, 'a:2:{i:0;a:6:{s:12:\"user_entered\";s:24:\"utilisateur authentifié\";s:4:\"from\";s:51:\"cn=$app.main,ou=permission,dc=yunohost,dc=org\";s:10:\"normalized\";s:24:\"utilisateur authentifié\";s:10:\"simplified\";s:24:\"utilisateur authentifié\";s:5:\"valid\";b:0;s:13:\"error_message\";s:112:\"Role utilisateur authentifié_name does not exist and role creation is not enabled.\";}i:1;a:6:{s:12:\"user_entered\";s:13:\"administrator\";s:4:\"from\";s:52:\"cn=$app.admin,ou=permission,dc=yunohost,dc=org\";s:10:\"normalized\";s:13:\"administrator\";s:10:\"simplified\";s:13:\"administrator\";s:5:\"valid\";b:0;s:13:\"error_message\";s:101:\"Role administrator_name does not exist and role creation is not enabled.\";}}', 1, 0, 1, 1, 1, 1);" cat ../conf/ldap.conf | ynh_exec_as $app env PATH=$PATH drush @$app variable-set --format=yaml ldap_authentication_conf - @@ -245,7 +169,6 @@ ynh_script_progression --message="Setuping the cron file..." ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/remove b/scripts/remove index 842fd4a..38f107e 100644 --- a/scripts/remove +++ b/scripts/remove @@ -9,44 +9,15 @@ source _common.sh source /usr/share/yunohost/helpers - -#================================================= -# STANDARD REMOVE -#================================================= -# REMOVE DATA DIR -#================================================= - -# Remove the data directory if --purge option is used -if [ "${YNH_APP_PURGE:-0}" -eq 1 ] -then - ynh_script_progression --message="Removing app data directory..." - -fi - #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 +ynh_script_progression --message="Removing system configurations for $app ..." -# Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1 - -# Remove the dedicated PHP-FPM config ynh_remove_fpm_config -#================================================= -# SPECIFIC REMOVE -#================================================= -# REMOVE VARIOUS FILES -#================================================= -ynh_script_progression --message="Removing various files..." - -# Remove a cron file ynh_secure_remove --file="/etc/cron.d/$app" #================================================= diff --git a/scripts/restore b/scripts/restore index 17179a1..09aa400 100644 --- a/scripts/restore +++ b/scripts/restore @@ -36,11 +36,6 @@ chmod 750 "$data_dir" chmod -R o-rwx "$data_dir" chown -R $app:www-data "$data_dir" -#================================================= -# SPECIFIC RESTORATION -#================================================= - - #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= diff --git a/tests.toml b/tests.toml new file mode 100644 index 0000000..b1cf059 --- /dev/null +++ b/tests.toml @@ -0,0 +1,5 @@ +test_format = 1.0 + +[default] + + test_upgrade_from.79cdc1a13.name = "Upgrade from 1.0.3~ynh3" From eab04277d19fd4e8d68f1ccad762aece5095a5df Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 18 Sep 2023 13:21:43 +0000 Subject: [PATCH 14/17] Auto-update README --- README.md | 6 ------ README_fr.md | 6 ------ 2 files changed, 12 deletions(-) diff --git a/README.md b/README.md index 8f52e62..c355128 100644 --- a/README.md +++ b/README.md @@ -21,12 +21,6 @@ See this [article](https://framablog.org/2016/10/05/framaforms-noffrez-plus-les- **Shipped version:** 1.1~ynh1 -## Disclaimers / important information - -## Configuration - -You can modify some configurations using the Framaforms administration panel. You can log in with the admin user and the password you gave during installation. - ## Documentation and resources * Official app website: diff --git a/README_fr.md b/README_fr.md index fbabc87..dc64aff 100644 --- a/README_fr.md +++ b/README_fr.md @@ -21,12 +21,6 @@ See this [article](https://framablog.org/2016/10/05/framaforms-noffrez-plus-les- **Version incluse :** 1.1~ynh1 -## Avertissements / informations importantes - -## Configuration - -You can modify some configurations using the Framaforms administration panel. You can log in with the admin user and the password you gave during installation. - ## Documentations et ressources * Site officiel de l’app : From 8fd28f8611b361ca44282aadf2791b661e148efc Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 18 Sep 2023 15:33:54 +0200 Subject: [PATCH 15/17] Fallback to php 7.4 because the issue on CI seems to related to PHP 8.x .. --- manifest.toml | 4 ++-- scripts/install | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/manifest.toml b/manifest.toml index 4b7f693..55d0b7c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -43,7 +43,7 @@ ram.runtime = "50M" [install.language] ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" - type = "string" + type = "choices" choices = ["de", "en", "es", "fr", "it", "pt"] default = "en" @@ -87,7 +87,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "postgresql, curl, libzip-dev, php8.1-fpm, php8.1-cli, php8.1-gd, php8.1-mysql, php8.1-xml, php8.1-ldap, php8.1-mbstring, php8.1-pgsql" + packages = "postgresql, curl, libzip-dev, php7.4-fpm, php7.4-cli, php7.4-gd, php7.4-mysql, php7.4-xml, php7.4-ldap, php7.4-mbstring, php7.4-pgsql" [resources.database] type = "postgresql" diff --git a/scripts/install b/scripts/install index 3dfc236..b004c4c 100644 --- a/scripts/install +++ b/scripts/install @@ -107,9 +107,6 @@ chown $app:$app "$install_dir/app/sites/default/settings.php" #================================================= ynh_script_progression --message="Installing database..." --weight=19 -chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" - update-alternatives --set php /usr/bin/php$phpversion ynh_exec_as $app env PATH=$PATH drush @$app site-install framaforms_org install_configure_form.site_contact_url="https://forum.yunohost.org/t/framaforms-create-polls-using-drag-and-drop/8208" install_configure_form.site_default_country=FR -y --locale="$language" --account-name="admin" --account-pass="$password" --site-name="Framaforms" --site-mail="$admin_mail" 2>&1 ynh_exec_as $app env PATH=$PATH drush @$app variable-set update_notify_emails "$admin_mail" From 27962603fd5a1f88d76f74750454c468f211f8ac Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 18 Sep 2023 15:37:29 +0200 Subject: [PATCH 16/17] choice->select --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 55d0b7c..7723206 100644 --- a/manifest.toml +++ b/manifest.toml @@ -43,7 +43,7 @@ ram.runtime = "50M" [install.language] ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" - type = "choices" + type = "select" choices = ["de", "en", "es", "fr", "it", "pt"] default = "en" From db8f24f47c8ac4f64db1fa4db4b04a2d68700fd9 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 18 Sep 2023 16:16:27 +0200 Subject: [PATCH 17/17] Set sso integration to false --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 7723206..bb7cb1c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -19,7 +19,7 @@ yunohost = ">= 4.3.0" architectures = "all" multi_instance = true ldap = true -sso = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "ldap" key : the "sso" key corresponds to wether or not a user is *automatically logged-in* on the app when logged-in on the YunoHost portal. +sso = false disk = "500M" ram.build = "50M" ram.runtime = "50M"