From 46a592a356c49013863e6b5c3254aef4b6505d39 Mon Sep 17 00:00:00 2001
From: Ogloppi <10729783+Ogloppi@users.noreply.github.com>
Date: Tue, 4 Jun 2024 21:38:58 +0300
Subject: [PATCH 1/2] Create joplin.subdomain.conf.sample

---
 joplin.subdomain.conf.sample | 46 ++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 joplin.subdomain.conf.sample

diff --git a/joplin.subdomain.conf.sample b/joplin.subdomain.conf.sample
new file mode 100644
index 0000000..b829665
--- /dev/null
+++ b/joplin.subdomain.conf.sample
@@ -0,0 +1,46 @@
+## Version 2024/06/04
+# make sure that your joplin container is named joplin
+# make sure that your dns has a cname set for joplin
+
+server {
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
+
+    server_name joplin.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth (requires ldap-location.conf in the location block)
+    #include /config/nginx/ldap-server.conf;
+
+    # enable for Authelia (requires authelia-location.conf in the location block)
+    #include /config/nginx/authelia-server.conf;
+
+    # enable for Authentik (requires authentik-location.conf in the location block)
+    #include /config/nginx/authentik-server.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # enable for ldap auth (requires ldap-server.conf in the server block)
+        #include /config/nginx/ldap-location.conf;
+
+        # enable for Authelia (requires authelia-server.conf in the server block)
+        #include /config/nginx/authelia-location.conf;
+
+        # enable for Authentik (requires authentik-server.conf in the server block)
+        #include /config/nginx/authentik-location.conf;
+
+        include /config/nginx/proxy.conf;
+        include /config/nginx/resolver.conf;
+        set $upstream_app joplin;
+        set $upstream_port 22300;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+    }
+}

From 9e877ab45cbb757c8e4cd8ec0d052ac1673da9b0 Mon Sep 17 00:00:00 2001
From: Ogloppi <10729783+Ogloppi@users.noreply.github.com>
Date: Wed, 24 Jul 2024 13:41:40 +0300
Subject: [PATCH 2/2] Update joplin.subdomain.conf.sample

Co-authored-by: Eric Nemchik <eric@nemchik.com>
---
 joplin.subdomain.conf.sample | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/joplin.subdomain.conf.sample b/joplin.subdomain.conf.sample
index b829665..1334c4d 100644
--- a/joplin.subdomain.conf.sample
+++ b/joplin.subdomain.conf.sample
@@ -3,8 +3,8 @@
 # make sure that your dns has a cname set for joplin
 
 server {
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
+    listen 443 ssl;
+    listen [::]:443 ssl;
 
     server_name joplin.*;