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

feat(install): allow robots setting and new importer version without errors on empty datasources

Browse source
This commit is contained in:
mrflos 2024-06-27 12:09:20 +02:00
parent 4e462016dd
commit 5d49dbd667
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
manifest.toml
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.2.zip"
sha256 = "443f46bb4b1316a408bee4cee1f69ef8f16ae072e9e2761f4dca641e20303c71" sha256 = "681cf7e325796363490bd296fa0c0a7d04b8a3a8fa8f85731effa073e1a4bfb3"
[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"

6
scripts/install
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
#================================================= #=================================================