From d7dfc9a643fa662ff7fddafbaf3a8d864920ca86 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sun, 10 Dec 2023 23:16:13 +0100 Subject: [PATCH 1/5] Escape spaces in wiki name during install --- scripts/install | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 327d570..87162a5 100755 --- a/scripts/install +++ b/scripts/install @@ -49,7 +49,9 @@ ynh_script_progression --message="Finalizing installation..." --weight=2 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[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" \ From 809b12d37aabc073fdb838371b04601d5beda20c Mon Sep 17 00:00:00 2001 From: Florian Date: Fri, 9 Feb 2024 12:20:09 +0300 Subject: [PATCH 2/5] fix(sha) : wrong sha for extension ldap ? --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 29a4842..8e64f30 100644 --- a/manifest.toml +++ b/manifest.toml @@ -66,7 +66,7 @@ ram.runtime = "50M" [resources.sources.loginldap] url = "https://repository.yeswiki.net/doryphore/extension-loginldap-1.0.0.zip" - sha256 = "40fe941d1eef191bb62cf454d3ee437d26d1d16181ab30d6a3602930d91a94bb" + sha256 = "4717164ef09312f3c302b435b12466a5fbf9c3eea4674850cd44c22941e45071" [resources.system_user] From 5377f9a9260d67a68115869967943ddd98c55e8d Mon Sep 17 00:00:00 2001 From: Florian Schmitt Date: Sun, 11 Feb 2024 22:49:46 +0300 Subject: [PATCH 3/5] fix(loginldap): new valid sha256 checksum after repo rebuild --- manifest.toml | 80 +++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/manifest.toml b/manifest.toml index 8e64f30..1fac458 100644 --- a/manifest.toml +++ b/manifest.toml @@ -27,56 +27,56 @@ ram.build = "50M" ram.runtime = "50M" [install] - [install.domain] - type = "domain" +[install.domain] +type = "domain" - [install.path] - type = "path" - default = "/yeswiki" +[install.path] +type = "path" +default = "/yeswiki" - [install.init_main_permission] - 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" - type = "group" - default = "visitors" +[install.init_main_permission] +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" +type = "group" +default = "visitors" - [install.language] - ask.en = "Choose the application language" - ask.fr = "Choisissez la langue de l'application" - type = "select" - choices = ["fr", "en", "ca", "es", "nl", "pt"] - default = "fr" +[install.language] +ask.en = "Choose the application language" +ask.fr = "Choisissez la langue de l'application" +type = "select" +choices = ["fr", "en", "ca", "es", "nl", "pt"] +default = "fr" - [install.admin] - type = "user" +[install.admin] +type = "user" - [install.wiki_name] - ask.en = "Choose the wiki name" - 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.fr = "Si vous souhaitez un nom avec des espacements : remplacez les par %20 pour chaque espace" - type = "string" - default = "MyYunoHostWiki" +[install.wiki_name] +ask.en = "Choose the wiki name" +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.fr = "Si vous souhaitez un nom avec des espacements : remplacez les par %20 pour chaque espace" +type = "string" +default = "MyYunoHostWiki" [resources] - [resources.sources.main] - url = "https://github.com/YesWiki/yeswiki/archive/refs/tags/v4.4.2.tar.gz" - sha256 = "8c4fe3c0a0f76f47ab5b2c8399b437bd95548d6fa620c90c152a6acd56c25e99" - autoupdate.strategy = "latest_github_tag" +[resources.sources.main] +url = "https://github.com/YesWiki/yeswiki/archive/refs/tags/v4.4.2.tar.gz" +sha256 = "8c4fe3c0a0f76f47ab5b2c8399b437bd95548d6fa620c90c152a6acd56c25e99" +autoupdate.strategy = "latest_github_tag" - [resources.sources.loginldap] - url = "https://repository.yeswiki.net/doryphore/extension-loginldap-1.0.0.zip" - sha256 = "4717164ef09312f3c302b435b12466a5fbf9c3eea4674850cd44c22941e45071" +[resources.sources.loginldap] +url = "https://repository.yeswiki.net/doryphore/extension-loginldap-1.0.0.zip" +sha256 = "28c9489e4fb0c83e0e775d80a1d07cbc3fbf56d42ab550b45571455f1a6ce9f9" - [resources.system_user] +[resources.system_user] - [resources.install_dir] +[resources.install_dir] - [resources.permissions] - main.url = "/" +[resources.permissions] +main.url = "/" - [resources.apt] - packages = "mariadb-server, php8.2-zip, php8.2-curl, php8.2-gd, php8.2-dom, php8.2-mysql, php8.2-ldap" +[resources.apt] +packages = "mariadb-server, php8.2-zip, php8.2-curl, php8.2-gd, php8.2-dom, php8.2-mysql, php8.2-ldap" - [resources.database] - type = "mysql" +[resources.database] +type = "mysql" From f7c4a6818ac8e64515bca274811fc04fa805fd3f Mon Sep 17 00:00:00 2001 From: Florian Schmitt Date: Sun, 11 Feb 2024 23:02:39 +0300 Subject: [PATCH 4/5] dump version --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 1fac458..806aa09 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "YesWiki" description.en = "Wiki that is quick and easy to use" 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"] From 0ff9e7a012b9037e145e0dc95d2fcabf3fc24e13 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 11 Feb 2024 21:12:29 +0000 Subject: [PATCH 5/5] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 12001cd..56bd04d 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ However, with a YesWiki we can build a website with multiple uses: - Cultivate a bit of freedom... -**Shipped version:** 4.4.2~ynh2 +**Shipped version:** 4.4.2~ynh3 **Demo:** https://ferme.yeswiki.net/?CreerSonWiki diff --git a/README_fr.md b/README_fr.md index fea6798..4197589 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ Néanmoins, avec un YesWiki on peut fabriquer un site internet aux usages multip - Cultiver un bout de liberté... -**Version incluse :** 4.4.2~ynh2 +**Version incluse :** 4.4.2~ynh3 **Démo :** https://ferme.yeswiki.net/?CreerSonWiki