Skip to content

Commit 07b57f7

Browse files
FindaratoFindarato
authored
Merge pull request #2 from linuxserver/master
[pull] master from linuxserver:master
2 parents 31a3901 + 8ea6907 commit 07b57f7

22 files changed

+739
-317
lines changed

‎.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.1
1616

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

‎bitwarden.subdomain.conf.sample‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
## Version 2023/05/31
1+
## Version 2023/11/12
22
# make sure that your bitwarden container is named bitwarden
33
# make sure that your dns has a cname set for bitwarden
4-
# set the environment variable WEBSOCKET_ENABLED=true on your bitwarden container
4+
# if you are using bitwarden (the official image), use the bitwarden conf
5+
# if you are using vaultwarden (an unofficial implementation), use the vaultwarden conf
6+
#
7+
# bitwarden defaults to port 8080 and can be changed using the environment variable BW_PORT_HTTP on the bitwarden container
58

69
server {
710
listen 443 ssl http2;
@@ -39,7 +42,7 @@ server {
3942
include /config/nginx/proxy.conf;
4043
include /config/nginx/resolver.conf;
4144
set $upstream_app bitwarden;
42-
set $upstream_port 80;
45+
set $upstream_port 8080;
4346
set $upstream_proto http;
4447
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
4548

@@ -62,7 +65,7 @@ server {
6265
include /config/nginx/proxy.conf;
6366
include /config/nginx/resolver.conf;
6467
set $upstream_app bitwarden;
65-
set $upstream_port 80;
68+
set $upstream_port 8080;
6669
set $upstream_proto http;
6770
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
6871

@@ -72,7 +75,7 @@ server {
7275
include /config/nginx/proxy.conf;
7376
include /config/nginx/resolver.conf;
7477
set $upstream_app bitwarden;
75-
set $upstream_port 80;
78+
set $upstream_port 8080;
7679
set $upstream_proto http;
7780
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
7881

@@ -82,17 +85,7 @@ server {
8285
include /config/nginx/proxy.conf;
8386
include /config/nginx/resolver.conf;
8487
set $upstream_app bitwarden;
85-
set $upstream_port 3012;
86-
set $upstream_proto http;
87-
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
88-
89-
}
90-
91-
location ~ (/bitwarden)?/notifications/hub/negotiate {
92-
include /config/nginx/proxy.conf;
93-
include /config/nginx/resolver.conf;
94-
set $upstream_app bitwarden;
95-
set $upstream_port 80;
88+
set $upstream_port 8080;
9689
set $upstream_proto http;
9790
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
9891

‎bitwarden.subfolder.conf.sample‎

Lines changed: 0 additions & 86 deletions
This file was deleted.

‎grampsweb.subdomain.conf.sample‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
## Version 2023/10/15
2+
# make sure that your grampsweb container is named grampsweb
3+
# make sure that your dns has a cname set for grampsweb
4+
5+
server {
6+
listen 443 ssl http2;
7+
listen [::]:443 ssl http2;
8+
9+
server_name grampsweb.*;
10+
11+
include /config/nginx/ssl.conf;
12+
13+
client_max_body_size 500m;
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 grampsweb;
41+
set $upstream_port 5000;
42+
set $upstream_proto http;
43+
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
44+
45+
}
46+
47+
location ~ (/grampsweb)?/api {
48+
include /config/nginx/proxy.conf;
49+
include /config/nginx/resolver.conf;
50+
set $upstream_app grampsweb;
51+
set $upstream_port 5000;
52+
set $upstream_proto http;
53+
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
54+
55+
}
56+
}

‎homebox.subdomain.conf.sample‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
## Version 2023/10/21
2+
# make sure that your homebox container is named homebox
3+
# make sure that your dns has a cname set for homebox
4+
5+
server {
6+
listen 443 ssl http2;
7+
listen [::]:443 ssl http2;
8+
9+
server_name homebox.*;
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 homebox;
41+
set $upstream_port 7745;
42+
set $upstream_proto http;
43+
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
44+
45+
}
46+
47+
location ~ (/homebox)?/api {
48+
include /config/nginx/proxy.conf;
49+
include /config/nginx/resolver.conf;
50+
set $upstream_app homebox;
51+
set $upstream_port 7745;
52+
set $upstream_proto http;
53+
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
54+
55+
}
56+
}

‎immich.subdomain.conf.sample‎

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

‎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
}

0 commit comments

Comments
 (0)