Merge pull request #35 from YunoHost-Apps/testing

Testing

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

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;

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": {

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.

scripts/_common.sh

@@ -1,5 +1,12 @@
 #!/bin/bash
 
+#=================================================
+# COMMON VARIABLES
+#=================================================
+
+# dependencies used by the app
+pkg_dependencies="postgresql postgresql-contrib"
+
 #=================================================
 # PERSONAL HELPERS
 #=================================================

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

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

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