diff --git a/config/nginx/proxy-confs/joplin.subdomain.conf b/config/nginx/proxy-confs/joplin.subdomain.conf index 324b0b8..ca9f410 100644 --- a/config/nginx/proxy-confs/joplin.subdomain.conf +++ b/config/nginx/proxy-confs/joplin.subdomain.conf @@ -1,28 +1,25 @@ ## Version 2021/05/18 -# REMOVE THIS LINE BEFORE SUBMITTING: The structure of the file (all of the existing lines) should be kept as close as possible to this template. -# REMOVE THIS LINE BEFORE SUBMITTING: Look through this file for and replace them. Review other sample files to see how things are done. -# REMOVE THIS LINE BEFORE SUBMITTING: The comment lines at the top of the file (below this line) should explain any prerequisites for using the proxy such as DNS or app settings. -# make sure that your dns has a cname set for and that your container is not using a base url server { listen 443 ssl; listen [::]:443 ssl; - server_name jop.*; + server_name notes.*; include /config/nginx/ssl.conf; + client_max_body_size 0; # enable for ldap auth, fill in ldap details in ldap.conf #include /config/nginx/ldap.conf; # enable for Authelia - #include /config/nginx/authelia-server.conf; + include /config/nginx/authelia-server.conf; - location /joplin { + location / { # enable the next two lines for http auth - #auth_basic "Restricted"; + #auth_basic "Pukeko! Pukeko?"; #auth_basic_user_file /config/nginx/.htpasswd; # enable the next two lines for ldap auth @@ -30,29 +27,14 @@ server { #error_page 401 =200 /ldaplogin; # enable for Authelia - #include /config/nginx/authelia-location.conf; + include /config/nginx/authelia-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_set_header X-Forwarded-Proto $scheme; proxy_pass $upstream_proto://$upstream_app:$upstream_port; - proxy_set_header Host $upstream_proto://$upstream_app:$upstream_port; - - # REMOVE THIS LINE BEFORE SUBMITTING: Additional proxy settings such as headers go below this line, leave the blank line above. - } - - # REMOVE THIS LINE BEFORE SUBMITTING: Some proxies require one or more additional location blocks for things like API or RPC endpoints. - # REMOVE THIS LINE BEFORE SUBMITTING: If the proxy you are making a sample for does not require an additional location block please remove the commented out section below. - location ~ /joplin?/api { - 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; - - # REMOVE THIS LINE BEFORE SUBMITTING: Additional proxy settings such as headers go below this line, leave the blank line above. - } + } } diff --git a/config/nginx/proxy-confs/dillinger.subdomain.conf b/config/nginx/proxy-confs/vikunja.subdomain.conf similarity index 55% rename from config/nginx/proxy-confs/dillinger.subdomain.conf rename to config/nginx/proxy-confs/vikunja.subdomain.conf index 47555e5..b62f0b5 100644 --- a/config/nginx/proxy-confs/dillinger.subdomain.conf +++ b/config/nginx/proxy-confs/vikunja.subdomain.conf @@ -1,25 +1,25 @@ ## Version 2021/05/18 -# make sure that your dns has a cname set for dillinger server { listen 443 ssl; listen [::]:443 ssl; - server_name notes.*; + server_name tasks.*; include /config/nginx/ssl.conf; + client_max_body_size 0; # enable for ldap auth, fill in ldap details in ldap.conf #include /config/nginx/ldap.conf; # enable for Authelia - include /config/nginx/authelia-server.conf; + #include /config/nginx/authelia-server.conf; location / { # enable the next two lines for http auth - #auth_basic "Restricted"; + #auth_basic "Pukeko! Pukeko?"; #auth_basic_user_file /config/nginx/.htpasswd; # enable the next two lines for ldap auth @@ -27,14 +27,23 @@ server { #error_page 401 =200 /ldaplogin; # enable for Authelia - include /config/nginx/authelia-location.conf; + #include /config/nginx/authelia-location.conf; include /config/nginx/proxy.conf; include /config/nginx/resolver.conf; - set $upstream_app dillinger; - set $upstream_port 8080; + set $upstream_app vikunja; + set $upstream_port 80; set $upstream_proto http; + proxy_set_header X-Forwarded-Proto $scheme; proxy_pass $upstream_proto://$upstream_app:$upstream_port; + } + location ~ (/vikunja)?/api/v1 { + include /config/nginx/proxy.conf; + include /config/nginx/resolver.conf; + set $upstream_app vikunja_api; + set $upstream_port 3456; + set $upstream_proto http; + proxy_pass $upstream_proto://$upstream_app:$upstream_port; + } - } } diff --git a/config/nginx/proxy-confs/wekan.subdomain.conf b/config/nginx/proxy-confs/wekan.subdomain.conf deleted file mode 100644 index 08022bb..0000000 --- a/config/nginx/proxy-confs/wekan.subdomain.conf +++ /dev/null @@ -1,57 +0,0 @@ -## Version 2021/05/18 -# REMOVE THIS LINE BEFORE SUBMITTING: The structure of the file (all of the existing lines) should be kept as close as possible to this template. -# REMOVE THIS LINE BEFORE SUBMITTING: Look through this file for and replace them. Review other sample files to see how things are done. -# REMOVE THIS LINE BEFORE SUBMITTING: The comment lines at the top of the file (below this line) should explain any prerequisites for using the proxy such as DNS or app settings. -# make sure that your dns has a cname set for wekan and that your wekan container is not using a base url - -server { - listen 443 ssl; - listen [::]:443 ssl; - - server_name tasks.*; - - include /config/nginx/ssl.conf; - - client_max_body_size 0; - - # enable for ldap auth, fill in ldap details in ldap.conf - #include /config/nginx/ldap.conf; - - # enable for Authelia - include /config/nginx/authelia-server.conf; - - location / { - # enable the next two lines for http auth - #auth_basic "Restricted"; - #auth_basic_user_file /config/nginx/.htpasswd; - - # enable the next two lines for ldap auth - #auth_request /auth; - #error_page 401 =200 /ldaplogin; - - # enable for Authelia - include /config/nginx/authelia-location.conf; - - include /config/nginx/proxy.conf; - include /config/nginx/resolver.conf; - set $upstream_app wekan; - set $upstream_port 8080; - set $upstream_proto http; - proxy_pass $upstream_proto://$upstream_app:$upstream_port; - - # REMOVE THIS LINE BEFORE SUBMITTING: Additional proxy settings such as headers go below this line, leave the blank line above. - } - - # REMOVE THIS LINE BEFORE SUBMITTING: Some proxies require one or more additional location blocks for things like API or RPC endpoints. - # REMOVE THIS LINE BEFORE SUBMITTING: If the proxy you are making a sample for does not require an additional location block please remove the commented out section below. - # location ~ (/wekan)?/api { - # include /config/nginx/proxy.conf; - # include /config/nginx/resolver.conf; - # set $upstream_app wekan; - # set $upstream_port 8080; - # set $upstream_proto http; - # proxy_pass $upstream_proto://$upstream_app:$upstream_port; - # - # # REMOVE THIS LINE BEFORE SUBMITTING: Additional proxy settings such as headers go below this line, leave the blank line above. - # } -} diff --git a/docker-compose.yml b/docker-compose.yml index 8e52246..3e4bb19 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ services: - PGID=1000 - TZ=Asia/Jerusalem - URL=pukeko.xyz #optional - - SUBDOMAINS=cloud,git,photos,stream,vault,wiki,grocy,torrent,ler,pod,sync,tasks,notes,news,secure,flight,monitor,tv,movies,subtitles,index,portain,jop + - SUBDOMAINS=cloud,git,photos,stream,vault,wiki,grocy,torrent,ler,pod,sync,tasks,notes,news,secure,flight,monitor,tv,movies,subtitles,index,portain - VALIDATION=dns - DNSPLUGIN=cloudflare #optional #- PROPAGATION=100 #optional