1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/yeswiki_ynh.git synced 2024-09-03 18:05:56 +02:00

Merge pull request #100 from YunoHost-Apps/testing

v4.4.4~ynh9
This commit is contained in:
Florian 2024-06-27 14:03:59 +02:00 committed by GitHub
commit 7b5a73f1ff
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 28 additions and 26 deletions

View file

@ -5,7 +5,7 @@ It shall NOT be edited by hand.
# YesWiki for YunoHost # YesWiki for YunoHost
[![Integration level](https://dash.yunohost.org/integration/yeswiki.svg)](https://dash.yunohost.org/appci/app/yeswiki) ![Working status](https://ci-apps.yunohost.org/ci/badges/yeswiki.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/yeswiki.maintain.svg) [![Integration level](https://dash.yunohost.org/integration/yeswiki.svg)](https://ci-apps.yunohost.org/ci/apps/yeswiki/) ![Working status](https://ci-apps.yunohost.org/ci/badges/yeswiki.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/yeswiki.maintain.svg)
[![Install YesWiki with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yeswiki) [![Install YesWiki with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yeswiki)
@ -26,7 +26,7 @@ However, with a YesWiki we can build a website with multiple uses:
- Cultivate a bit of freedom... - Cultivate a bit of freedom...
**Shipped version:** 4.4.4~ynh8 **Shipped version:** 4.4.4~ynh9
**Demo:** <https://ferme.yeswiki.net/?CreerSonWiki> **Demo:** <https://ferme.yeswiki.net/?CreerSonWiki>

View file

@ -5,7 +5,7 @@ No se debe editar a mano.
# YesWiki para Yunohost # YesWiki para Yunohost
[![Nivel de integración](https://dash.yunohost.org/integration/yeswiki.svg)](https://dash.yunohost.org/appci/app/yeswiki) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/yeswiki.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/yeswiki.maintain.svg) [![Nivel de integración](https://dash.yunohost.org/integration/yeswiki.svg)](https://ci-apps.yunohost.org/ci/apps/yeswiki/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/yeswiki.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/yeswiki.maintain.svg)
[![Instalar YesWiki con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yeswiki) [![Instalar YesWiki con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yeswiki)
@ -26,7 +26,7 @@ However, with a YesWiki we can build a website with multiple uses:
- Cultivate a bit of freedom... - Cultivate a bit of freedom...
**Versión actual:** 4.4.4~ynh8 **Versión actual:** 4.4.4~ynh9
**Demo:** <https://ferme.yeswiki.net/?CreerSonWiki> **Demo:** <https://ferme.yeswiki.net/?CreerSonWiki>

View file

@ -5,7 +5,7 @@ EZ editatu eskuz.
# YesWiki YunoHost-erako # YesWiki YunoHost-erako
[![Integrazio maila](https://dash.yunohost.org/integration/yeswiki.svg)](https://dash.yunohost.org/appci/app/yeswiki) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/yeswiki.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/yeswiki.maintain.svg) [![Integrazio maila](https://dash.yunohost.org/integration/yeswiki.svg)](https://ci-apps.yunohost.org/ci/apps/yeswiki/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/yeswiki.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/yeswiki.maintain.svg)
[![Instalatu YesWiki YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yeswiki) [![Instalatu YesWiki YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yeswiki)
@ -26,7 +26,7 @@ However, with a YesWiki we can build a website with multiple uses:
- Cultivate a bit of freedom... - Cultivate a bit of freedom...
**Paketatutako bertsioa:** 4.4.4~ynh8 **Paketatutako bertsioa:** 4.4.4~ynh9
**Demoa:** <https://ferme.yeswiki.net/?CreerSonWiki> **Demoa:** <https://ferme.yeswiki.net/?CreerSonWiki>

View file

@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main.
# YesWiki pour YunoHost # YesWiki pour YunoHost
[![Niveau dintégration](https://dash.yunohost.org/integration/yeswiki.svg)](https://dash.yunohost.org/appci/app/yeswiki) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/yeswiki.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/yeswiki.maintain.svg) [![Niveau dintégration](https://dash.yunohost.org/integration/yeswiki.svg)](https://ci-apps.yunohost.org/ci/apps/yeswiki/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/yeswiki.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/yeswiki.maintain.svg)
[![Installer YesWiki avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yeswiki) [![Installer YesWiki avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yeswiki)
@ -26,7 +26,7 @@ Néanmoins, avec un YesWiki on peut fabriquer un site internet aux usages multip
- Cultiver un bout de liberté... - Cultiver un bout de liberté...
**Version incluse:** 4.4.4~ynh8 **Version incluse:** 4.4.4~ynh9
**Démo:** <https://ferme.yeswiki.net/?CreerSonWiki> **Démo:** <https://ferme.yeswiki.net/?CreerSonWiki>

View file

@ -5,7 +5,7 @@ NON debe editarse manualmente.
# YesWiki para YunoHost # YesWiki para YunoHost
[![Nivel de integración](https://dash.yunohost.org/integration/yeswiki.svg)](https://dash.yunohost.org/appci/app/yeswiki) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/yeswiki.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/yeswiki.maintain.svg) [![Nivel de integración](https://dash.yunohost.org/integration/yeswiki.svg)](https://ci-apps.yunohost.org/ci/apps/yeswiki/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/yeswiki.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/yeswiki.maintain.svg)
[![Instalar YesWiki con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yeswiki) [![Instalar YesWiki con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yeswiki)
@ -26,7 +26,7 @@ However, with a YesWiki we can build a website with multiple uses:
- Cultivate a bit of freedom... - Cultivate a bit of freedom...
**Versión proporcionada:** 4.4.4~ynh8 **Versión proporcionada:** 4.4.4~ynh9
**Demo:** <https://ferme.yeswiki.net/?CreerSonWiki> **Demo:** <https://ferme.yeswiki.net/?CreerSonWiki>

View file

@ -5,7 +5,7 @@
# YunoHost 上的 YesWiki # YunoHost 上的 YesWiki
[![集成程度](https://dash.yunohost.org/integration/yeswiki.svg)](https://dash.yunohost.org/appci/app/yeswiki) ![工作状态](https://ci-apps.yunohost.org/ci/badges/yeswiki.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/yeswiki.maintain.svg) [![集成程度](https://dash.yunohost.org/integration/yeswiki.svg)](https://ci-apps.yunohost.org/ci/apps/yeswiki/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/yeswiki.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/yeswiki.maintain.svg)
[![使用 YunoHost 安装 YesWiki](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yeswiki) [![使用 YunoHost 安装 YesWiki](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yeswiki)
@ -26,7 +26,7 @@ However, with a YesWiki we can build a website with multiple uses:
- Cultivate a bit of freedom... - Cultivate a bit of freedom...
**分发版本:** 4.4.4~ynh8 **分发版本:** 4.4.4~ynh9
**演示:** <https://ferme.yeswiki.net/?CreerSonWiki> **演示:** <https://ferme.yeswiki.net/?CreerSonWiki>

View file

@ -1,5 +1,5 @@
#### LDAP/SSO integration #### LDAP/SSO integration
LDAP integration is now enabled on new installs. It is possible to disable it on older installs by removing the loginldap plugin. **Warning: only do this if you know credentials for a wiki admin account !** SSO authentication is supported by default. It is possible to choose the standalone YesWiki authentication during install.
At the moment SSO authentication is not supported. It is necessary to login on the wiki. If you upgraded from YesWiki version < 4.4.4 and want to use the SSO authentication, you must add `"enable_yunohost_sso" => true,` in the `wakka.config.php` file.

View file

@ -1,5 +1,5 @@
#### Intégration LDAP/SSO #### Intégration LDAP/SSO
L'intégration au LDAP est maintenant activée pour les nouvelles installations. Il est possible de la désactiver sur les anciennes installations en retirant l'extension loginldap. **Attention : Ne pas retirer l'extension sans connaitre d'identifiants administrateurs du wiki** L'authentification SSO est prise en charge, mais peut être remplacée par une authentification propre à YesWiki.
Pour le moment l'authentification SSO n'est pas prise en charge. Il est nécessaire de se connecter sur le wiki. Si vous mettez à jour depuis une version de YesWiki < 4.4.4 et que vous voulez utiliser l'authentification SSO de YunoHost, vous devez ajouter `"enable_yunohost_sso" => true,` dans le fichier `wakka.config.php`.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 159 KiB

After

Width:  |  Height:  |  Size: 238 KiB

View file

@ -5,9 +5,9 @@ name = "YesWiki"
description.en = "Wiki that is quick and easy to use" description.en = "Wiki that is quick and easy to use"
description.fr = "Wiki facile et rapide à prendre en main" description.fr = "Wiki facile et rapide à prendre en main"
version = "4.4.4~ynh8" version = "4.4.4~ynh9"
maintainers = ["Florian Schmitt", "Nils Van Zuijlen", "Plumf"] maintainers = ["Florian Schmitt", "Nils Van Zuijlen", "Plumf", "12b"]
[upstream] [upstream]
license = "AGPL-3.0-only" license = "AGPL-3.0-only"
@ -76,6 +76,12 @@ help.fr = "Si vous souhaitez un nom avec des espacements : remplacez les par %20
type = "string" type = "string"
default = "YesWiki" default = "YesWiki"
[install.allow_robots]
ask.en = "Allow search engines indexing"
ask.fr = "Permettre l'indexation par les moteurs de recherche"
type = "boolean"
default = true
[resources] [resources]
[resources.sources.main] [resources.sources.main]
url = "https://github.com/YesWiki/yeswiki/archive/refs/tags/v4.4.4.tar.gz" url = "https://github.com/YesWiki/yeswiki/archive/refs/tags/v4.4.4.tar.gz"
@ -87,8 +93,8 @@ url = "https://repository.yeswiki.net/doryphore/extension-yunohost-1.0.1.zip"
sha256 = "43012db78928dd59539c764029880e3f74f82972e494f7ebf1e365d5f8763c6a" sha256 = "43012db78928dd59539c764029880e3f74f82972e494f7ebf1e365d5f8763c6a"
[resources.sources.importerplugin] [resources.sources.importerplugin]
url = "https://repository.yeswiki.net/doryphore/extension-importer-1.0.1.zip" url = "https://repository.yeswiki.net/doryphore/extension-importer-1.0.3.zip"
sha256 = "443f46bb4b1316a408bee4cee1f69ef8f16ae072e9e2761f4dca641e20303c71" sha256 = "638dc760a4750441c13f05456bf31243066b2c6aca8bab2f94c49e9c0a1ff840"
[resources.sources.ferme] [resources.sources.ferme]
url = "https://repository.yeswiki.net/doryphore/extension-ferme-1.1.8.zip" url = "https://repository.yeswiki.net/doryphore/extension-ferme-1.1.8.zip"
@ -102,7 +108,7 @@ sha256 = "e83a21eaa911b7beb2d845a16c896b2d4d4db2a9d5d2dfca8f0b7c910a329203"
main.url = "/" main.url = "/"
[resources.apt] [resources.apt]
packages = "mariadb-server, php8.2-zip, php8.2-curl, php8.2-gd, php8.2-dom, php8.2-mysql, php8.2-ldap, php8.2-zip" packages = "mariadb-server, php8.2-curl, php8.2-gd, php8.2-dom, php8.2-mysql, php8.2-ldap, php8.2-zip"
[resources.database] [resources.database]
type = "mysql" type = "mysql"

View file

@ -61,17 +61,13 @@ ynh_local_curl "/?PagePrincipale&installAction=install" "config[default_language
"config[root_page]=PagePrincipale" "config[mysql_host]=localhost" \ "config[root_page]=PagePrincipale" "config[mysql_host]=localhost" \
"config[mysql_database]=$app" "config[mysql_user]=$db_user" "config[mysql_password]=$db_pwd" "config[table_prefix]=yeswiki_" \ "config[mysql_database]=$app" "config[mysql_user]=$db_user" "config[mysql_password]=$db_pwd" "config[table_prefix]=yeswiki_" \
"admin_name=$admin" "admin_password=$admin_temp_pass" "admin_password_conf=$admin_temp_pass" \ "admin_name=$admin" "admin_password=$admin_temp_pass" "admin_password_conf=$admin_temp_pass" \
"admin_email=$admin%40$domain" "submit=Continue" "admin_email=$admin%40$domain" "config[allow_robots]=$allow_robots" "config[allow_raw_html]=1" "submit=Continue"
if [ "${wikimodel}" = "CLIC" ]; then if [ "${wikimodel}" = "CLIC" ]; then
# restore original yeswiki model # restore original yeswiki model
mv -f $install_dir/setup/sql/default-content.sql.original $install_dir/setup/sql/default-content.sql mv -f $install_dir/setup/sql/default-content.sql.original $install_dir/setup/sql/default-content.sql
fi fi
# authorization of html
# (kind of strange, should be doable using the previous curl?)
ynh_replace_string --match_string="'allow_raw_html' => false," --replace_string="'allow_raw_html' => true," --target_file="$install_dir/wakka.config.php"
#================================================= #=================================================
# DOWNLOAD AND CONFIGURE IMPORTER PLUGIN # DOWNLOAD AND CONFIGURE IMPORTER PLUGIN
#================================================= #=================================================