From 76c9e61ee4e6458176ba60ad011e639539edb2e5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 1 Jul 2020 21:08:11 +0200 Subject: [PATCH] rebase fix nginx remove sessionSecret Update change_url Update change_url Revert "Update change_url" This reverts commit 1b789974eee627934a579d50bb323224e8e2b861. Revert "Update change_url" This reverts commit 7cca1436364f4380362ba0068a33988b3cc57ee1. Update install Update upgrade remove Update nginx.conf Update README_fr.md Update change_url --- README_fr.md | 2 +- check_process | 4 ++-- conf/config.json.example | 1 + conf/nginx.conf | 26 ++++++++++---------------- manifest.json | 14 ++++++++++++-- scripts/change_url | 2 +- scripts/install | 3 ++- scripts/upgrade | 1 + 8 files changed, 30 insertions(+), 23 deletions(-) diff --git a/README_fr.md b/README_fr.md index 44b8f3d..01de3bb 100644 --- a/README_fr.md +++ b/README_fr.md @@ -39,7 +39,7 @@ Vous pouvez configurer CodiMD en modifiant le fichier `/var/www/codimd/config.js #### Architectures supportées -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/codimd%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/codimd/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/codimd%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/codimd/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/codimd%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/codimd/) ## Liens diff --git a/check_process b/check_process index 24dbef1..8e2f879 100644 --- a/check_process +++ b/check_process @@ -1,7 +1,7 @@ ;; Test complet ; Manifest domain="domain.tld" (DOMAIN) - path="/" (PATH) + path="/path" (PATH) admin="john" (USER) is_public=1 (PUBLIC|public=1|private=0) ; Checks @@ -15,7 +15,7 @@ backup_restore=1 multi_instance=1 port_already_use=1 - change_url=0 + change_url=1 ;;; Levels Level 5=auto ;;; Options diff --git a/conf/config.json.example b/conf/config.json.example index 1b1df57..a6c4126 100644 --- a/conf/config.json.example +++ b/conf/config.json.example @@ -3,6 +3,7 @@ "protocolUseSSL": true, "domain": "__DOMAIN__", "port": "__PORT__", + "urlPath": "__PATH__", "loglevel": "info", "useCDN": false, "allowGravatar": false, diff --git a/conf/nginx.conf b/conf/nginx.conf index 747be58..f61238e 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,25 +1,19 @@ -location ^~ / { - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } +location ^~ __PATH__/ { - proxy_pass http://127.0.0.1:__PORT__; - proxy_redirect off; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Host $server_name; - + proxy_pass http://127.0.0.1:__PORT__/; proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header X-Forwarded-For $remote_addr; # setup for image upload - client_max_body_size 8192m; - proxy_max_temp_file_size 8192m; + client_max_body_size 256M; + proxy_max_temp_file_size 1024M; proxy_read_timeout 300; proxy_connect_timeout 300; + + # Include SSOWAT user panel. + include conf.d/yunohost_panel.conf.inc; + more_clear_input_headers 'Accept-Encoding'; } diff --git a/manifest.json b/manifest.json index 7a3e907..74d0131 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Collaborative editor to work on notes written in Markdown", "fr": "Éditeur collaboratif pour travailler sur des notes en Markdown" }, - "version": "1.6.0~ynh3", + "version": "1.6.0~ynh4", "url": "https://github.com/codimd/server", "license": "AGPL-3.0-only", "maintainer": { @@ -28,7 +28,17 @@ "en": "Choose a domain name for CodiMD", "fr": "Choisissez un nom de domaine pour CodiMD" }, - "example": "codimd.domain.org" + "example": "domain.org" + }, + { + "name": "path", + "type": "path", + "ask": { + "en": "Choose a path for CodiMD", + "fr": "Choisissez un chemin pour CodiMD" + }, + "example": "/codimd", + "default": "/codimd" }, { "name": "is_public", diff --git a/scripts/change_url b/scripts/change_url index d9c96f4..573369a 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -28,7 +28,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get --app=$app --key=final_path) -port=$(ynh_app_setting_get --app=$app --key=port) +path_url=$(ynh_app_setting_get --app=$app --key=path) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP diff --git a/scripts/install b/scripts/install index 955d49b..dcaffb3 100644 --- a/scripts/install +++ b/scripts/install @@ -24,7 +24,7 @@ ynh_abort_if_errors #================================================= domain=$YNH_APP_ARG_DOMAIN -path_url="/" +path_url=$YNH_APP_ARG_PATH is_public=$YNH_APP_ARG_IS_PUBLIC app=$YNH_APP_INSTANCE_NAME @@ -146,6 +146,7 @@ ynh_script_progression --message="Modifying a config file..." # Main config File ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="../conf/config.json.example" ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="../conf/config.json.example" +ynh_replace_string --match_string="__PATH__" --replace_string="${path_url:1}" --target_file="../conf/config.json.example" ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_user" --target_file="../conf/config.json.example" ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="../conf/config.json.example" ynh_replace_string --match_string="__DB_PASS__" --replace_string="$db_pwd" --target_file="../conf/config.json.example" diff --git a/scripts/upgrade b/scripts/upgrade index 6910d66..6364774 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -142,6 +142,7 @@ ynh_backup_if_checksum_is_different --file="$final_path/config.json" # Main config File ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="../conf/config.json.example" ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="../conf/config.json.example" +ynh_replace_string --match_string="__PATH__" --replace_string="${path_url:1}" --target_file="../conf/config.json.example" ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_user" --target_file="../conf/config.json.example" ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="../conf/config.json.example" ynh_replace_string --match_string="__DB_PASS__" --replace_string="$db_pwd" --target_file="../conf/config.json.example"