YunoHost-Apps/framaforms_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/framaforms_ynh.git synced 2024-09-03 18:36:12 +02:00
Code Issues Activity Actions

Merge pull request #72 from YunoHost-Apps/ci-auto-update-1.1

Browse source 
Upgrade to v1.1
This commit is contained in:
Salamandar 2024-07-14 17:20:27 +02:00 committed by GitHub
commit 2b26a97248
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 116 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
README.md
View file

@ -3,27 +3,27 @@ N.B.: This README was automatically generated by <https://github.com/YunoHost/ap
It shall NOT be edited by hand.
-->
# Framaforms for YunoHost
# Yakforms for YunoHost
[![Integration level](https://dash.yunohost.org/integration/framaforms.svg)](https://ci-apps.yunohost.org/ci/apps/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)
[![Install Yakforms with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=framaforms)
*[Read this README in other languages.](./ALL_README.md)*
> *This package allows you to install Framaforms quickly and simply on a YunoHost server.*
> *This package allows you to install Yakforms quickly and simply on a YunoHost server.*
> *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.*
## 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.
Yakforms 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~ynh4
**Shipped version:** 1.1~ynh1
## Documentation and resources
- Official app website: <https://framaforms.org>
- Official app website: <https://yakforms.org>
- Upstream app code repository: <https://framagit.org/yakforms/yakforms>
- YunoHost Store: <https://apps.yunohost.org/app/framaforms>
- Report a bug: <https://github.com/YunoHost-Apps/framaforms_ynh/issues>

12
README_es.md
View file

@ -3,27 +3,27 @@ Este archivo README esta generado automaticamente<https://github.com/YunoHost/ap
No se debe editar a mano.
-->
# Framaforms para Yunohost
# Yakforms para Yunohost
[![Nivel de integración](https://dash.yunohost.org/integration/framaforms.svg)](https://ci-apps.yunohost.org/ci/apps/framaforms/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/framaforms.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/framaforms.maintain.svg)
[![Instalar Framaforms con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=framaforms)
[![Instalar Yakforms con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=framaforms)
*[Leer este README en otros idiomas.](./ALL_README.md)*
> *Este paquete le permite instalarFramaforms rapidamente y simplement en un servidor YunoHost.*
> *Este paquete le permite instalarYakforms rapidamente y simplement en un servidor YunoHost.*
> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.*
## Descripción general
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.
Yakforms 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.
**Versión actual:** 1.0.3~ynh4
**Versión actual:** 1.1~ynh1
## Documentaciones y recursos
- Sitio web oficial: <https://framaforms.org>
- Sitio web oficial: <https://yakforms.org>
- Repositorio del código fuente oficial de la aplicación : <https://framagit.org/yakforms/yakforms>
- Catálogo YunoHost: <https://apps.yunohost.org/app/framaforms>
- Reportar un error: <https://github.com/YunoHost-Apps/framaforms_ynh/issues>

12
README_eu.md
View file

@ -3,27 +3,27 @@ Ohart ongi: README hau automatikoki sortu da <https://github.com/YunoHost/apps/t
EZ editatu eskuz.
-->
# Framaforms YunoHost-erako
# Yakforms YunoHost-erako
[![Integrazio maila](https://dash.yunohost.org/integration/framaforms.svg)](https://ci-apps.yunohost.org/ci/apps/framaforms/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/framaforms.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/framaforms.maintain.svg)
[![Instalatu Framaforms YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=framaforms)
[![Instalatu Yakforms YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=framaforms)
*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)*
> *Pakete honek Framaforms YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*
> *Pakete honek Yakforms YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*
> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.*
## Aurreikuspena
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.
Yakforms 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.
**Paketatutako bertsioa:** 1.0.3~ynh4
**Paketatutako bertsioa:** 1.1~ynh1
## Dokumentazioa eta baliabideak
- Aplikazioaren webgune ofiziala: <https://framaforms.org>
- Aplikazioaren webgune ofiziala: <https://yakforms.org>
- Jatorrizko aplikazioaren kode-gordailua: <https://framagit.org/yakforms/yakforms>
- YunoHost Denda: <https://apps.yunohost.org/app/framaforms>
- Eman errore baten berri: <https://github.com/YunoHost-Apps/framaforms_ynh/issues>

12
README_fr.md
View file

@ -3,27 +3,27 @@ Nota bene : ce README est automatiquement généré par <https://github.com/Yu
Il NE doit PAS être modifié à la main.
-->
# Framaforms pour YunoHost
# Yakforms pour YunoHost
[![Niveau d’intégration](https://dash.yunohost.org/integration/framaforms.svg)](https://ci-apps.yunohost.org/ci/apps/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)
[![Installer Yakforms avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=framaforms)
*[Lire le README dans d'autres langues.](./ALL_README.md)*
> *Ce package vous permet d’installer Framaforms rapidement et simplement sur un serveur YunoHost.*
> *Ce package vous permet d’installer Yakforms rapidement et simplement sur un serveur YunoHost.*
> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.*
## 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.
Yakforms 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~ynh4
**Version incluse :** 1.1~ynh1
## Documentations et ressources
- Site officiel de l’app : <https://framaforms.org>
- Site officiel de l’app : <https://yakforms.org>
- Dépôt de code officiel de l’app : <https://framagit.org/yakforms/yakforms>
- YunoHost Store : <https://apps.yunohost.org/app/framaforms>
- Signaler un bug : <https://github.com/YunoHost-Apps/framaforms_ynh/issues>

12
README_gl.md
View file

@ -3,27 +3,27 @@ NOTA: Este README foi creado automáticamente por <https://github.com/YunoHost/a
NON debe editarse manualmente.
-->
# Framaforms para YunoHost
# Yakforms para YunoHost
[![Nivel de integración](https://dash.yunohost.org/integration/framaforms.svg)](https://ci-apps.yunohost.org/ci/apps/framaforms/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/framaforms.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/framaforms.maintain.svg)
[![Instalar Framaforms con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=framaforms)
[![Instalar Yakforms con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=framaforms)
*[Le este README en outros idiomas.](./ALL_README.md)*
> *Este paquete permíteche instalar Framaforms de xeito rápido e doado nun servidor YunoHost.*
> *Este paquete permíteche instalar Yakforms de xeito rápido e doado nun servidor YunoHost.*
> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.*
## Vista xeral
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.
Yakforms 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.
**Versión proporcionada:** 1.0.3~ynh4
**Versión proporcionada:** 1.1~ynh1
## Documentación e recursos
- Web oficial da app: <https://framaforms.org>
- Web oficial da app: <https://yakforms.org>
- Repositorio de orixe do código: <https://framagit.org/yakforms/yakforms>
- Tenda YunoHost: <https://apps.yunohost.org/app/framaforms>
- Informar dun problema: <https://github.com/YunoHost-Apps/framaforms_ynh/issues>

12
README_zh_Hans.md
View file

@ -3,27 +3,27 @@
请勿手动编辑。
-->
# YunoHost 上的 Framaforms
# YunoHost 上的 Yakforms
[![集成程度](https://dash.yunohost.org/integration/framaforms.svg)](https://ci-apps.yunohost.org/ci/apps/framaforms/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/framaforms.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/framaforms.maintain.svg)
[![使用 YunoHost 安装 Framaforms](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=framaforms)
[![使用 YunoHost 安装 Yakforms](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=framaforms)
*[阅读此 README 的其它语言版本。](./ALL_README.md)*
> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Framaforms。*
> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Yakforms。*
> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。*
## 概况
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.
Yakforms 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.
**分发版本：** 1.0.3~ynh4
**分发版本：** 1.1~ynh1
## 文档与资源
- 官方应用网站： <https://framaforms.org>
- 官方应用网站： <https://yakforms.org>
- 上游应用代码库： <https://framagit.org/yakforms/yakforms>
- YunoHost 商店： <https://apps.yunohost.org/app/framaforms>
- 报告 bug： <https://github.com/YunoHost-Apps/framaforms_ynh/issues>

0
conf/extra_php-fpm.conf Normal file
View file

2
doc/ADMIN.md
View file

@ -1,3 +1,3 @@
## 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.
You can modify some configurations using the Yakforms administration panel. You can log in with the admin user and the password you gave during installation.

2
doc/DESCRIPTION.md
View file

@ -1,2 +1,2 @@
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.
Yakforms 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.

36
manifest.toml
View file

@ -3,17 +3,17 @@
packaging_format = 2
id = "framaforms"
name = "Framaforms"
name = "Yakforms"
description.en = "Create online webforms and surveys"
description.fr = "Créez des formulaires et questionnaires en ligne"
version = "1.0.3~ynh4"
version = "1.1~ynh1"
maintainers = []
[upstream]
license = "GPL-2.0-only"
website = "https://framaforms.org"
website = "https://yakforms.org"
code = "https://framagit.org/yakforms/yakforms"
fund = "https://soutenir.framasoft.org"
@ -31,7 +31,7 @@ ram.runtime = "50M"
[install.domain]
type = "domain"
# Framaform doesn't seem to be installable on a subdir, disabling it for now.
# Yakforms doesn't seem to be installable on a subdir, disabling it for now.
# [install.path]
# type = "path"
# default = "/poll"
@ -73,11 +73,19 @@ ram.runtime = "50M"
[resources]
[resources.sources.main]
url = "https://framagit.org/yakforms/yakforms/-/archive/1.0.3/yakforms-1.0.3.tar.gz"
sha256 = "f8a8ac8789c36f07f2d1a03d13f9f6d947e499967b79ea626f7f87271a357703"
url = "https://framagit.org/yakforms/yakforms/-/archive/v1.1/yakforms-v1.1.tar.gz"
sha256 = "da30fbd9821f84f21f06b7604232f0dc9b6b6a39738bb5326ee875f173300045"
autoupdate.strategy = "latest_gitlab_release"
[resources.sources.migration_script]
url = "https://framagit.org/yakforms/yakforms/-/raw/v1.1/framaforms2yakforms.php"
sha256 = "58a2e7378461dc5db70f59d69d37c0d6bd34eed224872151db5a794fdf33d07a"
format = "whatever"
extract = false
rename = "framaforms2yakforms.php"
prefetch = false
[resources.system_user]
[resources.install_dir]
@ -92,14 +100,14 @@ ram.runtime = "50M"
"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",
"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]

27
scripts/install
View file

@ -68,21 +68,22 @@ chmod 600 "$install_dir/app/sites/default/settings.php"
chown "$app:$app" "$install_dir/app/sites/default/settings.php"
#=================================================
# INSTALLING FRAMAFORMS WITH DRUSH
# INSTALLING YAKFORMS WITH DRUSH
#=================================================
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" \
_ynh_exec_with_drush_php drush "@$app" site-install yakforms_profile \
install_configure_form.site_contact_url="https://apps.yunohost.org/app/framaforms" \
install_configure_form.site_default_country=FR \
-y --locale="$language" --account-name="admin" --account-pass="$password" --site-name="Framaforms" --site-mail="$admin_mail"
-y --locale="$language" --account-name="admin" --account-pass="$password" --site-name="Yakforms" --site-mail="$admin_mail"
_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"
_ynh_exec_with_drush_php drush "@$app" pm-enable framaforms_feature -y --resolve-dependencies
_ynh_exec_with_drush_php drush "@$app" php-eval "module_load_include('inc', 'framaforms', 'includes/framaforms.pages');create_all_pages();" || true
_ynh_exec_with_drush_php drush "@$app" variable-set file_private_path "$data_dir/data"
_ynh_exec_with_drush_php drush "@$app" pm-enable yakforms_feature -y --resolve-dependencies
_ynh_exec_with_drush_php drush "@$app" pm-enable yakforms -y --resolve-dependencies
_ynh_exec_with_drush_php drush "@$app" php-eval "module_load_include('inc', 'yakforms', 'includes/yakforms.pages');create_all_pages();" || true
#=================================================
# IMPORTING LANGUAGE PACK
@ -98,9 +99,9 @@ _ynh_exec_with_drush_php drush "@$app" cache-clear drush -y
_ynh_exec_with_drush_php drush "@$app" l10n-update-refresh -y
_ynh_exec_with_drush_php drush "@$app" l10n-update -y
# We don't upgrade module to avoid to erase framaforms change
# We don't upgrade module to avoid to erase Yakforms change
# in drupal core and modules code
# see https://framagit.org/framasoft/framaforms/-/wikis/modifications
# see https://framagit.org/yakforms/yakforms/-/wikis/modifications
# _ynh_exec_with_drush_php drush "@$app" pm-update -y
#=================================================
@ -109,10 +110,10 @@ _ynh_exec_with_drush_php drush "@$app" l10n-update -y
ynh_script_progression --message="Removing branding and change default settings..." --weight=1
_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_with_drush_php 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" vset yakforms_notification_period_value "$expiration"
_ynh_exec_with_drush_php drush "@$app" vset yakforms_deletion_period_value "$deletion"
# Remove yakforms footer
_ynh_exec_with_drush_php drush "@$app" sql-query "UPDATE block SET region='-1', status=0 WHERE delta='yakforms_footer' AND region='footer'"
#=================================================
# CONFIGURING LDAP

44
scripts/upgrade
View file

@ -10,7 +10,32 @@ source /usr/share/yunohost/helpers
#=================================================
# ENSURE DOWNWARD COMPATIBILITY
#=================================================
# ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
#=================================================
# Framaforms 2 Yakforms Backup
#=================================================
if ynh_compare_current_package_version --comparison lt --version 1.1~ynh1; then
upgrade_to_yakforms=true
else
upgrade_to_yakforms=false
fi
if [ "$upgrade_to_yakforms" = true ]; then
pushd "$install_dir/app"
ynh_setup_source --source_id="migration_script" --dest_dir="$install_dir/app"
ynh_exec_as "$app" env "PATH=$PATH" "php$phpversion" framaforms2yakforms.php backup
_ynh_exec_with_drush_php drush "@$app" dis framaforms
_ynh_exec_with_drush_php drush "@$app" pm-uninstall framaforms
_ynh_exec_with_drush_php drush "@$app" dis framaforms_share_results
_ynh_exec_with_drush_php drush "@$app" pm-uninstall framaforms_share_results
_ynh_exec_with_drush_php drush "@$app" dis framaforms_public_results
_ynh_exec_with_drush_php drush "@$app" pm-uninstall framaforms_public_results
_ynh_exec_with_drush_php drush "@$app" dis framaforms_spam
_ynh_exec_with_drush_php drush "@$app" pm-uninstall framaforms_spam
popd
fi
#=================================================
# DOWNLOAD, CHECK AND UNPACK SOURCE
@ -33,6 +58,21 @@ ynh_script_progression --message="Upgrading Composer..." --weight=3
ynh_install_composer --phpversion="$phpversion" --workdir="$install_dir/.composer"
#=================================================
# Framaforms 2 Yakforms Restore
#=================================================
if [ "$upgrade_to_yakforms" = true ]; then
pushd "$install_dir/app"
_ynh_exec_with_drush_php drush "@$app" en yakforms
_ynh_exec_with_drush_php drush "@$app" dis yakforms_share_results
_ynh_exec_with_drush_php drush "@$app" dis yakforms_public_results
_ynh_exec_with_drush_php drush "@$app" dis yakforms_spam
ynh_exec_as "$app" env "PATH=$PATH" "php$phpversion" framaforms2yakforms.php restore
ynh_exec_as "$app" env "PATH=$PATH" "php$phpversion" framaforms2yakforms.php clean
popd
fi
#=================================================
# UPGRADE DRUPAL
#=================================================
@ -43,7 +83,7 @@ ynh_backup_if_checksum_is_different --file="$install_dir/app/sites/default/setti
# Chown from composer/drush install
chown -R "$app:www-data" "$install_dir"
pushd "$install_dir"
pushd "$install_dir/app"
_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