mirror of
https://github.com/YunoHost-Apps/wikijs_ynh.git
synced 2024-09-03 20:36:09 +02:00
Merge pull request #159 from YunoHost-Apps/testing
Upgrade to 2.5.268~ynh1
This commit is contained in:
commit
de01b48bfe
12 changed files with 40 additions and 62 deletions
20
README.md
20
README.md
|
@ -15,9 +15,10 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
|
||||||
|
|
||||||
## Overview
|
## 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.219~ynh2
|
|
||||||
|
**Shipped version:** 2.5.268~ynh1
|
||||||
|
|
||||||
**Demo:** https://docs-beta.requarks.io/
|
**Demo:** https://docs-beta.requarks.io/
|
||||||
|
|
||||||
|
@ -28,18 +29,9 @@ Open source powerful wiki app built on Node.js, Git and Markdown
|
||||||
|
|
||||||
## Disclaimers / important information
|
## 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
|
||||||
* **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.
|
||||||
* 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.
|
||||||
* 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 ?
|
|
||||||
|
|
||||||
## Documentation and resources
|
## Documentation and resources
|
||||||
|
|
||||||
|
|
20
README_fr.md
20
README_fr.md
|
@ -11,9 +11,10 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
|
||||||
|
|
||||||
## Vue d'ensemble
|
## 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.219~ynh2
|
|
||||||
|
**Version incluse :** 2.5.268~ynh1
|
||||||
|
|
||||||
**Démo :** https://docs-beta.requarks.io/
|
**Démo :** https://docs-beta.requarks.io/
|
||||||
|
|
||||||
|
@ -24,18 +25,9 @@ Wiki open source propulsé par Node.js, Git et Markdown
|
||||||
|
|
||||||
## Avertissements / informations importantes
|
## 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
|
||||||
* **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.
|
||||||
* 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.
|
||||||
* 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 ?
|
|
||||||
|
|
||||||
## Documentations et ressources
|
## Documentations et ressources
|
||||||
|
|
||||||
|
|
|
@ -42,6 +42,8 @@
|
||||||
upgrade=1 from_commit=078ffc6ade0df8efd2e035c25e36218c163d158d
|
upgrade=1 from_commit=078ffc6ade0df8efd2e035c25e36218c163d158d
|
||||||
# 2.5.219~ynh1
|
# 2.5.219~ynh1
|
||||||
upgrade=1 from_commit=8d478fadb941f2d8d4407f90cb3ae7e939ff8924
|
upgrade=1 from_commit=8d478fadb941f2d8d4407f90cb3ae7e939ff8924
|
||||||
|
# 2.5.219~ynh2
|
||||||
|
upgrade=1 from_commit=b59ca572505eb6b4b4f29596100c68808ec143cd
|
||||||
backup_restore=1
|
backup_restore=1
|
||||||
multi_instance=1
|
multi_instance=1
|
||||||
port_already_use=0
|
port_already_use=0
|
||||||
|
@ -82,3 +84,5 @@ Notification=yes
|
||||||
name=2.5.214~ynh1
|
name=2.5.214~ynh1
|
||||||
; commit=8d478fadb941f2d8d4407f90cb3ae7e939ff8924
|
; commit=8d478fadb941f2d8d4407f90cb3ae7e939ff8924
|
||||||
name=2.5.219~ynh1
|
name=2.5.219~ynh1
|
||||||
|
; commit=b59ca572505eb6b4b4f29596100c68808ec143cd
|
||||||
|
name=2.5.219~ynh2
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
SOURCE_URL=https://github.com/Requarks/wiki/releases/download/2.5.219/wiki-js.tar.gz
|
SOURCE_URL=https://github.com/Requarks/wiki/releases/download/2.5.268/wiki-js.tar.gz
|
||||||
SOURCE_SUM=c73c4ebf5ec1fbdc1e82d3571abf520f82945a531baef3ed661bdf9a866104d7
|
SOURCE_SUM=11ce2daeb5444db80ab38d5a21ce0d7b4d9cf7af50738e10b6805ff2dca4e3e2
|
||||||
SOURCE_SUM_PRG=sha256sum
|
SOURCE_SUM_PRG=sha256sum
|
||||||
SOURCE_FORMAT=tar.gz
|
SOURCE_FORMAT=tar.gz
|
||||||
SOURCE_IN_SUBDIR=false
|
SOURCE_IN_SUBDIR=false
|
||||||
|
|
|
@ -43,6 +43,9 @@ db:
|
||||||
# pfx: path/to/cert.pfx
|
# pfx: path/to/cert.pfx
|
||||||
# passphrase: xyz123
|
# passphrase: xyz123
|
||||||
|
|
||||||
|
# Optional - PostgreSQL only:
|
||||||
|
schema: public
|
||||||
|
|
||||||
# SQLite only:
|
# SQLite only:
|
||||||
storage: path/to/database.sqlite
|
storage: path/to/database.sqlite
|
||||||
|
|
||||||
|
|
|
@ -4,11 +4,6 @@ location / {
|
||||||
# Path to source
|
# Path to source
|
||||||
#alias __FINALPATH__/ ;
|
#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
|
# Common parameter to increase upload size limit in conjunction with dedicated php-fpm file
|
||||||
client_max_body_size 50M;
|
client_max_body_size 50M;
|
||||||
|
|
||||||
|
|
1
doc/DESCRIPTION.md
Normal file
1
doc/DESCRIPTION.md
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Wiki.js is a copylefted libre software, modern and powerful wiki app built on Node.js, Git and Markdown for YunoHost.
|
|
@ -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
|
||||||
* **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.
|
||||||
* 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.
|
||||||
* 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 ?
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
"en": "Open source powerful wiki app built on Node.js, Git and Markdown",
|
"en": "Open source powerful wiki app built on Node.js, Git and Markdown",
|
||||||
"fr": "Wiki open source propulsé par Node.js, Git et 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/",
|
"url": "https://wiki.js.org/",
|
||||||
"upstream": {
|
"upstream": {
|
||||||
"license": "AGPL-3.0-or-later",
|
"license": "AGPL-3.0-or-later",
|
||||||
|
@ -21,18 +21,17 @@
|
||||||
"name": "yalh76"
|
"name": "yalh76"
|
||||||
},
|
},
|
||||||
"requirements": {
|
"requirements": {
|
||||||
"yunohost": ">= 4.1.7.3"
|
"yunohost": ">= 4.3.0"
|
||||||
},
|
},
|
||||||
"multi_instance": true,
|
"multi_instance": true,
|
||||||
"services": [
|
"services": [
|
||||||
"nginx"
|
"nginx"
|
||||||
],
|
],
|
||||||
"arguments": {
|
"arguments": {
|
||||||
"install" : [
|
"install": [
|
||||||
{
|
{
|
||||||
"name": "domain",
|
"name": "domain",
|
||||||
"type": "domain",
|
"type": "domain"
|
||||||
"example": "example.com"
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "is_public",
|
"name": "is_public",
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
# dependencies used by the app
|
# dependencies used by the app
|
||||||
pkg_dependencies="postgresql postgresql-contrib"
|
pkg_dependencies="postgresql postgresql-contrib"
|
||||||
|
|
||||||
NODEJS_VERSION=14
|
NODEJS_VERSION=16
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
# PERSONAL HELPERS
|
# PERSONAL HELPERS
|
||||||
|
|
|
@ -52,15 +52,6 @@ ynh_script_progression --message="Removing the PostgreSQL database..."
|
||||||
# Remove a database if it exists, along with the associated user
|
# Remove a database if it exists, along with the associated user
|
||||||
ynh_psql_remove_db --db_user=$db_user --db_name=$db_name
|
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
|
# REMOVE APP MAIN DIR
|
||||||
#=================================================
|
#=================================================
|
||||||
|
@ -77,6 +68,15 @@ ynh_script_progression --message="Removing NGINX web server configuration..."
|
||||||
# Remove the dedicated NGINX config
|
# Remove the dedicated NGINX config
|
||||||
ynh_remove_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
|
# SPECIFIC REMOVE
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
|
@ -155,6 +155,7 @@ ynh_add_nginx_config
|
||||||
ynh_script_progression --message="Upgrading dependencies..."
|
ynh_script_progression --message="Upgrading dependencies..."
|
||||||
|
|
||||||
ynh_install_app_dependencies $pkg_dependencies
|
ynh_install_app_dependencies $pkg_dependencies
|
||||||
|
ynh_remove_nodejs
|
||||||
ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
|
ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
|
||||||
ynh_use_nodejs
|
ynh_use_nodejs
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue