Skip to content

Commit 1161460

Browse files
roib20roib20
authored
Merge branch 'linuxserver:master' into jfa-go
2 parents 006fc06 + 79a256c commit 1161460

7 files changed

Lines changed: 222 additions & 12 deletions

‎.github/workflows/call-issue-pr-tracker.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Issue & PR Tracker
2+
3+
on:
4+
issues:
5+
types: [opened,reopened,labeled,unlabeled]
6+
pull_request_target:
7+
types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled]
8+
9+
jobs:
10+
manage-project:
11+
permissions:
12+
issues: write
13+
uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1
14+
secrets: inherit

‎.github/workflows/call_invalid_helper.yml‎

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

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
!.editorconfig
66
!.gitattributes
77
!.github
8+
!.github/**
89
!.gitignore
910
!*.conf.sample
1011
!LICENSE

‎fenrus.subdomain.conf.sample‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
## Version 2023/03/11
2+
# make sure that your fenrus container is named fenrus
3+
# make sure that your dns has a cname set for fenrus
4+
5+
server {
6+
listen 443 ssl;
7+
listen [::]:443 ssl;
8+
9+
server_name fenrus.*;
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 fenrus;
41+
set $upstream_port 3000;
42+
set $upstream_proto http;
43+
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
44+
}
45+
}

‎grav.subdomain.conf.sample‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
## Version 2023/03/17
2+
# make sure that your grav container is named grav
3+
# make sure that your dns has a cname set for grav
4+
5+
server {
6+
listen 443 ssl;
7+
listen [::]:443 ssl;
8+
9+
server_name grav.*;
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 grav;
41+
set $upstream_port 80;
42+
set $upstream_proto http;
43+
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
44+
45+
}
46+
47+
}

‎nexusoss.subdomain.conf.sample‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
## Version 2023/03/05
2+
# make sure that your nexusoss container is named nexusoss
3+
# make sure that your dns has a cname set for nexusoss
4+
# make sure that the port for the nexusoss container 8081 (the first location "/")
5+
# make sure that the HTTP Connector port for the hosted docker repository is 8082 (the second location "/v2/")
6+
7+
server {
8+
listen 443 ssl;
9+
listen [::]:443 ssl;
10+
11+
server_name nexusoss.*;
12+
13+
include /config/nginx/ssl.conf;
14+
15+
client_max_body_size 0;
16+
17+
# enable for ldap auth (requires ldap-location.conf in the location block)
18+
#include /config/nginx/ldap-server.conf;
19+
20+
# enable for Authelia (requires authelia-location.conf in the location block)
21+
#include /config/nginx/authelia-server.conf;
22+
23+
# enable for Authentik (requires authentik-location.conf in the location block)
24+
#include /config/nginx/authentik-server.conf;
25+
26+
location / {
27+
# enable the next two lines for http auth
28+
#auth_basic "Restricted";
29+
#auth_basic_user_file /config/nginx/.htpasswd;
30+
31+
# enable for ldap auth (requires ldap-server.conf in the server block)
32+
#include /config/nginx/ldap-location.conf;
33+
34+
# enable for Authelia (requires authelia-server.conf in the server block)
35+
#include /config/nginx/authelia-location.conf;
36+
37+
# enable for Authentik (requires authentik-server.conf in the server block)
38+
#include /config/nginx/authentik-location.conf;
39+
40+
include /config/nginx/proxy.conf;
41+
include /config/nginx/resolver.conf;
42+
set $upstream_app nexusoss;
43+
set $upstream_port 8081;
44+
set $upstream_proto http;
45+
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
46+
}
47+
48+
location /v2/ {
49+
# enable the next two lines for http auth
50+
#auth_basic "Restricted";
51+
#auth_basic_user_file /config/nginx/.htpasswd;
52+
53+
# enable for ldap auth (requires ldap-server.conf in the server block)
54+
#include /config/nginx/ldap-location.conf;
55+
56+
# enable for Authelia (requires authelia-server.conf in the server block)
57+
#include /config/nginx/authelia-location.conf;
58+
59+
# enable for Authentik (requires authentik-server.conf in the server block)
60+
#include /config/nginx/authentik-location.conf;
61+
62+
include /config/nginx/proxy.conf;
63+
include /config/nginx/resolver.conf;
64+
set $upstream_app nexusoss;
65+
set $upstream_port 8082;
66+
set $upstream_proto http;
67+
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
68+
}
69+
}

‎wordpress.subdomain.conf.sample‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
## Version 2023/03/12
2+
# make sure that your wordpress container is named wordpress
3+
# make sure that your dns has a cname set for wordpress
4+
5+
server {
6+
listen 443 ssl;
7+
listen [::]:443 ssl;
8+
9+
server_name wordpress.*;
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 wordpress;
41+
set $upstream_port 80;
42+
set $upstream_proto http;
43+
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
44+
45+
}
46+
}

0 commit comments

Comments
 (0)