From b35ed33d527c399d72754bd426c7938d3e1592e0 Mon Sep 17 00:00:00 2001
From: nono <np@laquadrature.net>
Date: Fri, 5 Mar 2021 14:41:47 +0100
Subject: [PATCH] Modified nginx configuration and string manipulation
---
files/etc/nginx/hedgedocs-nginx.conf.j2 | 6 +++---
files/hedgedocs.service | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/files/etc/nginx/hedgedocs-nginx.conf.j2 b/files/etc/nginx/hedgedocs-nginx.conf.j2
index eb0cdfc..823e85a 100644
--- a/files/etc/nginx/hedgedocs-nginx.conf.j2
+++ b/files/etc/nginx/hedgedocs-nginx.conf.j2
@@ -3,7 +3,7 @@ map $http_upgrade $connection_upgrade {
'' close;
}
server {
- server_name {{ service_hedgedocs_domain.split("//")[0] | lower }};
+ server_name {{ service_hedgedocs_domain.split(":")[1] | lower }};
location / {
proxy_pass http://127.0.0.1:3000;
@@ -26,8 +26,8 @@ server {
listen [::]:443 ssl http2;
listen 443 ssl http2;
- ssl_certificate /etc/letsencrypt/live/{{ service_hedgedocs_domain.split("//")[0] | lower }}/fullchain.pem;
- ssl_certificate_key /etc/letsencrypt/live/{{ service_hedgedocs_domain.split("//")[0] | lower }}/privkey.pem;
+ ssl_certificate /etc/letsencrypt/live/{{ service_hedgedocs_domain.split(":")[1] | lower }}/fullchain.pem;
+ ssl_certificate_key /etc/letsencrypt/live/{{ service_hedgedocs_domain.split(":")[1] | lower }}/privkey.pem;
# Improve HTTPS performance with session resumption
ssl_session_cache shared:SSL:10m;
diff --git a/files/hedgedocs.service b/files/hedgedocs.service
index b75d2de..2a53923 100644
--- a/files/hedgedocs.service
+++ b/files/hedgedocs.service
@@ -13,7 +13,7 @@ RestartSec=2s
User=hedgedocs
Group=www-data
# the location you cloned CodiMD to.
-WorkingDirectory=/home/hedgedocs
+WorkingDirectory=/home/hedgedocs/hedgedoc
ExecStart=/usr/bin/npm start --production
Restart=always
PrivateTmp=true
--
GitLab