From e1e50883c878f13c4248585005c7d23fccc11a3d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 28 Sep 2020 10:46:03 +0200 Subject: [PATCH 01/10] Update check_process --- check_process | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/check_process b/check_process index 6011bf1..bca3ff8 100644 --- a/check_process +++ b/check_process @@ -4,8 +4,12 @@ ; Manifest domain="domain.tld" (DOMAIN) path="/path" (PATH) + admin="john" (USER) + language="fr" is_public=1 (PUBLIC|public=1|private=0) password="password" + expiration="0" + deletion="0" ; Checks pkg_linter=1 setup_sub_dir=1 @@ -23,6 +27,7 @@ ;;; Levels # If the level 5 (Package linter) is forced to 1. Please add justifications here. Level 5=auto -;;; Options -Email=ljf+framaforms_ynh@reflexlibre.net -Notification=down +;;; Upgrade options + ; commit=CommitHash + name=Name and date of the commit. + manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&expiration=0&deletion=0& From 7d25fcc03f82cffd3ee428a23f3211f16876c358 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 1 Oct 2020 22:21:56 +0200 Subject: [PATCH 02/10] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index b238e9c..be316d8 100644 --- a/README.md +++ b/README.md @@ -57,8 +57,7 @@ Can the app be used by multiple users? **Yes** --- -Developer info ----------------- +## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/framaforms_ynh/tree/testing). From 83170563a423c61e4cb988f10c0e2caed2188e0c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 1 Oct 2020 22:37:20 +0200 Subject: [PATCH 03/10] fux --- scripts/change_url | 4 ++-- scripts/install | 2 +- scripts/remove | 4 ++-- scripts/restore | 7 ++++--- scripts/upgrade | 6 +++--- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index abfa21e..142eafd 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -69,7 +69,7 @@ fi #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating nginx web server configuration..." --weight=1 +ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf @@ -115,7 +115,7 @@ ynh_replace_string --match_string="__PATH_URL__" --replace_string="$new_path" -- #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/install b/scripts/install index 4567358..4c2a5b6 100644 --- a/scripts/install +++ b/scripts/install @@ -281,7 +281,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/remove b/scripts/remove index a30b0ae..1c72a9e 100644 --- a/scripts/remove +++ b/scripts/remove @@ -58,7 +58,7 @@ ynh_secure_remove --file="/home/yunohost.app/$app" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing nginx web server configuration..." --weight=1 +ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 # Remove the dedicated nginx config ynh_remove_nginx_config @@ -66,7 +66,7 @@ ynh_remove_nginx_config #================================================= # REMOVE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Removing php-fpm configuration..." --weight=1 +ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=1 # Remove the dedicated php-fpm config ynh_remove_fpm_config diff --git a/scripts/restore b/scripts/restore index 612b2a2..83b74f2 100644 --- a/scripts/restore +++ b/scripts/restore @@ -49,7 +49,7 @@ test ! -d $final_path \ #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the nginx configuration..." --weight=1 +ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" @@ -75,7 +75,8 @@ ynh_script_progression --message="Restoring user rights..." --weight=1 # Restore permissions on app files chown -R root: $final_path -chmod 2775 "$final_path/sites/default/files" +mkdir -p "$final_path/app/sites/default/files" +chmod 2775 "$final_path/app/sites/default/files" mkdir -p "/home/yunohost.app/$app/data" chown -R $app: "/home/yunohost.app/$app/data" @@ -116,7 +117,7 @@ ynh_psql_execute_file_as_root --file="./db.sql" --database="$db_name" #================================================= # RELOAD NGINX AND PHP-FPM #================================================= -ynh_script_progression --message="Reloading nginx web server and php-fpm..." --weight=1 +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=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index d649c97..ccca468 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -112,9 +112,9 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading php-fpm configuration..." --weight=1 +ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 -# Create a dedicated php-fpm config +# Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies" #================================================= @@ -195,7 +195,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload From 2dad7c7a9a222eb97d0af923a9c1a57427a96bfd Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 1 Oct 2020 22:57:11 +0200 Subject: [PATCH 04/10] typos --- README.md | 15 ++++++++------- issue_template.md | 6 +++--- manifest.json | 9 +++++---- scripts/change_url | 2 +- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index be316d8..05f29f5 100644 --- a/README.md +++ b/README.md @@ -7,14 +7,14 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* ## Overview -Framaforms helps you create online webforms and surveys. +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 https://framablog.org/2016/10/05/framaforms-noffrez-plus-les-reponses-que-vous-collectez-a-google/ (in French ) and https://framablog.org/2016/10/05/en-savoir-un-peu-plus-sur-le-projet-framaforms/ (in French) for further informations. -**Shipped version:** 1.0.0+190618 +**Shipped version:** 1.0.1 -## Screenshots +## Screenshot -![Animation that present how to build a form with Framaforms](https://framaforms.org/sites/default/files/imgforms/anim_creation.gif) +![Animation that present how to build a form with Framaforms](https://framaforms.org/profiles/framaforms_org/files/imgforms/anim_creation.gif) ## Demo @@ -22,18 +22,19 @@ See https://framablog.org/2016/10/05/framaforms-noffrez-plus-les-reponses-que-vo ## Configuration -You can change some configuration by using the administration panel of drupal. You can connect with admin user and the password you give at installation. +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 * Official documentation: https://docs.framasoft.org/fr/framaforms/ + * YunoHost documentation: https://yunohost.org/#/app_framaforms ## YunoHost specific features #### Multi-user support -Are LDAP and HTTP auth supported? **No** -Can the app be used by multiple users? **Yes** +* Are LDAP and HTTP auth supported? **No** +* Can the app be used by multiple users? **Yes** #### Supported architectures diff --git a/issue_template.md b/issue_template.md index 9bbf5b6..4bc1631 100644 --- a/issue_template.md +++ b/issue_template.md @@ -7,7 +7,7 @@ about: Create a report to help us debug, it would be nice to fill the template a **How to post a meaningful bug report** 1. *Read this whole template first.* 2. *Determine if you are on the right place:* - - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change url...), you are on the right place!* + - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* - *Otherwise, the issue may be due to framaforms itself. Refer to its documentation or repository for help.* - *If you have a doubt, post here, we will figure it out together.* 3. *Delete the italic comments as you write over them below, and remove this guide.* @@ -34,8 +34,8 @@ about: Create a report to help us debug, it would be nice to fill the template a - *If you used the webadmin, please perform the equivalent command from the CLI first.* - *If the error occurs in your browser, explain what you did:* 1. *Go to '...'* - 2. *Click on '....'* - 3. *Scroll down to '....'* + 2. *Click on '...'* + 3. *Scroll down to '...'* 4. *See error* **Expected behavior** diff --git a/manifest.json b/manifest.json index 43d6c41..3664014 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Create online webforms and surveys", "fr": "Créez des formulaires et questionnaires en ligne" }, - "version": "1.0.1+200715~ynh2", + "version": "1.0.1~ynh1", "url": "https://framagit.org/framasoft/framaforms", "license": "GPL-2.0-only", "requirements": { @@ -27,11 +27,12 @@ "install": [ { "name": "domain", + "type": "domain", "ask": { - "en": "Choose a domain for Framaforms" + "en": "Choose a domain for Framaforms", + "fr": "Choisissez un nom de domaine pour Framaforms" }, - "example": "domain.org", - "type": "domain" + "example": "domain.org" }, { "name": "path", diff --git a/scripts/change_url b/scripts/change_url index 142eafd..d1d91c8 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -34,7 +34,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_print_info --message="Backing up the app before changing its url (may take a while)..." +ynh_print_info --message="Backing up the app before changing its URL (may take a while)..." # Backup the current version of the app ynh_backup_before_upgrade From ec431490e3bdd7e70ecbc0c0d3d1acbe95710663 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 1 Oct 2020 23:03:05 +0200 Subject: [PATCH 05/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 05f29f5..d9fe2ef 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview 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 https://framablog.org/2016/10/05/framaforms-noffrez-plus-les-reponses-que-vous-collectez-a-google/ (in French ) and https://framablog.org/2016/10/05/en-savoir-un-peu-plus-sur-le-projet-framaforms/ (in French) for further informations. +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.1 From 9c53fdd6328ed5a38591613c2bd2f5d388b36fb3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 2 Oct 2020 08:29:37 +0200 Subject: [PATCH 06/10] Update check_process --- check_process | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/check_process b/check_process index bca3ff8..56cabe2 100644 --- a/check_process +++ b/check_process @@ -27,7 +27,5 @@ ;;; Levels # If the level 5 (Package linter) is forced to 1. Please add justifications here. Level 5=auto -;;; Upgrade options - ; commit=CommitHash - name=Name and date of the commit. - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&expiration=0&deletion=0& +;;; Options + Email=ljf+framaforms_ynh@reflexlibre.net \ No newline at end of file From 6698845f8856d5a77d9cc041b7c35488715279df Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 2 Oct 2020 08:31:08 +0200 Subject: [PATCH 07/10] Update check_process --- check_process | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/check_process b/check_process index 56cabe2..71c656d 100644 --- a/check_process +++ b/check_process @@ -28,4 +28,5 @@ # If the level 5 (Package linter) is forced to 1. Please add justifications here. Level 5=auto ;;; Options - Email=ljf+framaforms_ynh@reflexlibre.net \ No newline at end of file +Email=ljf+framaforms_ynh@reflexlibre.net +Notification=down \ No newline at end of file From 915437fc4961831bf9d7409ff673aaf0903cab7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 3 Oct 2020 18:51:41 +0200 Subject: [PATCH 08/10] Update manifest.json Co-authored-by: yalh76 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 3664014..9c4126a 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Create online webforms and surveys", "fr": "Créez des formulaires et questionnaires en ligne" }, - "version": "1.0.1~ynh1", + "version": "1.0.1+200715~ynh3", "url": "https://framagit.org/framasoft/framaforms", "license": "GPL-2.0-only", "requirements": { From 32355c0f74713195090cd1b9b55aa621aae69c89 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Oct 2020 19:05:08 +0200 Subject: [PATCH 09/10] Fix typos --- scripts/install | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 4c2a5b6..a858d4c 100644 --- a/scripts/install +++ b/scripts/install @@ -92,9 +92,9 @@ ynh_setup_source --dest_dir="$final_path/app" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring nginx web server..." --weight=1 +ynh_script_progression --message="Configuring NGINX web server..." --weight=1 -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config #================================================= @@ -108,9 +108,9 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring php-fpm..." --weight=1 +ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 -# Create a dedicated php-fpm config +# Create a dedicated PHP-FPM config ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies" phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) From e2bc4d55f3300cdbeb9a6c9d5979a84f839fca64 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Oct 2020 20:49:40 +0200 Subject: [PATCH 10/10] Update restore --- scripts/restore | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 83b74f2..8032bda 100644 --- a/scripts/restore +++ b/scripts/restore @@ -75,7 +75,6 @@ ynh_script_progression --message="Restoring user rights..." --weight=1 # Restore permissions on app files chown -R root: $final_path -mkdir -p "$final_path/app/sites/default/files" chmod 2775 "$final_path/app/sites/default/files" mkdir -p "/home/yunohost.app/$app/data"