Skip to content

Commit 2af316a

Browse files
PrivatePastaPrivatePasta
authored
Merge branch 'master' into patch-2
2 parents f8fef63 + b431188 commit 2af316a

6 files changed

Lines changed: 278 additions & 187 deletions

‎.github/workflows/check_samples.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v4.0.0
15+
uses: actions/checkout@v4.1.0
1616

1717
- name: Check Allowed File Names
1818
run: |

‎komga.subdomain.conf.sample‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Version 2023/05/31
1+
## Version 2023/09/05
22
# make sure that your komga container is named komga
33
# make sure that your dns has a cname set for komga
44

@@ -38,7 +38,7 @@ server {
3838
include /config/nginx/proxy.conf;
3939
include /config/nginx/resolver.conf;
4040
set $upstream_app komga;
41-
set $upstream_port 8080;
41+
set $upstream_port 25600;
4242
set $upstream_proto http;
4343
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
4444

@@ -48,7 +48,7 @@ server {
4848
include /config/nginx/proxy.conf;
4949
include /config/nginx/resolver.conf;
5050
set $upstream_app komga;
51-
set $upstream_port 8080;
51+
set $upstream_port 25600;
5252
set $upstream_proto http;
5353
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
5454

‎komga.subfolder.conf.sample‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Version 2023/02/05
1+
## Version 2023/09/05
22
# make sure that your komga container is named komga
33
# make sure that komga is set to work with the base url /komga/
44
# First make sure your Container has set an Baseurl set via docker-compose File "envirnoment: SERVER_SERVLET_CONTEXT_PATH=/komga" and recreate the container.
@@ -24,7 +24,7 @@ location ^~ /komga/ {
2424
include /config/nginx/proxy.conf;
2525
include /config/nginx/resolver.conf;
2626
set $upstream_app komga;
27-
set $upstream_port 8080 ;
27+
set $upstream_port 25600 ;
2828
set $upstream_proto http;
2929
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
3030

@@ -34,7 +34,7 @@ location ^~ /komga/api {
3434
include /config/nginx/proxy.conf;
3535
include /config/nginx/resolver.conf;
3636
set $upstream_app komga;
37-
set $upstream_port 8080;
37+
set $upstream_port 25600;
3838
set $upstream_proto http;
3939
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
4040
}

‎nocodb.subdomain.conf.sample‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
## Version 2023/09/28
2+
# make sure that your nocodb container is named nocodb
3+
# make sure that your dns has a cname set for nocodb
4+
5+
server {
6+
listen 443 ssl http2;
7+
listen [::]:443 ssl http2;
8+
9+
server_name nocodb.*;
10+
11+
include /config/nginx/ssl.conf;
12+
13+
client_max_body_size 0;
14+
15+
# enable for ldap auth (requires ldap-location.conf in the location block)
16+
#include /config/nginx/ldap-server.conf;
17+
18+
# enable for Authelia (requires authelia-location.conf in the location block)
19+
#include /config/nginx/authelia-server.conf;
20+
21+
# enable for Authentik (requires authentik-location.conf in the location block)
22+
#include /config/nginx/authentik-server.conf;
23+
24+
location / {
25+
# enable the next two lines for http auth
26+
#auth_basic "Restricted";
27+
#auth_basic_user_file /config/nginx/.htpasswd;
28+
29+
# enable for ldap auth (requires ldap-server.conf in the server block)
30+
#include /config/nginx/ldap-location.conf;
31+
32+
# enable for Authelia (requires authelia-server.conf in the server block)
33+
#include /config/nginx/authelia-location.conf;
34+
35+
# enable for Authentik (requires authentik-server.conf in the server block)
36+
#include /config/nginx/authentik-location.conf;
37+
38+
include /config/nginx/proxy.conf;
39+
include /config/nginx/resolver.conf;
40+
set $upstream_app nocodb;
41+
set $upstream_port 8080;
42+
set $upstream_proto http;
43+
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
44+
}
45+
}

‎qbittorrent.subdomain.conf.sample‎

Lines changed: 113 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1-
## Version 2023/05/31
1+
## Version 2023/10/10
22
# make sure that your qbittorrent container is named qbittorrent
33
# make sure that your dns has a cname set for qbittorrent
4+
# Api and related location bypasses are now commented out by default
5+
# due to users easily misconfiguring qbittorrent to allow
6+
# public access through the api endpoint by including SWAG in
7+
# "Bypass authentication for clients in whitelisted IP subnets",
8+
# which results in all connections through SWAG to be considered
9+
# local and bypassing auth, which also applies to qbittorrent's
10+
# api endpoint (webui api)
11+
# enable at your own risk
412

513
server {
614
listen 443 ssl http2;
@@ -47,93 +55,108 @@ server {
4755
proxy_set_header X-Forwarded-Host $host;
4856
}
4957

50-
location ~ (/qbittorrent)?/api {
51-
include /config/nginx/proxy.conf;
52-
include /config/nginx/resolver.conf;
53-
set $upstream_app qbittorrent;
54-
set $upstream_port 8080;
55-
set $upstream_proto http;
56-
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
57-
58-
rewrite /qbittorrent(.*) $1 break;
59-
60-
proxy_set_header Referer '';
61-
proxy_set_header Host $upstream_app:$upstream_port;
62-
proxy_set_header X-Forwarded-Host $host;
63-
}
64-
65-
location ~ (/qbittorrent)?/command {
66-
include /config/nginx/proxy.conf;
67-
include /config/nginx/resolver.conf;
68-
set $upstream_app qbittorrent;
69-
set $upstream_port 8080;
70-
set $upstream_proto http;
71-
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
72-
73-
rewrite /qbittorrent(.*) $1 break;
74-
75-
proxy_set_header Referer '';
76-
proxy_set_header Host $upstream_app:$upstream_port;
77-
proxy_set_header X-Forwarded-Host $host;
78-
}
79-
80-
location ~ (/qbittorrent)?/query {
81-
include /config/nginx/proxy.conf;
82-
include /config/nginx/resolver.conf;
83-
set $upstream_app qbittorrent;
84-
set $upstream_port 8080;
85-
set $upstream_proto http;
86-
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
87-
88-
rewrite /qbittorrent(.*) $1 break;
89-
90-
proxy_set_header Referer '';
91-
proxy_set_header Host $upstream_app:$upstream_port;
92-
proxy_set_header X-Forwarded-Host $host;
93-
}
94-
95-
location ~ (/qbittorrent)?/login {
96-
include /config/nginx/proxy.conf;
97-
include /config/nginx/resolver.conf;
98-
set $upstream_app qbittorrent;
99-
set $upstream_port 8080;
100-
set $upstream_proto http;
101-
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
102-
103-
rewrite /qbittorrent(.*) $1 break;
104-
105-
proxy_set_header Referer '';
106-
proxy_set_header Host $upstream_app:$upstream_port;
107-
proxy_set_header X-Forwarded-Host $host;
108-
}
109-
110-
location ~ (/qbittorrent)?/sync {
111-
include /config/nginx/proxy.conf;
112-
include /config/nginx/resolver.conf;
113-
set $upstream_app qbittorrent;
114-
set $upstream_port 8080;
115-
set $upstream_proto http;
116-
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
117-
118-
rewrite /qbittorrent(.*) $1 break;
119-
120-
proxy_set_header Referer '';
121-
proxy_set_header Host $upstream_app:$upstream_port;
122-
proxy_set_header X-Forwarded-Host $host;
123-
}
124-
125-
location ~ (/qbittorrent)?/scripts {
126-
include /config/nginx/proxy.conf;
127-
include /config/nginx/resolver.conf;
128-
set $upstream_app qbittorrent;
129-
set $upstream_port 8080;
130-
set $upstream_proto http;
131-
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
132-
133-
rewrite /qbittorrent(.*) $1 break;
134-
135-
proxy_set_header Referer '';
136-
proxy_set_header Host $upstream_app:$upstream_port;
137-
proxy_set_header X-Forwarded-Host $host;
138-
}
58+
# location ~ (/qbittorrent)?/api {
59+
# include /config/nginx/proxy.conf;
60+
# include /config/nginx/resolver.conf;
61+
# set $upstream_app qbittorrent;
62+
# set $upstream_port 8080;
63+
# set $upstream_proto http;
64+
# proxy_pass $upstream_proto://$upstream_app:$upstream_port;
65+
66+
# rewrite /qbittorrent(.*) $1 break;
67+
68+
# proxy_set_header Referer '';
69+
# proxy_set_header Host $upstream_app:$upstream_port;
70+
# proxy_set_header X-Forwarded-Host $host;
71+
# }
72+
73+
# location ~ (/qbittorrent)?/command {
74+
# include /config/nginx/proxy.conf;
75+
# include /config/nginx/resolver.conf;
76+
# set $upstream_app qbittorrent;
77+
# set $upstream_port 8080;
78+
# set $upstream_proto http;
79+
# proxy_pass $upstream_proto://$upstream_app:$upstream_port;
80+
81+
# rewrite /qbittorrent(.*) $1 break;
82+
83+
# proxy_set_header Referer '';
84+
# proxy_set_header Host $upstream_app:$upstream_port;
85+
# proxy_set_header X-Forwarded-Host $host;
86+
# }
87+
88+
# location ~ (/qbittorrent)?/css {
89+
# include /config/nginx/proxy.conf;
90+
# include /config/nginx/resolver.conf;
91+
# set $upstream_app qbittorrent;
92+
# set $upstream_port 8080;
93+
# set $upstream_proto http;
94+
# proxy_pass $upstream_proto://$upstream_app:$upstream_port;
95+
96+
# rewrite /qbittorrent(.*) $1 break;
97+
98+
# proxy_set_header Referer '';
99+
# proxy_set_header Host $upstream_app:$upstream_port;
100+
# proxy_set_header X-Forwarded-Host $host;
101+
# }
102+
103+
# location ~ (/qbittorrent)?/query {
104+
# include /config/nginx/proxy.conf;
105+
# include /config/nginx/resolver.conf;
106+
# set $upstream_app qbittorrent;
107+
# set $upstream_port 8080;
108+
# set $upstream_proto http;
109+
# proxy_pass $upstream_proto://$upstream_app:$upstream_port;
110+
111+
# rewrite /qbittorrent(.*) $1 break;
112+
113+
# proxy_set_header Referer '';
114+
# proxy_set_header Host $upstream_app:$upstream_port;
115+
# proxy_set_header X-Forwarded-Host $host;
116+
# }
117+
118+
# location ~ (/qbittorrent)?/login {
119+
# include /config/nginx/proxy.conf;
120+
# include /config/nginx/resolver.conf;
121+
# set $upstream_app qbittorrent;
122+
# set $upstream_port 8080;
123+
# set $upstream_proto http;
124+
# proxy_pass $upstream_proto://$upstream_app:$upstream_port;
125+
126+
# rewrite /qbittorrent(.*) $1 break;
127+
128+
# proxy_set_header Referer '';
129+
# proxy_set_header Host $upstream_app:$upstream_port;
130+
# proxy_set_header X-Forwarded-Host $host;
131+
# }
132+
133+
# location ~ (/qbittorrent)?/sync {
134+
# include /config/nginx/proxy.conf;
135+
# include /config/nginx/resolver.conf;
136+
# set $upstream_app qbittorrent;
137+
# set $upstream_port 8080;
138+
# set $upstream_proto http;
139+
# proxy_pass $upstream_proto://$upstream_app:$upstream_port;
140+
141+
# rewrite /qbittorrent(.*) $1 break;
142+
143+
# proxy_set_header Referer '';
144+
# proxy_set_header Host $upstream_app:$upstream_port;
145+
# proxy_set_header X-Forwarded-Host $host;
146+
# }
147+
148+
# location ~ (/qbittorrent)?/scripts {
149+
# include /config/nginx/proxy.conf;
150+
# include /config/nginx/resolver.conf;
151+
# set $upstream_app qbittorrent;
152+
# set $upstream_port 8080;
153+
# set $upstream_proto http;
154+
# proxy_pass $upstream_proto://$upstream_app:$upstream_port;
155+
156+
# rewrite /qbittorrent(.*) $1 break;
157+
158+
# proxy_set_header Referer '';
159+
# proxy_set_header Host $upstream_app:$upstream_port;
160+
# proxy_set_header X-Forwarded-Host $host;
161+
# }
139162
}

0 commit comments

Comments
 (0)