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 #73 from YunoHost-Apps/testing

Testing
This commit is contained in:
Florian 2024-02-12 00:13:16 +03:00 committed by GitHub
commit 4be10f0666
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 46 additions and 44 deletions

View file

@ -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.2~ynh2 **Shipped version:** 4.4.2~ynh3
**Demo:** https://ferme.yeswiki.net/?CreerSonWiki **Demo:** https://ferme.yeswiki.net/?CreerSonWiki

View file

@ -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.2~ynh2 **Version incluse :** 4.4.2~ynh3
**Démo :** https://ferme.yeswiki.net/?CreerSonWiki **Démo :** https://ferme.yeswiki.net/?CreerSonWiki

View file

@ -5,7 +5,7 @@ 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.2~ynh2" version = "4.4.2~ynh3"
maintainers = ["Florian Schmitt", "Nils Van Zuijlen", "Plumf"] maintainers = ["Florian Schmitt", "Nils Van Zuijlen", "Plumf"]
@ -27,56 +27,56 @@ ram.build = "50M"
ram.runtime = "50M" ram.runtime = "50M"
[install] [install]
[install.domain] [install.domain]
type = "domain" type = "domain"
[install.path] [install.path]
type = "path" type = "path"
default = "/yeswiki" default = "/yeswiki"
[install.init_main_permission] [install.init_main_permission]
help.en = "If YesWiki is made public anyone will be able to view the wiki" help.en = "If YesWiki is made public anyone will be able to view the wiki"
help.fr = "Si YesWiki est rendu publique toute personne pourra consulter le wiki" help.fr = "Si YesWiki est rendu publique toute personne pourra consulter le wiki"
type = "group" type = "group"
default = "visitors" default = "visitors"
[install.language] [install.language]
ask.en = "Choose the application language" ask.en = "Choose the application language"
ask.fr = "Choisissez la langue de l'application" ask.fr = "Choisissez la langue de l'application"
type = "select" type = "select"
choices = ["fr", "en", "ca", "es", "nl", "pt"] choices = ["fr", "en", "ca", "es", "nl", "pt"]
default = "fr" default = "fr"
[install.admin] [install.admin]
type = "user" type = "user"
[install.wiki_name] [install.wiki_name]
ask.en = "Choose the wiki name" ask.en = "Choose the wiki name"
ask.fr = "Choisissez le nom de votre wiki" ask.fr = "Choisissez le nom de votre wiki"
help.en = "If you want a name with spaces: replace them with %20 for each space." help.en = "If you want a name with spaces: replace them with %20 for each space."
help.fr = "Si vous souhaitez un nom avec des espacements : remplacez les par %20 pour chaque espace" help.fr = "Si vous souhaitez un nom avec des espacements : remplacez les par %20 pour chaque espace"
type = "string" type = "string"
default = "MyYunoHostWiki" default = "MyYunoHostWiki"
[resources] [resources]
[resources.sources.main] [resources.sources.main]
url = "https://github.com/YesWiki/yeswiki/archive/refs/tags/v4.4.2.tar.gz" url = "https://github.com/YesWiki/yeswiki/archive/refs/tags/v4.4.2.tar.gz"
sha256 = "8c4fe3c0a0f76f47ab5b2c8399b437bd95548d6fa620c90c152a6acd56c25e99" sha256 = "8c4fe3c0a0f76f47ab5b2c8399b437bd95548d6fa620c90c152a6acd56c25e99"
autoupdate.strategy = "latest_github_tag" autoupdate.strategy = "latest_github_tag"
[resources.sources.loginldap] [resources.sources.loginldap]
url = "https://repository.yeswiki.net/doryphore/extension-loginldap-1.0.0.zip" url = "https://repository.yeswiki.net/doryphore/extension-loginldap-1.0.0.zip"
sha256 = "40fe941d1eef191bb62cf454d3ee437d26d1d16181ab30d6a3602930d91a94bb" sha256 = "28c9489e4fb0c83e0e775d80a1d07cbc3fbf56d42ab550b45571455f1a6ce9f9"
[resources.system_user] [resources.system_user]
[resources.install_dir] [resources.install_dir]
[resources.permissions] [resources.permissions]
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" packages = "mariadb-server, php8.2-zip, php8.2-curl, php8.2-gd, php8.2-dom, php8.2-mysql, php8.2-ldap"
[resources.database] [resources.database]
type = "mysql" type = "mysql"

View file

@ -49,7 +49,9 @@ ynh_script_progression --message="Finalizing installation..." --weight=2
admin_temp_pass=$(ynh_string_random 20) admin_temp_pass=$(ynh_string_random 20)
ynh_local_curl "/?PagePrincipale&installAction=install" "config[default_language]=$language" "config[wakka_name]=$wiki_name" \ wiki_name_escaped=$(echo "$wiki_name" | sed 's/ /%20/g')
ynh_local_curl "/?PagePrincipale&installAction=install" "config[default_language]=$language" "config[wakka_name]=$wiki_name_escaped" \
"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" \