From 1752e7f61e2f295f8b36bb95775a253ebec8ed9f Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 14 Mar 2019 01:19:10 +0100 Subject: [PATCH 1/4] Apply last example_ynh --- pull_request_template.md | 23 +++++++++++++++++++++++ scripts/_common.sh | 7 +++++++ scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 5 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 pull_request_template.md diff --git a/pull_request_template.md b/pull_request_template.md new file mode 100644 index 0000000..fab9f6f --- /dev/null +++ b/pull_request_template.md @@ -0,0 +1,23 @@ +## Problem +- *Description of why you made this PR* + +## Solution +- *And how do you fix that problem* + +## PR Status +- [ ] Code finished. +- [ ] Tested with Package_check. +- [ ] Fix or enhancement tested. +- [ ] Upgrade from last version tested. +- [ ] Can be reviewed and tested. + +## Validation +--- +- [ ] **Code review** +- [ ] **Approval (LGTM)** +*Code review and approval have to be from a member of @YunoHost/apps group* +- **CI succeeded** : +[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/wikijs_ynh%20-BRANCH-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/wikijs_ynh%20-BRANCH-/) +*Please replace '-BRANCH-' in this link by the name of the branch used.* +*If the PR is from a forked repository. Please provide public results from package_check.* +When the PR is marked as ready to merge, you have to wait for 3 days before really merging it. diff --git a/scripts/_common.sh b/scripts/_common.sh index b905339..c0220ac 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,5 +1,12 @@ #!/bin/bash +#================================================= +# COMMON VARIABLES +#================================================= + +# dependencies used by the app +pkg_dependencies="postgresql postgresql-contrib" + #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index 7bb2dc4..f8905de 100644 --- a/scripts/install +++ b/scripts/install @@ -103,7 +103,7 @@ ynh_print_info "Installing dependencies..." ynh_install_nodejs 10 -ynh_install_app_dependencies postgresql postgresql-contrib +ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE A POSTGRESQL DATABASE diff --git a/scripts/restore b/scripts/restore index d8a7e27..0aa56fc 100644 --- a/scripts/restore +++ b/scripts/restore @@ -91,7 +91,7 @@ ynh_print_info "Reinstalling dependencies..." ynh_install_nodejs 10 -ynh_install_app_dependencies postgresql postgresql-contrib +ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE THE POSTGRESQL DATABASE diff --git a/scripts/upgrade b/scripts/upgrade index 728a76c..72f07e2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -112,7 +112,7 @@ ynh_print_info "Upgrading dependencies..." ynh_install_nodejs 10 -ynh_install_app_dependencies postgresql postgresql-contrib +ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE DEDICATED USER From 8856ca06f0b7c44da839b212a7fe2e1f4262e6f0 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 15 Mar 2019 00:40:24 +0100 Subject: [PATCH 2/4] activate proxy trust --- conf/config.sample.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.sample.yml b/conf/config.sample.yml index 1b82962..6768afc 100644 --- a/conf/config.sample.yml +++ b/conf/config.sample.yml @@ -42,7 +42,7 @@ db: # Enable only if Wiki.js is behind a reverse-proxy (nginx, apache, etc) # or a cloud proxying services like Cloudflare. -trustProxy: false +trustProxy: true # --------------------------------------------------------------------- # SSL/TLS Settings From 1902713d1863755161eb9f0763ebfc8d3fbf9839 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 15 Mar 2019 02:06:42 +0100 Subject: [PATCH 3/4] Deasctivate gzip encoding to let Yunohost Tile work --- conf/nginx.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/nginx.conf b/conf/nginx.conf index 7bb27c3..3f89095 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -8,6 +8,7 @@ location / { if ($scheme = http) { rewrite ^ https://$server_name$request_uri? permanent; } + proxy_set_header Accept-Encoding ""; proxy_pass http://localhost:__PORT__; proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; From 6c0ce22d1baa2e5591d7a9bfd49edfa43791ef5d Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 16 Mar 2019 04:50:43 +0100 Subject: [PATCH 4/4] Update version number --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index aadd732..b72937f 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "An open source, modern and powerful wiki app built on Node.js, Git and Markdown.", "fr": "Un wiki moderne et open source propulsé Node.js, Git et Markdown." }, - "version": "2.0.0-beta.42~ynh2", + "version": "2.0.0-beta.42~ynh3", "url": "https://wiki.js.org/", "license": "AGPL-3.0-or-later", "maintainer": {