From 4d87c727303fb17e9b6c4689b5454c3e52ff5c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sat, 16 Mar 2024 13:58:59 +0100 Subject: [PATCH 01/14] manifestv2 bis --- check_process | 30 ---- conf/app.src | 6 - conf/cron | 2 +- conf/default.settings.php | 2 +- conf/nginx.conf | 2 +- conf/yoursite.aliases.drushrc.php | 2 +- manifest.json | 98 ------------ manifest.toml | 105 +++++++++++++ scripts/_common.sh | 10 +- scripts/backup | 38 +---- scripts/change_url | 99 +----------- scripts/install | 245 +++++++----------------------- scripts/remove | 74 +-------- scripts/restore | 100 ++---------- scripts/upgrade | 181 ++++------------------ tests.toml | 11 ++ 16 files changed, 234 insertions(+), 771 deletions(-) delete mode 100644 check_process delete mode 100644 conf/app.src delete mode 100644 manifest.json create mode 100644 manifest.toml 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/app.src b/conf/app.src deleted file mode 100644 index 9447497..0000000 --- a/conf/app.src +++ /dev/null @@ -1,6 +0,0 @@ -SOURCE_URL=https://framagit.org/yakforms/yakforms/-/archive/1.0.3/yakforms-1.0.3.tar.gz -SOURCE_SUM=f8a8ac8789c36f07f2d1a03d13f9f6d947e499967b79ea626f7f87271a357703 -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=framaforms 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.json b/manifest.json deleted file mode 100644 index f23a51f..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.0.3~ynh3", - "url": "https://framaforms.org", - "upstream": { - "license": "GPL-2.0-only", - "website": "https://framaforms.org", - "code": "https://framagit.org/framasoft/framaforms" - }, - "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" - } - ] - } -} diff --git a/manifest.toml b/manifest.toml new file mode 100644 index 0000000..bbf7513 --- /dev/null +++ b/manifest.toml @@ -0,0 +1,105 @@ +#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/manifest.v2.schema.json + +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.0.3~ynh3" + +maintainers = ["ljf"] + +[upstream] +license = "GPL-2.0-only" +website = "https://framaforms.org" +code = "https://framagit.org/framasoft/framaforms" +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] + type = "domain" + + [install.path] + 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] + type = "user" + + [install.password] + 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.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/_common.sh b/scripts/_common.sh index 9d64b33..fb75318 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,16 +4,18 @@ # COMMON VARIABLES #================================================= -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" - YNH_COMPOSER_VERSION="1.10.17" #================================================= # PERSONAL HELPERS #================================================= +_ynh_exec_with_drush_php() { + ynh_exec_warn_less ynh_exec_as "$app" \ + env PATH="$PATH" DRUSH_PHP="/usr/bin/php$phpversion" \ + "$@" +} + #================================================= # EXPERIMENTAL HELPERS #================================================= diff --git a/scripts/backup b/scripts/backup index 1ebbcaf..967576e 100644 --- a/scripts/backup +++ b/scripts/backup @@ -1,7 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START #================================================= # IMPORT GENERIC HELPERS #================================================= @@ -10,26 +8,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 -ynh_abort_if_errors - -#================================================= -# LOAD SETTINGS -#================================================= -ynh_print_info --message="Loading installation settings..." - -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) - #================================================= # DECLARE DATA AND CONF FILES TO BACKUP #================================================= @@ -39,32 +17,22 @@ 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 +# BACKUP THE SYSTEM CONFIGURATION #================================================= ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP THE PHP-FPM CONFIGURATION -#================================================= - ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -#================================================= -# SPECIFIC BACKUP -#================================================= -# BACKUP VARIOUS FILES -#================================================= - ynh_backup --src_path="/etc/cron.d/$app" #================================================= diff --git a/scripts/change_url b/scripts/change_url index 9ddd691..6d3e8ca 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -1,7 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC STARTING #================================================= # IMPORT GENERIC HELPERS #================================================= @@ -9,112 +7,19 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# RETRIEVE ARGUMENTS -#================================================= - -old_domain=$YNH_APP_OLD_DOMAIN -old_path=$YNH_APP_OLD_PATH - -new_domain=$YNH_APP_NEW_DOMAIN -new_path=$YNH_APP_NEW_PATH - -app=$YNH_APP_INSTANCE_NAME - -#================================================= -# LOAD SETTINGS -#================================================= -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) - -# 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)..." - -# Backup the current version of the app -ynh_backup_before_upgrade -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" - - # Restore it if the upgrade fails - ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# CHECK WHICH PARTS SHOULD BE CHANGED -#================================================= - -change_domain=0 -if [ "$old_domain" != "$new_domain" ] -then - change_domain=1 -fi - -change_path=0 -if [ "$old_path" != "$new_path" ] -then - change_path=1 -fi - -#================================================= -# STANDARD MODIFICATIONS #================================================= # MODIFY URL IN NGINX CONF #================================================= 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 -# 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" - # Set global variables for NGINX helper - domain="$old_domain" - path_url="$new_path" - # Create a dedicated NGINX config - 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 - # Store file checksum for the new config file location - ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" -fi - -#================================================= -# SPECIFIC MODIFICATIONS #================================================= # UPDATE DRUSH ALIAS #================================================= ynh_script_progression --message="Updating Drush alias..." --weight=1 -domain="$new_domain" -path_url="$new_path" - -ynh_add_config --template="../conf/yoursite.aliases.drushrc.php" --destination="$final_path/.drush/$app.aliases.drushrc.php" - -#================================================= -# GENERIC FINALISATION -#================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - -ynh_systemd_action --service_name=nginx --action=reload +ynh_add_config --template="yoursite.aliases.drushrc.php" --destination="$install_dir/.drush/$app.aliases.drushrc.php" #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index 878eb75..eb74733 100644 --- a/scripts/install +++ b/scripts/install @@ -1,7 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START #================================================= # IMPORT GENERIC HELPERS #================================================= @@ -10,265 +8,136 @@ source _common.sh source /usr/share/yunohost/helpers #================================================= -# MANAGE SCRIPT FAILURE +# INITIALIZE AND STORE SETTINGS #================================================= -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors +admin_mail=$(ynh_user_get_info --username="$admin" --key="mail") -#================================================= -# 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 - -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 - -final_path=/var/www/$app -test ! -e "$final_path" || ynh_die --message="This path already contains a folder" - -# Register (book) web path -ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url - -#================================================= -# STORE SETTINGS FROM MANIFEST -#================================================= -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 -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 -ynh_app_setting_set --app=$app --key=expiration --value=$expiration -ynh_app_setting_set --app=$app --key=deletion --value=$deletion - -#================================================= -# STANDARD MODIFICATIONS -#================================================= -# INSTALL DEPENDENCIES -#================================================= -ynh_script_progression --message="Installing dependencies..." --weight=7 - -ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies - -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Configuring system user..." --weight=3 - -# Create a system user -ynh_system_user_create --username=$app --home_dir=$final_path - -#================================================= -# CREATE A POSTGRESQL DATABASE -#================================================= -ynh_script_progression --message="Creating a PostgreSQL database..." --weight=2 - -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 +ynh_app_setting_set --app="$app" --key="password" --value="$password" #================================================= # 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 # 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" +mkdir -p "$install_dir/app/sites/default/files" +mkdir -p "$install_dir/app/sites/default/files/tmp" -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 +chmod -R o-rwx "$install_dir" +chown -R "$app:www-data" "$install_dir" +chmod 2775 "$install_dir/app/sites/default/files" -# Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +chmod -R o-rwx "$data_dir" +chown -R "$app:www-data" "$data_dir" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 - -# Create a dedicated NGINX config -ynh_add_nginx_config - -#================================================= -# SPECIFIC SETUP #================================================= # CREATE DRUSH ALIAS #================================================= 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" +ynh_add_config --template="yoursite.aliases.drushrc.php" --destination="$drush_aliasconfig" chmod 400 "$drush_aliasconfig" -chown $app:$app "$drush_aliasconfig" +chown "$app:$app" "$drush_aliasconfig" #================================================= # INSTALL COMPOSER #================================================= 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="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" - -#================================================= -# 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" - -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" - -#================================================= -# 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 - -mkdir -p $datadir - -chmod 750 "$datadir" -chmod -R o-rwx "$datadir" -chown -R $app:www-data "$datadir" +# export PATH="$install_dir/.composer/vendor/bin:$PATH" #================================================= # ADD A CONFIGURATION #================================================= -ynh_script_progression --message="Adding a configuration file..." --weight=1 +ynh_script_progression --message="Adding $app's configuration file..." --weight=1 -ynh_add_config --template="../conf/default.settings.php" --destination="$final_path/app/sites/default/settings.php" +ynh_add_config --template="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 #================================================= ynh_script_progression --message="Installing database..." --weight=19 -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" -ynh_exec_as $app env PATH=$PATH drush @$app variable-set file_private_path "/home/yunohost.app/$app/data" 2>&1 -ynh_exec_as $app env PATH=$PATH drush @$app pm-enable framaforms_feature -y --resolve-dependencies 2>&1 -ynh_exec_as $app env PATH=$PATH drush @$app php-eval "module_load_include('inc', 'framaforms', 'includes/framaforms.pages');create_all_pages();" 2>&1 || true +_ynh_exec_with_drush_php 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_with_drush_php drush "@$app" variable-set update_notify_emails "$admin_mail" +_ynh_exec_with_drush_php drush "@$app" variable-set file_private_path "/home/yunohost.app/$app/data" 2>&1 +_ynh_exec_with_drush_php drush "@$app" pm-enable framaforms_feature -y --resolve-dependencies 2>&1 +_ynh_exec_with_drush_php drush "@$app" php-eval "module_load_include('inc', 'framaforms', 'includes/framaforms.pages');create_all_pages();" 2>&1 || true #================================================= # IMPORTING LANGUAGE PACK #================================================= ynh_script_progression --message="Importing language pack..." --weight=5 -ynh_exec_as $app env PATH=$PATH drush @$app pm-download -y drush_language 2>&1 -ynh_exec_as $app env PATH=$PATH drush @$app pm-download -y l10n_update 2>&1 -ynh_exec_as $app env PATH=$PATH drush @$app pm-enable -y l10n_update 2>&1 -ynh_exec_as $app env PATH=$PATH drush @$app language-add $language -y 2>&1 -ynh_exec_as $app env PATH=$PATH drush @$app language-default $language -y 2>&1 -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 +_ynh_exec_with_drush_php drush "@$app" pm-download -y drush_language 2>&1 +_ynh_exec_with_drush_php drush "@$app" pm-download -y l10n_update 2>&1 +_ynh_exec_with_drush_php drush "@$app" pm-enable -y l10n_update 2>&1 +_ynh_exec_with_drush_php drush "@$app" language-add "$language" -y 2>&1 +_ynh_exec_with_drush_php drush "@$app" language-default "$language" -y 2>&1 +_ynh_exec_with_drush_php drush "@$app" cache-clear drush -y 2>&1 +_ynh_exec_with_drush_php drush "@$app" l10n-update-refresh -y 2>&1 +_ynh_exec_with_drush_php 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 +# _ynh_exec_with_drush_php drush "@$app" pm-update -y #================================================= # REMOVING BRANDING AND CHANGING DEFAULT SETTINGS #================================================= ynh_script_progression --message="Removing branding and change default settings..." --weight=1 -ynh_exec_as $app env PATH=$PATH drush @$app vset error_level 0 -ynh_exec_as $app env PATH=$PATH drush @$app vset framaforms_notification_period_value $expiration -ynh_exec_as $app env PATH=$PATH drush @$app vset framaforms_deletion_period_value $deletion +_ynh_exec_with_drush_php drush "@$app" vset error_level 0 +_ynh_exec_with_drush_php drush "@$app" vset framaforms_notification_period_value "$expiration" +_ynh_exec_with_drush_php drush "@$app" vset framaforms_deletion_period_value "$deletion" # Remove framaforms footer -ynh_exec_as $app env PATH=$PATH drush @$app sql-query "UPDATE block SET region='-1', status=0 WHERE delta='framaforms_footer' AND region='footer'" +_ynh_exec_with_drush_php drush "@$app" sql-query "UPDATE block SET region='-1', status=0 WHERE delta='framaforms_footer' AND region='footer'" #================================================= # CONFIGURING LDAP #================================================= ynh_script_progression --message="Configuring LDAP authentication..." --weight=1 -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 +_ynh_exec_with_drush_php drush "@$app" pm-download ldap +_ynh_exec_with_drush_php 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_with_drush_php 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_with_drush_php 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);" -cat ../conf/ldap.conf | ynh_exec_as $app env PATH=$PATH drush @$app variable-set --format=yaml ldap_authentication_conf - - -update-alternatives --set php /usr/bin/php${YNH_DEFAULT_PHP_VERSION} +_ynh_exec_with_drush_php drush "@$app" variable-set --format=yaml ldap_authentication_conf - < ../conf/ldap.conf #================================================= -# SETUP THE CRON FILE +# SYSTEM CONFIGURATION #================================================= -ynh_script_progression --message="Setuping the cron file..." +ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 -ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +# Create a dedicated PHP-FPM config +ynh_add_fpm_config --usage=low --footprint=low -#================================================= -# GENERIC FINALIZATION -#================================================= -# SETUP SSOWAT -#================================================= -ynh_script_progression --message="Configuring permissions..." --weight=1 +# Create a dedicated NGINX config +ynh_add_nginx_config -# Make app public if necessary -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" -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 - -#================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - -ynh_systemd_action --service_name=nginx --action=reload +ynh_add_config --template="cron" --destination="/etc/cron.d/$app" #================================================= # END OF SCRIPT diff --git a/scripts/remove b/scripts/remove index 29fdc7b..2b4606e 100644 --- a/scripts/remove +++ b/scripts/remove @@ -1,7 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START #================================================= # IMPORT GENERIC HELPERS #================================================= @@ -10,91 +8,23 @@ source _common.sh source /usr/share/yunohost/helpers #================================================= -# LOAD SETTINGS +# REMOVE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 - -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) - -#================================================= -# STANDARD REMOVE -#================================================= -# REMOVE THE POSTGRESQL DATABASE -#================================================= -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 - -#================================================= -# REMOVE APP MAIN DIR -#================================================= -ynh_script_progression --message="Removing app main directory..." --weight=1 - -# Remove the app directory securely -ynh_secure_remove --file="$final_path" - -#================================================= -# 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..." - ynh_secure_remove --file="$datadir" -fi - -#================================================= -# REMOVE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 +ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 # 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 -#================================================= -# REMOVE DEPENDENCIES -#================================================= -ynh_script_progression --message="Removing dependencies..." --weight=7 - -# Remove metapackage and its dependencies -ynh_remove_app_dependencies - -#================================================= -# SPECIFIC REMOVE #================================================= # REMOVE VARIOUS FILES #================================================= -ynh_script_progression --message="Removing various files..." # Remove a cron file ynh_secure_remove --file="/etc/cron.d/$app" -#================================================= -# GENERIC FINALIZATION -#================================================= -# REMOVE DEDICATED USER -#================================================= -ynh_script_progression --message="Removing the dedicated system user..." --weight=1 - -# Delete a system user -ynh_system_user_delete --username=$app - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index 889e89d..b107310 100644 --- a/scripts/restore +++ b/scripts/restore @@ -1,7 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START #================================================= # IMPORT GENERIC HELPERS #================================================= @@ -10,126 +8,56 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# MANAGE SCRIPT FAILURE -#================================================= - -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading installation settings..." --weight=1 - -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) - -#================================================= -# CHECK IF THE APP CAN BE RESTORED -#================================================= -ynh_script_progression --message="Validating restoration parameters..." --weight=1 - -test ! -d $final_path \ - || ynh_die --message="There is already a directory: $final_path " - -#================================================= -# STANDARD RESTORATION STEPS -#================================================= -# RECREATE THE DEDICATED USER -#================================================= -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" - #================================================= # 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 -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 - -chmod 750 "$datadir" -chmod -R o-rwx "$datadir" -chown -R $app:www-data "$datadir" +chmod -R o-rwx "$data_dir" +chown -R "$app:www-data" "$data_dir" #================================================= -# SPECIFIC RESTORATION +# RESTORE THE POSTGRESQL DATABASE #================================================= -# REINSTALL DEPENDENCIES -#================================================= -ynh_script_progression --message="Reinstalling dependencies..." --weight=1 +ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=1 -# Define and install dependencies -ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies +ynh_psql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" < ./db.sql #================================================= -# RESTORE THE PHP-FPM CONFIGURATION +# RESTORE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=1 +ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 # Restore the file first, so it can have a backup if different 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) - -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 +# ynh_add_fpm_config --usage=low --footprint=low 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 - -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 -ynh_psql_execute_file_as_root --database=$db_name --file="./db.sql" - -#================================================= -# RESTORE VARIOUS FILES -#================================================= -ynh_script_progression --message="Restoring various files..." --weight=1 - ynh_restore_file --origin_path="/etc/cron.d/$app" -#================================================= -# GENERIC FINALIZATION #================================================= # RELOAD NGINX AND PHP-FPM #================================================= ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." --weight=1 -ynh_systemd_action --service_name=php$phpversion-fpm --action=reload +ynh_systemd_action --service_name="php$phpversion-fpm" --action=reload ynh_systemd_action --service_name=nginx --action=reload #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ff89d72..6402455 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,7 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START #================================================= # IMPORT GENERIC HELPERS #================================================= @@ -9,187 +7,68 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# LOAD SETTINGS -#================================================= -ynh_script_progression --message="Loading installation settings..." --weight=2 - -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) - -#================================================= -# CHECK VERSION -#================================================= -ynh_script_progression --message="Checking version..." --weight=1 - -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 - -# Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { - # Restore it if the upgrade fails - ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# STANDARD UPGRADE STEPS #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 - -# Cleaning legacy permissions -if ynh_legacy_permissions_exists; then - ynh_legacy_permissions_delete_all - - ynh_app_setting_delete --app=$app --key=is_public -fi - -if ! ynh_permission_exists --permission="admin"; then - # Create the required permissions - 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 -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 -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 -fi - -#================================================= -# CREATE DEDICATED USER -#================================================= -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 +# ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=9 -if [ "$upgrade_type" == "UPGRADE_APP" ] -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="$install_dir/app" - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path/app" -fi +chmod -R o-rwx "$install_dir" +chown -R "$app:www-data" "$install_dir" -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" - -#================================================= -# UPGRADE DEPENDENCIES -#================================================= -ynh_script_progression --message="Upgrading dependencies..." --weight=5 - -ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies - -#================================================= -# PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 - -# Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low - -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 - -# Create a dedicated NGINX config -ynh_add_nginx_config - -#================================================= -# SPECIFIC UPGRADE -#================================================= -# CREATE DATA DIRECTORY -#================================================= -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" +chmod -R o-rwx "$data_dir" +chown -R "$app:www-data" "$data_dir" #================================================= # UPGRADE COMPOSER #================================================= ynh_script_progression --message="Upgrading Composer..." --weight=3 -ynh_install_composer --phpversion="$phpversion" --workdir="$final_path/.composer" - -export PATH="$final_path/.composer/vendor/bin:$PATH" +ynh_install_composer --phpversion="$phpversion" --workdir="$install_dir/.composer" #================================================= # UPGRADE DRUPAL #================================================= +ynh_script_progression --message="Upgrading Drupal..." --weight=30 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading Drupal..." --weight=30 +ynh_backup_if_checksum_is_different --file="$install_dir/app/sites/default/settings.php" - ynh_backup_if_checksum_is_different --file="$final_path/app/sites/default/settings.php" - - update-alternatives --set php /usr/bin/php$phpversion - - pushd "$final_path" - 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 - popd - - update-alternatives --set php /usr/bin/php${YNH_DEFAULT_PHP_VERSION} -fi +pushd "$install_dir" + _ynh_exec_with_drush_php drush "@$app" variable-set --exact maintenance_mode 1 + _ynh_exec_with_drush_php drush "@$app" cache-clear all + # _ynh_exec_with_drush_php drush "@$app" pm-update -y drupal + # _ynh_exec_with_drush_php drush "@$app" updatedb -y + _ynh_exec_with_drush_php drush "@$app" cache-clear all + _ynh_exec_with_drush_php drush "@$app" variable-set --exact maintenance_mode 0 +popd #================================================= # UPDATE A CONFIG FILE #================================================= 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 +# REAPPLY SYSTEM CONFIGURATIONS #================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 +ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 -ynh_systemd_action --service_name=nginx --action=reload +# Create a dedicated PHP-FPM config +ynh_add_fpm_config --usage=low --footprint=low + +# Create a dedicated NGINX config +ynh_add_nginx_config + +ynh_add_config --template="cron" --destination="/etc/cron.d/$app" #================================================= # END OF SCRIPT diff --git a/tests.toml b/tests.toml new file mode 100644 index 0000000..561f53e --- /dev/null +++ b/tests.toml @@ -0,0 +1,11 @@ +#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/tests.v1.schema.json + +test_format = 1.0 + +[default] + + # ------------ + # Tests to run + # ------------ + + test_upgrade_from.79cdc1a139ff06805647cb56e5eab1d595ee0259.name = "1.0.3~ynh3" From 9df18fc42e78ae56d6e36c45cf30493cf7473ea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sat, 16 Mar 2024 14:16:19 +0100 Subject: [PATCH 02/14] Fix manifest, cleanup --- manifest.toml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/manifest.toml b/manifest.toml index bbf7513..1a1738e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Framaforms" description.en = "Create online webforms and surveys" description.fr = "Créez des formulaires et questionnaires en ligne" -version = "1.0.3~ynh3" +version = "1.0.3~ynh4" maintainers = ["ljf"] @@ -15,15 +15,14 @@ maintainers = ["ljf"] license = "GPL-2.0-only" website = "https://framaforms.org" code = "https://framagit.org/framasoft/framaforms" -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. +fund = "https://soutenir.framasoft.org" [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"] +yunohost = ">= 11.2" +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. -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. +ldap = true +sso = true 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, ... @@ -45,7 +44,7 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen [install.language] ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" - type = "string" + type = "select" choices = ["de", "en", "es", "fr", "it", "pt"] default = "en" @@ -60,7 +59,7 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen 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" + type = "number" default = "0" [install.deletion] @@ -68,7 +67,7 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen 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" + type = "number" default = "0" [resources] @@ -76,6 +75,7 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen url = "https://framagit.org/yakforms/yakforms/-/archive/1.0.3/yakforms-1.0.3.tar.gz" sha256 = "f8a8ac8789c36f07f2d1a03d13f9f6d947e499967b79ea626f7f87271a357703" + autoupdate.strategy = "latest_gitlab_release" [resources.system_user] From 52c1ddf69d380fcede4093aaedd224f90bcbd285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sat, 16 Mar 2024 14:17:25 +0100 Subject: [PATCH 03/14] Fix path to drush --- scripts/install | 2 +- scripts/upgrade | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index eb74733..a8674ca 100644 --- a/scripts/install +++ b/scripts/install @@ -57,7 +57,7 @@ ynh_add_config --template="composer.json" --destination="$install_dir/.composer/ ynh_install_composer --phpversion="$phpversion" --workdir="$install_dir/.composer" -# export PATH="$install_dir/.composer/vendor/bin:$PATH" +export PATH="$install_dir/.composer/vendor/bin:$PATH" #================================================= # ADD A CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 6402455..36f6423 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,6 +33,8 @@ ynh_script_progression --message="Upgrading Composer..." --weight=3 ynh_install_composer --phpversion="$phpversion" --workdir="$install_dir/.composer" +export PATH="$install_dir/.composer/vendor/bin:$PATH" + #================================================= # UPGRADE DRUPAL #================================================= From c788c42bb0ab6d548c709048cb43b9f084197619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sat, 16 Mar 2024 14:25:35 +0100 Subject: [PATCH 04/14] Fix install --- scripts/install | 3 +++ scripts/upgrade | 3 +++ 2 files changed, 6 insertions(+) diff --git a/scripts/install b/scripts/install index a8674ca..e910eb3 100644 --- a/scripts/install +++ b/scripts/install @@ -74,6 +74,9 @@ chown "$app:$app" "$install_dir/app/sites/default/settings.php" #================================================= ynh_script_progression --message="Installing database..." --weight=19 +# Chown from composer/drush install +chown -R "$app:www-data" "$install_dir" + _ynh_exec_with_drush_php 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 \ diff --git a/scripts/upgrade b/scripts/upgrade index 36f6423..a1faeec 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -42,6 +42,9 @@ ynh_script_progression --message="Upgrading Drupal..." --weight=30 ynh_backup_if_checksum_is_different --file="$install_dir/app/sites/default/settings.php" +# Chown from composer/drush install +chown -R "$app:www-data" "$install_dir" + pushd "$install_dir" _ynh_exec_with_drush_php drush "@$app" variable-set --exact maintenance_mode 1 _ynh_exec_with_drush_php drush "@$app" cache-clear all From 5ebf5a748aaf05044206580aa7a43b303cf4e886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sat, 16 Mar 2024 18:16:16 +0100 Subject: [PATCH 05/14] Fix ldap version for pm-download --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index e910eb3..183efae 100644 --- a/scripts/install +++ b/scripts/install @@ -121,7 +121,7 @@ _ynh_exec_with_drush_php drush "@$app" sql-query "UPDATE block SET region='-1', #================================================= ynh_script_progression --message="Configuring LDAP authentication..." --weight=1 -_ynh_exec_with_drush_php drush "@$app" pm-download ldap +_ynh_exec_with_drush_php drush "@$app" pm-download ldap-7.x-2.6 _ynh_exec_with_drush_php 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_with_drush_php 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);" From 160630ba59542d4fd93f455c5394d50253fd1334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sat, 16 Mar 2024 18:28:17 +0100 Subject: [PATCH 06/14] Fix doc --- doc/{DISCLAIMER.md => ADMIN.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename doc/{DISCLAIMER.md => ADMIN.md} (100%) diff --git a/doc/DISCLAIMER.md b/doc/ADMIN.md similarity index 100% rename from doc/DISCLAIMER.md rename to doc/ADMIN.md From 2db89cbfacfd2d115191790224e4b1e310131383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 18 Mar 2024 12:58:23 +0100 Subject: [PATCH 07/14] Change test_upgrade_from sha --- tests.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.toml b/tests.toml index 561f53e..8c6be23 100644 --- a/tests.toml +++ b/tests.toml @@ -8,4 +8,4 @@ test_format = 1.0 # Tests to run # ------------ - test_upgrade_from.79cdc1a139ff06805647cb56e5eab1d595ee0259.name = "1.0.3~ynh3" + test_upgrade_from.cb1ccdf04ff50b14826a96da2930570bd482f233.name = "1.0.3~ynh3" From 6cb2b2b8f32d0e69d18453c23cf18de74831d416 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 18 Mar 2024 12:10:20 +0000 Subject: [PATCH 08/14] Auto-update README --- README.md | 8 +------- README_fr.md | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index b5da146..a5f2916 100644 --- a/README.md +++ b/README.md @@ -19,13 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in 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. -**Shipped version:** 1.0.3~ynh3 -## 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. - +**Shipped version:** 1.0.3~ynh4 ## Documentation and resources - Official app website: diff --git a/README_fr.md b/README_fr.md index 253f781..1b78e37 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,13 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po 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. -**Version incluse :** 1.0.3~ynh3 -## 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. - +**Version incluse :** 1.0.3~ynh4 ## Documentations et ressources - Site officiel de l’app : From 7880ce3c8fda4520eee24d89418cd3b7a278e4ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 18 Mar 2024 13:23:11 +0100 Subject: [PATCH 09/14] Fix php-fpm restoration --- scripts/restore | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/restore b/scripts/restore index b107310..70171b0 100644 --- a/scripts/restore +++ b/scripts/restore @@ -44,9 +44,7 @@ ynh_script_progression --message="Restoring system configurations related to $ap # Restore the file first, so it can have a backup if different 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 +ynh_add_fpm_config --usage=low --footprint=low ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" From fbd530bc84906828f2166dde2395679465ad1a29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 18 Mar 2024 13:37:54 +0100 Subject: [PATCH 10/14] Fix numbers in manifest.toml install args --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 1a1738e..05f75e3 100644 --- a/manifest.toml +++ b/manifest.toml @@ -60,7 +60,7 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen help.en = "Set 0 to disable expiration" help.fr = "Mettre 0 pour désactiver l'expiration" type = "number" - default = "0" + default = 0 [install.deletion] ask.en = "After how many weeks is the forms deleted?" @@ -68,7 +68,7 @@ ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requiremen help.en = "Set 0 to disable deletion" help.fr = "Mettre 0 pour désactiver la suppression" type = "number" - default = "0" + default = 0 [resources] [resources.sources.main] From 5d8cab2b8e220a40699413cc5eff5c8404eeff9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 18 Mar 2024 13:44:22 +0100 Subject: [PATCH 11/14] Split sql strings to a config file for ldap --- conf/ldap.sql | 13 +++++++++++++ scripts/install | 4 +--- 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 conf/ldap.sql diff --git a/conf/ldap.sql b/conf/ldap.sql new file mode 100644 index 0000000..5e51625 --- /dev/null +++ b/conf/ldap.sql @@ -0,0 +1,13 @@ +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 +); + + +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 +); diff --git a/scripts/install b/scripts/install index 183efae..f1fa499 100644 --- a/scripts/install +++ b/scripts/install @@ -124,9 +124,7 @@ ynh_script_progression --message="Configuring LDAP authentication..." --weight=1 _ynh_exec_with_drush_php drush "@$app" pm-download ldap-7.x-2.6 _ynh_exec_with_drush_php 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_with_drush_php 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_with_drush_php 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_with_drush_php drush "@$app" sql-query < ../conf/ldap.sql _ynh_exec_with_drush_php drush "@$app" variable-set --format=yaml ldap_authentication_conf - < ../conf/ldap.conf #================================================= From 1050bb09decf55e0eb3c6a08fd2b04536fd2c267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 18 Mar 2024 15:06:37 +0100 Subject: [PATCH 12/14] Remove fixmes from manifest --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 05f75e3..24135a6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -23,9 +23,9 @@ architectures = "all" multi_instance = true ldap = true sso = true -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, ... +disk = "500M" +ram.build = "500M" +ram.runtime = "50M" [install] [install.domain] From 530ca1d6cc770fe49d562cb37b77d0b210b1cc54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 18 Mar 2024 15:06:56 +0100 Subject: [PATCH 13/14] Prevent exports in scirpts --- scripts/_common.sh | 3 ++- scripts/install | 2 -- scripts/upgrade | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index fb75318..912324a 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -12,7 +12,8 @@ YNH_COMPOSER_VERSION="1.10.17" _ynh_exec_with_drush_php() { ynh_exec_warn_less ynh_exec_as "$app" \ - env PATH="$PATH" DRUSH_PHP="/usr/bin/php$phpversion" \ + env PATH="$install_dir/.composer/vendor/bin:$PATH" \ + DRUSH_PHP="/usr/bin/php$phpversion" \ "$@" } diff --git a/scripts/install b/scripts/install index f1fa499..c17edcc 100644 --- a/scripts/install +++ b/scripts/install @@ -57,8 +57,6 @@ ynh_add_config --template="composer.json" --destination="$install_dir/.composer/ ynh_install_composer --phpversion="$phpversion" --workdir="$install_dir/.composer" -export PATH="$install_dir/.composer/vendor/bin:$PATH" - #================================================= # ADD A CONFIGURATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index a1faeec..7e8df4d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,8 +33,6 @@ ynh_script_progression --message="Upgrading Composer..." --weight=3 ynh_install_composer --phpversion="$phpversion" --workdir="$install_dir/.composer" -export PATH="$install_dir/.composer/vendor/bin:$PATH" - #================================================= # UPGRADE DRUPAL #================================================= From 200433fb7338c66d9a1e6e20c85b156b413aef35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 18 Mar 2024 15:44:04 +0100 Subject: [PATCH 14/14] Disabling subpath installation in manifest --- manifest.toml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 24135a6..a66695a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -31,9 +31,10 @@ ram.runtime = "50M" [install.domain] type = "domain" - [install.path] - type = "path" - default = "/poll" + # Framaform doesn't seem to be installable on a subdir, disabling it for now. + # [install.path] + # 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."