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