From 457cf206e230aa35e9e771cda404217a376e28a5 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 14 Jan 2022 23:42:20 +0100 Subject: [PATCH 1/3] Upgrade to 2.5.268~ynh1 --- README.md | 2 +- README_fr.md | 2 +- check_process | 4 ++++ conf/app.src | 4 ++-- conf/config.sample.yml | 3 +++ manifest.json | 2 +- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 62cf27b..e6571d3 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Open source powerful wiki app built on Node.js, Git and Markdown -**Shipped version:** 2.5.219~ynh2 +**Shipped version:** 2.5.268~ynh1 **Demo:** https://docs-beta.requarks.io/ diff --git a/README_fr.md b/README_fr.md index a882e98..0c7b85a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Wiki open source propulsé par Node.js, Git et Markdown -**Version incluse :** 2.5.219~ynh2 +**Version incluse :** 2.5.268~ynh1 **Démo :** https://docs-beta.requarks.io/ diff --git a/check_process b/check_process index 0762bb1..bbe5902 100644 --- a/check_process +++ b/check_process @@ -42,6 +42,8 @@ upgrade=1 from_commit=078ffc6ade0df8efd2e035c25e36218c163d158d # 2.5.219~ynh1 upgrade=1 from_commit=8d478fadb941f2d8d4407f90cb3ae7e939ff8924 + # 2.5.219~ynh2 + upgrade=1 from_commit=b59ca572505eb6b4b4f29596100c68808ec143cd backup_restore=1 multi_instance=1 port_already_use=0 @@ -82,3 +84,5 @@ Notification=yes name=2.5.214~ynh1 ; commit=8d478fadb941f2d8d4407f90cb3ae7e939ff8924 name=2.5.219~ynh1 + ; commit=b59ca572505eb6b4b4f29596100c68808ec143cd + name=2.5.219~ynh2 diff --git a/conf/app.src b/conf/app.src index 4576a4b..0a6b486 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Requarks/wiki/releases/download/2.5.219/wiki-js.tar.gz -SOURCE_SUM=c73c4ebf5ec1fbdc1e82d3571abf520f82945a531baef3ed661bdf9a866104d7 +SOURCE_URL=https://github.com/Requarks/wiki/releases/download/2.5.268/wiki-js.tar.gz +SOURCE_SUM=11ce2daeb5444db80ab38d5a21ce0d7b4d9cf7af50738e10b6805ff2dca4e3e2 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/config.sample.yml b/conf/config.sample.yml index 7367e76..d4e9004 100644 --- a/conf/config.sample.yml +++ b/conf/config.sample.yml @@ -43,6 +43,9 @@ db: # pfx: path/to/cert.pfx # passphrase: xyz123 + # Optional - PostgreSQL only: + schema: public + # SQLite only: storage: path/to/database.sqlite diff --git a/manifest.json b/manifest.json index c24455d..406bac1 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source powerful wiki app built on Node.js, Git and Markdown", "fr": "Wiki open source propulsé par Node.js, Git et Markdown" }, - "version": "2.5.219~ynh2", + "version": "2.5.268~ynh1", "url": "https://wiki.js.org/", "upstream": { "license": "AGPL-3.0-or-later", From 3d6ad086e1fbb9c7bcb373e0cd6425b37a43da43 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 14 Jan 2022 23:51:04 +0100 Subject: [PATCH 2/3] Apply last example_ynh --- conf/nginx.conf | 5 ----- doc/DESCRIPTION.md | 1 + doc/DISCLAIMER.md | 15 +++------------ manifest.json | 7 +++---- scripts/_common.sh | 2 +- scripts/remove | 18 +++++++++--------- scripts/upgrade | 1 + 7 files changed, 18 insertions(+), 31 deletions(-) create mode 100644 doc/DESCRIPTION.md diff --git a/conf/nginx.conf b/conf/nginx.conf index 112b9c6..c23832c 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,11 +4,6 @@ location / { # Path to source #alias __FINALPATH__/ ; - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file client_max_body_size 50M; diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..9c66045 --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1 @@ +Wiki.js is a copylefted libre software, modern and powerful wiki app built on Node.js, Git and Markdown for YunoHost. diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 0950742..1ed0282 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,12 +1,3 @@ -* Any known limitations, constrains or stuff not working, such as (but not limited to): - * **Wiki.js** requires a dedicated **root domain**, e.g. wikijs.domain.tld - * LDAP is implemented, root will receive an e-mail at the end of the installation or the upgrade with the info on how to configure LDAP. - * No HTTP auth for now, but planned for the future. - * the app requires an important amount of RAM / disk / .. to install or to work properly - * etc... - -* Other infos that people should be aware of, such as: - * any specific step to perform after installing (such as manually finishing the install, specific admin credentials, ...) - * how to configure / administrate the application if it ain't obvious - * upgrade process / specificities / things to be aware of ? - * security considerations ? +* **Wiki.js** requires a dedicated **root domain**, e.g. wikijs.domain.tld +* LDAP is implemented, root will receive an e-mail at the end of the installation or the upgrade with the info on how to configure LDAP. +* No HTTP auth for now, but planned for the future. diff --git a/manifest.json b/manifest.json index 406bac1..b0996d8 100644 --- a/manifest.json +++ b/manifest.json @@ -21,18 +21,17 @@ "name": "yalh76" }, "requirements": { - "yunohost": ">= 4.1.7.3" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ "nginx" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "is_public", diff --git a/scripts/_common.sh b/scripts/_common.sh index 2d1d65e..57a30f0 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ # dependencies used by the app pkg_dependencies="postgresql postgresql-contrib" -NODEJS_VERSION=14 +NODEJS_VERSION=16 #================================================= # PERSONAL HELPERS diff --git a/scripts/remove b/scripts/remove index d9d022c..2b5720f 100644 --- a/scripts/remove +++ b/scripts/remove @@ -52,15 +52,6 @@ ynh_script_progression --message="Removing the PostgreSQL database..." # Remove a database if it exists, along with the associated user ynh_psql_remove_db --db_user=$db_user --db_name=$db_name -#================================================= -# REMOVE DEPENDENCIES -#================================================= -ynh_script_progression --message="Removing dependencies..." - -# Remove metapackage and its dependencies -ynh_remove_nodejs -ynh_remove_app_dependencies - #================================================= # REMOVE APP MAIN DIR #================================================= @@ -77,6 +68,15 @@ ynh_script_progression --message="Removing NGINX web server configuration..." # Remove the dedicated NGINX config ynh_remove_nginx_config +#================================================= +# REMOVE DEPENDENCIES +#================================================= +ynh_script_progression --message="Removing dependencies..." + +# Remove metapackage and its dependencies +ynh_remove_nodejs +ynh_remove_app_dependencies + #================================================= # SPECIFIC REMOVE #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index a39484c..f77ac2d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -155,6 +155,7 @@ ynh_add_nginx_config ynh_script_progression --message="Upgrading dependencies..." ynh_install_app_dependencies $pkg_dependencies +ynh_remove_nodejs ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_use_nodejs From 35492f814d67a3f05513a48d57c0e4680845a454 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Fri, 14 Jan 2022 22:51:10 +0000 Subject: [PATCH 3/3] Auto-update README --- README.md | 18 +++++------------- README_fr.md | 18 +++++------------- 2 files changed, 10 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index e6571d3..291a9a0 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,8 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Open source powerful wiki app built on Node.js, Git and Markdown +Wiki.js is a copylefted libre software, modern and powerful wiki app built on Node.js, Git and Markdown for YunoHost. + **Shipped version:** 2.5.268~ynh1 @@ -28,18 +29,9 @@ Open source powerful wiki app built on Node.js, Git and Markdown ## Disclaimers / important information -* Any known limitations, constrains or stuff not working, such as (but not limited to): - * **Wiki.js** requires a dedicated **root domain**, e.g. wikijs.domain.tld - * LDAP is implemented, root will receive an e-mail at the end of the installation or the upgrade with the info on how to configure LDAP. - * No HTTP auth for now, but planned for the future. - * the app requires an important amount of RAM / disk / .. to install or to work properly - * etc... - -* Other infos that people should be aware of, such as: - * any specific step to perform after installing (such as manually finishing the install, specific admin credentials, ...) - * how to configure / administrate the application if it ain't obvious - * upgrade process / specificities / things to be aware of ? - * security considerations ? +* **Wiki.js** requires a dedicated **root domain**, e.g. wikijs.domain.tld +* LDAP is implemented, root will receive an e-mail at the end of the installation or the upgrade with the info on how to configure LDAP. +* No HTTP auth for now, but planned for the future. ## Documentation and resources diff --git a/README_fr.md b/README_fr.md index 0c7b85a..18c4450 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Wiki open source propulsé par Node.js, Git et Markdown +Wiki.js is a copylefted libre software, modern and powerful wiki app built on Node.js, Git and Markdown for YunoHost. + **Version incluse :** 2.5.268~ynh1 @@ -24,18 +25,9 @@ Wiki open source propulsé par Node.js, Git et Markdown ## Avertissements / informations importantes -* Any known limitations, constrains or stuff not working, such as (but not limited to): - * **Wiki.js** requires a dedicated **root domain**, e.g. wikijs.domain.tld - * LDAP is implemented, root will receive an e-mail at the end of the installation or the upgrade with the info on how to configure LDAP. - * No HTTP auth for now, but planned for the future. - * the app requires an important amount of RAM / disk / .. to install or to work properly - * etc... - -* Other infos that people should be aware of, such as: - * any specific step to perform after installing (such as manually finishing the install, specific admin credentials, ...) - * how to configure / administrate the application if it ain't obvious - * upgrade process / specificities / things to be aware of ? - * security considerations ? +* **Wiki.js** requires a dedicated **root domain**, e.g. wikijs.domain.tld +* LDAP is implemented, root will receive an e-mail at the end of the installation or the upgrade with the info on how to configure LDAP. +* No HTTP auth for now, but planned for the future. ## Documentations et ressources