Skip to content

Commit 62c721d

Browse files
nemchiknemchik
authored
Merge branch 'master' into cadvisor-endpoints
2 parents 9949018 + 1f670f3 commit 62c721d

18 files changed

Lines changed: 572 additions & 110 deletions

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ name: Issue & PR Tracker
22

33
on:
44
issues:
5-
types: [opened,reopened,labeled,unlabeled]
5+
types: [opened,reopened,labeled,unlabeled,closed]
66
pull_request_target:
7-
types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled]
7+
types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed]
8+
pull_request_review:
9+
types: [submitted,edited,dismissed]
810

911
jobs:
1012
manage-project:

‎.github/workflows/check_samples.yml‎

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

1313
steps:
1414
- name: Checkout
15-
uses: actions/[email protected].0
15+
uses: actions/[email protected].2
1616

1717
- name: Check Allowed File Names
1818
run: |
@@ -58,3 +58,24 @@ jobs:
5858
done
5959
exit 1
6060
fi
61+
62+
- name: Check Nginx Conf Validity
63+
run: |
64+
curl -fsL "https://raw.githubusercontent.com/linuxserver/docker-swag/master/root/defaults/nginx/proxy.conf.sample" -o proxy.conf
65+
docker run -d --rm --name nginx -v "${GITHUB_WORKSPACE}:/testconfs:ro" ghcr.io/linuxserver/nginx
66+
sleep 5
67+
docker exec nginx bash -c "\
68+
mkdir -p /config/nginx/proxy-confs && \
69+
cp /testconfs/*.conf.sample /config/nginx/proxy-confs/ && \
70+
cp /testconfs/proxy.conf /config/nginx/ && \
71+
rm -rf /config/nginx/proxy-confs/{_template.sub*,heimdall.subf*,boinc.subf*,organizr.subf*,wordpress.subf*} && \
72+
echo 'include /config/nginx/proxy-confs/*.subdomain.conf.sample;' >> /config/nginx/site-confs/default.conf && \
73+
sed -i -r 's|(root \\\$root;)|\1\ninclude /config/nginx/proxy-confs/*.subfolder.conf.sample;|' /config/nginx/site-confs/default.conf"
74+
VALIDITY=$(docker exec nginx nginx -t 2>&1) || :
75+
echo "${VALIDITY}"
76+
echo "${VALIDITY}" >> $GITHUB_STEP_SUMMARY
77+
if ! docker exec nginx nginx -t >/dev/null 2>&1; then
78+
docker stop nginx
79+
exit 1
80+
fi
81+
docker stop nginx

‎authelia.subdomain.conf.sample‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
## Version 2023/02/12
1+
## Version 2023/04/29
22
# make sure that your authelia container is named authelia
33
# make sure that your dns has a cname set for authelia
4-
# the default authelia-server and authelia-location confs included with swag rely on
5-
# a built-in subfolder proxy at "/authelia" and enabling this proxy conf is not necessary.
6-
# But if you'd like to use authelia via subdomain, you can enable this proxy and set
7-
# the $authelia_backed variable in the authelia-server.conf.
84

95
server {
106
listen 443 ssl;
@@ -36,22 +32,4 @@ server {
3632
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
3733

3834
}
39-
40-
location ~ (/authelia)?/metrics {
41-
# enable the next two lines for http auth
42-
#auth_basic "Restricted";
43-
#auth_basic_user_file /config/nginx/.htpasswd;
44-
45-
# block metrics access by default because it is unprotected
46-
# you can comment out the next line to enable remote metrics
47-
deny all;
48-
49-
include /config/nginx/proxy.conf;
50-
include /config/nginx/resolver.conf;
51-
set $upstream_app authelia;
52-
set $upstream_port 9959;
53-
set $upstream_proto http;
54-
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
55-
56-
}
5735
}

‎authentik.subdomain.conf.sample‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Version 2023/02/12
1+
## Version 2023/04/14
22
# make sure that your authentik container is named authentik-server
33
# make sure that your dns has a cname set for authentik
44

@@ -32,22 +32,4 @@ server {
3232
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
3333

3434
}
35-
36-
location ~ (/authentik)?/metrics {
37-
# enable the next two lines for http auth
38-
#auth_basic "Restricted";
39-
#auth_basic_user_file /config/nginx/.htpasswd;
40-
41-
# block metrics access by default because it is unprotected
42-
# you can comment out the next line to enable remote metrics
43-
deny all;
44-
45-
include /config/nginx/proxy.conf;
46-
include /config/nginx/resolver.conf;
47-
set $upstream_app authentik-server;
48-
set $upstream_port 9300;
49-
set $upstream_proto http;
50-
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
51-
52-
}
5335
}

‎dsmrreader.subdomain.conf.sample‎

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

‎duplicacy.subdomain.conf.sample‎

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

‎esphome.subdomain.conf.sample‎

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

‎grafana.subdomain.conf.sample‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Version 2023/02/12
1+
## Version 2023/04/20
22
# make sure that your grafana container is named grafana
33
# make sure that your dns has a cname set for grafana
44

@@ -55,23 +55,8 @@ server {
5555
set $upstream_proto http;
5656
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
5757

58-
}
59-
60-
location ~ (/grafana)?/metrics {
61-
# enable the next two lines for http auth
62-
#auth_basic "Restricted";
63-
#auth_basic_user_file /config/nginx/.htpasswd;
64-
65-
# block metrics access by default because it is unprotected
66-
# you can comment out the next line to enable remote metrics
67-
deny all;
68-
69-
include /config/nginx/proxy.conf;
70-
include /config/nginx/resolver.conf;
71-
set $upstream_app grafana;
72-
set $upstream_port 3000;
73-
set $upstream_proto http;
74-
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
58+
# Clear Authorization Header if you are using http auth and normal Grafana auth
59+
#proxy_set_header Authorization "";
7560

7661
}
7762
}

‎grafana.subfolder.conf.sample‎

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Version 2023/02/12
1+
## Version 2023/04/20
22
# make sure that your grafana container is named grafana
33
# make sure that grafana is set to work with the base url /grafana/
44
# grafana requires environment variables set thus:
@@ -22,10 +22,10 @@ location ^~ /grafana/ {
2222

2323
include /config/nginx/proxy.conf;
2424
include /config/nginx/resolver.conf;
25-
set $upstream_grafana grafana;
25+
set $upstream_app grafana;
2626
set $upstream_port 3000;
2727
set $upstream_proto http;
28-
proxy_pass http://$upstream_grafana:$upstream_port ;
28+
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
2929

3030
# Clear Authorization Header if you are using http auth and normal Grafana auth
3131
#proxy_set_header Authorization "";
@@ -37,33 +37,10 @@ location ^~ /grafana/ {
3737
location ^~ /grafana/api {
3838
include /config/nginx/proxy.conf;
3939
include /config/nginx/resolver.conf;
40-
set $upstream_grafana grafana;
40+
set $upstream_app grafana;
4141
set $upstream_port 3000;
4242
set $upstream_proto http;
43-
proxy_pass http://$upstream_grafana:$upstream_port ;
44-
45-
# Clear Authorization Header if you are using http auth and normal Grafana auth
46-
#proxy_set_header Authorization "";
47-
48-
rewrite ^/grafana/(.*)$ /$1 break;
49-
50-
}
51-
52-
location ^~ /grafana/metrics {
53-
# enable the next two lines for http auth
54-
#auth_basic "Restricted";
55-
#auth_basic_user_file /config/nginx/.htpasswd;
56-
57-
# block metrics access by default because it is unprotected
58-
# you can comment out the next line to enable remote metrics
59-
deny all;
60-
61-
include /config/nginx/proxy.conf;
62-
include /config/nginx/resolver.conf;
63-
set $upstream_grafana grafana;
64-
set $upstream_port 3000;
65-
set $upstream_proto http;
66-
proxy_pass http://$upstream_grafana:$upstream_port ;
43+
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
6744

6845
# Clear Authorization Header if you are using http auth and normal Grafana auth
6946
#proxy_set_header Authorization "";

‎homarr.subdomain.conf.sample‎

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

0 commit comments

Comments
 (0)