From f6b7122a75f6fd16b50e2acba17b3a93436ff447 Mon Sep 17 00:00:00 2001 From: Robbie Davis Date: Mon, 27 Mar 2023 11:15:17 -0400 Subject: [PATCH 1/3] Adding kavita.subfolder.conf --- kavita.subfolder.conf.sample | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 kavita.subfolder.conf.sample diff --git a/kavita.subfolder.conf.sample b/kavita.subfolder.conf.sample new file mode 100644 index 0000000..e56a4c7 --- /dev/null +++ b/kavita.subfolder.conf.sample @@ -0,0 +1,35 @@ +## Version 2023/03/27 +# Make sure you have set base url via Kavita's web gui as /kavita/ and restarted the Kavita. + +location /kavita { + return 301 $scheme://$host/kavita/; +} + +location ^~ /kavita/ { + # 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; + + include /config/nginx/proxy.conf; + include /config/nginx/resolver.conf; + set $upstream_app kavita; + set $upstream_port 5000 ; + set $upstream_proto http; + proxy_pass $upstream_proto://$upstream_app:$upstream_port; + +} + + location ^~ /kavita/api { + include /config/nginx/proxy.conf; + include /config/nginx/resolver.conf; + set $upstream_app kavita; + set $upstream_port 5000; + set $upstream_proto http; + proxy_pass $upstream_proto://$upstream_app:$upstream_port; + } From 3086558e3cf13f6fdbfb98c08ebb1eaa5ea11a91 Mon Sep 17 00:00:00 2001 From: Robbie Davis Date: Mon, 27 Mar 2023 11:18:08 -0400 Subject: [PATCH 2/3] Updating formatting as per contributing standards --- kavita.subfolder.conf.sample | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/kavita.subfolder.conf.sample b/kavita.subfolder.conf.sample index e56a4c7..6ba3850 100644 --- a/kavita.subfolder.conf.sample +++ b/kavita.subfolder.conf.sample @@ -2,34 +2,34 @@ # Make sure you have set base url via Kavita's web gui as /kavita/ and restarted the Kavita. location /kavita { - return 301 $scheme://$host/kavita/; + return 301 $scheme://$host/kavita/; } location ^~ /kavita/ { - # enable the next two lines for http auth - #auth_basic "Restricted"; - #auth_basic_user_file /config/nginx/.htpasswd; + # 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 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 Authelia (requires authelia-server.conf in the server block) + #include /config/nginx/authelia-location.conf; - include /config/nginx/proxy.conf; - include /config/nginx/resolver.conf; - set $upstream_app kavita; - set $upstream_port 5000 ; - set $upstream_proto http; - proxy_pass $upstream_proto://$upstream_app:$upstream_port; + include /config/nginx/proxy.conf; + include /config/nginx/resolver.conf; + set $upstream_app kavita; + set $upstream_port 5000 ; + set $upstream_proto http; + proxy_pass $upstream_proto://$upstream_app:$upstream_port; } location ^~ /kavita/api { - include /config/nginx/proxy.conf; - include /config/nginx/resolver.conf; - set $upstream_app kavita; - set $upstream_port 5000; - set $upstream_proto http; - proxy_pass $upstream_proto://$upstream_app:$upstream_port; + include /config/nginx/proxy.conf; + include /config/nginx/resolver.conf; + set $upstream_app kavita; + set $upstream_port 5000; + set $upstream_proto http; + proxy_pass $upstream_proto://$upstream_app:$upstream_port; } From 95bc6aba185d81217110b785fab6250e258ea75d Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Thu, 13 Apr 2023 12:49:42 -0500 Subject: [PATCH 3/3] Update kavita.subfolder.conf.sample --- kavita.subfolder.conf.sample | 53 ++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/kavita.subfolder.conf.sample b/kavita.subfolder.conf.sample index 6ba3850..3d365d4 100644 --- a/kavita.subfolder.conf.sample +++ b/kavita.subfolder.conf.sample @@ -1,35 +1,40 @@ -## Version 2023/03/27 -# Make sure you have set base url via Kavita's web gui as /kavita/ and restarted the Kavita. +## Version 2023/04/13 +# make sure that your kavita container is named kavita +# make sure that kavita is set to work with the base url /kavita/ location /kavita { - return 301 $scheme://$host/kavita/; + return 301 $scheme://$host/kavita/; } location ^~ /kavita/ { - # enable the next two lines for http auth - #auth_basic "Restricted"; - #auth_basic_user_file /config/nginx/.htpasswd; + # 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 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 Authelia (requires authelia-server.conf in the server block) + #include /config/nginx/authelia-location.conf; - include /config/nginx/proxy.conf; - include /config/nginx/resolver.conf; - set $upstream_app kavita; - set $upstream_port 5000 ; - set $upstream_proto http; - proxy_pass $upstream_proto://$upstream_app:$upstream_port; + # 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 kavita; + set $upstream_port 5000; + set $upstream_proto http; + proxy_pass $upstream_proto://$upstream_app:$upstream_port; } - location ^~ /kavita/api { - include /config/nginx/proxy.conf; - include /config/nginx/resolver.conf; - set $upstream_app kavita; - set $upstream_port 5000; - set $upstream_proto http; - proxy_pass $upstream_proto://$upstream_app:$upstream_port; - } +location ^~ /kavita/api { + include /config/nginx/proxy.conf; + include /config/nginx/resolver.conf; + set $upstream_app kavita; + set $upstream_port 5000; + set $upstream_proto http; + proxy_pass $upstream_proto://$upstream_app:$upstream_port; + +}