Skip to content

Commit b1ae121

Browse files
nemchiknemchik
committed
Fix indentation
1 parent d77a64a commit b1ae121

File tree

6 files changed

+411
-411
lines changed

6 files changed

+411
-411
lines changed

‎root/defaults/default‎

Lines changed: 88 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -4,149 +4,149 @@ error_page 502 /502.html;
44

55
# redirect all traffic to https
66
server {
7-
listen 80 default_server;
8-
listen [::]:80 default_server;
9-
server_name _;
10-
return 301 https://$host$request_uri;
7+
listen 80 default_server;
8+
listen [::]:80 default_server;
9+
server_name _;
10+
return 301 https://$host$request_uri;
1111
}
1212

1313
# main server block
1414
server {
15-
listen 443 ssl http2 default_server;
16-
listen [::]:443 ssl http2 default_server;
15+
listen 443 ssl http2 default_server;
16+
listen [::]:443 ssl http2 default_server;
1717

18-
root /config/www;
19-
index index.html index.htm index.php;
18+
root /config/www;
19+
index index.html index.htm index.php;
2020

21-
server_name _;
21+
server_name _;
2222

23-
# enable subfolder method reverse proxy confs
24-
include /config/nginx/proxy-confs/*.subfolder.conf;
23+
# enable subfolder method reverse proxy confs
24+
include /config/nginx/proxy-confs/*.subfolder.conf;
2525

26-
# all ssl related config moved to ssl.conf
27-
include /config/nginx/ssl.conf;
26+
# all ssl related config moved to ssl.conf
27+
include /config/nginx/ssl.conf;
2828

29-
# enable for ldap auth
30-
#include /config/nginx/ldap.conf;
29+
# enable for ldap auth
30+
#include /config/nginx/ldap.conf;
3131

32-
# enable for Authelia
33-
#include /config/nginx/authelia-server.conf;
32+
# enable for Authelia
33+
#include /config/nginx/authelia-server.conf;
3434

35-
# enable for geo blocking
36-
# See /config/nginx/geoip2.conf for more information.
37-
#if ($allowed_country = no) {
38-
#return 444;
39-
#}
35+
# enable for geo blocking
36+
# See /config/nginx/geoip2.conf for more information.
37+
#if ($allowed_country = no) {
38+
#return 444;
39+
#}
4040

41-
client_max_body_size 0;
41+
client_max_body_size 0;
4242

43-
location / {
44-
try_files $uri $uri/ /index.html /index.php?$args =404;
45-
}
43+
location / {
44+
try_files $uri $uri/ /index.html /index.php?$args =404;
45+
}
4646

47-
location ~ \.php$ {
48-
fastcgi_split_path_info ^(.+\.php)(/.+)$;
49-
fastcgi_pass 127.0.0.1:9000;
50-
fastcgi_index index.php;
51-
include /etc/nginx/fastcgi_params;
52-
}
47+
location ~ \.php$ {
48+
fastcgi_split_path_info ^(.+\.php)(/.+)$;
49+
fastcgi_pass 127.0.0.1:9000;
50+
fastcgi_index index.php;
51+
include /etc/nginx/fastcgi_params;
52+
}
5353

5454
# sample reverse proxy config for password protected couchpotato running at IP 192.168.1.50 port 5050 with base url "cp"
5555
# notice this is within the same server block as the base
5656
# don't forget to generate the .htpasswd file as described on docker hub
57-
# location ^~ /cp {
58-
# auth_basic "Restricted";
59-
# auth_basic_user_file /config/nginx/.htpasswd;
60-
# include /config/nginx/proxy.conf;
61-
# proxy_pass http://192.168.1.50:5050/cp;
62-
# }
57+
# location ^~ /cp {
58+
# auth_basic "Restricted";
59+
# auth_basic_user_file /config/nginx/.htpasswd;
60+
# include /config/nginx/proxy.conf;
61+
# proxy_pass http://192.168.1.50:5050/cp;
62+
# }
6363

6464
}
6565

6666
# sample reverse proxy config without url base, but as a subdomain "cp", ip and port same as above
6767
# notice this is a new server block, you need a new server block for each subdomain
6868
#server {
69-
# listen 443 ssl http2;
70-
# listen [::]:443 ssl http2;
69+
# listen 443 ssl http2;
70+
# listen [::]:443 ssl http2;
7171
#
72-
# root /config/www;
73-
# index index.html index.htm index.php;
72+
# root /config/www;
73+
# index index.html index.htm index.php;
7474
#
75-
# server_name cp.*;
75+
# server_name cp.*;
7676
#
77-
# include /config/nginx/ssl.conf;
77+
# include /config/nginx/ssl.conf;
7878
#
79-
# client_max_body_size 0;
79+
# client_max_body_size 0;
8080
#
81-
# location / {
82-
# auth_basic "Restricted";
83-
# auth_basic_user_file /config/nginx/.htpasswd;
84-
# include /config/nginx/proxy.conf;
85-
# proxy_pass http://192.168.1.50:5050;
86-
# }
81+
# location / {
82+
# auth_basic "Restricted";
83+
# auth_basic_user_file /config/nginx/.htpasswd;
84+
# include /config/nginx/proxy.conf;
85+
# proxy_pass http://192.168.1.50:5050;
86+
# }
8787
#}
8888

8989
# sample reverse proxy config for "heimdall" via subdomain, with ldap authentication
9090
# ldap-auth container has to be running and the /config/nginx/ldap.conf file should be filled with ldap info
9191
# notice this is a new server block, you need a new server block for each subdomain
9292
#server {
93-
# listen 443 ssl http2;
94-
# listen [::]:443 ssl http2;
93+
# listen 443 ssl http2;
94+
# listen [::]:443 ssl http2;
9595
#
96-
# root /config/www;
97-
# index index.html index.htm index.php;
96+
# root /config/www;
97+
# index index.html index.htm index.php;
9898
#
99-
# server_name heimdall.*;
99+
# server_name heimdall.*;
100100
#
101-
# include /config/nginx/ssl.conf;
101+
# include /config/nginx/ssl.conf;
102102
#
103-
# include /config/nginx/ldap.conf;
103+
# include /config/nginx/ldap.conf;
104104
#
105-
# client_max_body_size 0;
105+
# client_max_body_size 0;
106106
#
107-
# location / {
108-
# # the next two lines will enable ldap auth along with the included ldap.conf in the server block
109-
# auth_request /auth;
110-
# error_page 401 =200 /ldaplogin;
107+
# location / {
108+
# # the next two lines will enable ldap auth along with the included ldap.conf in the server block
109+
# auth_request /auth;
110+
# error_page 401 =200 /ldaplogin;
111111
#
112-
# include /config/nginx/proxy.conf;
113-
# resolver 127.0.0.11 valid=30s;
114-
# set $upstream_app heimdall;
115-
# set $upstream_port 443;
116-
# set $upstream_proto https;
117-
# proxy_pass $upstream_proto://$upstream_app:$upstream_port;
118-
# }
112+
# include /config/nginx/proxy.conf;
113+
# resolver 127.0.0.11 valid=30s;
114+
# set $upstream_app heimdall;
115+
# set $upstream_port 443;
116+
# set $upstream_proto https;
117+
# proxy_pass $upstream_proto://$upstream_app:$upstream_port;
118+
# }
119119
#}
120120

121121
# sample reverse proxy config for "heimdall" via subdomain, with Authelia
122122
# Authelia container has to be running in the same user defined bridge network, with container name "authelia", and with 'path: "authelia"' set in its configuration.yml
123123
# notice this is a new server block, you need a new server block for each subdomain
124124
#server {
125-
# listen 443 ssl http2;
126-
# listen [::]:443 ssl http2;
125+
# listen 443 ssl http2;
126+
# listen [::]:443 ssl http2;
127127
#
128-
# root /config/www;
129-
# index index.html index.htm index.php;
128+
# root /config/www;
129+
# index index.html index.htm index.php;
130130
#
131-
# server_name heimdall.*;
131+
# server_name heimdall.*;
132132
#
133-
# include /config/nginx/ssl.conf;
133+
# include /config/nginx/ssl.conf;
134134
#
135-
# include /config/nginx/authelia-server.conf;
135+
# include /config/nginx/authelia-server.conf;
136136
#
137-
# client_max_body_size 0;
137+
# client_max_body_size 0;
138138
#
139-
# location / {
140-
# # the next line will enable Authelia along with the included authelia-server.conf in the server block
141-
# include /config/nginx/authelia-location.conf;
139+
# location / {
140+
# # the next line will enable Authelia along with the included authelia-server.conf in the server block
141+
# include /config/nginx/authelia-location.conf;
142142
#
143-
# include /config/nginx/proxy.conf;
144-
# resolver 127.0.0.11 valid=30s;
145-
# set $upstream_app heimdall;
146-
# set $upstream_port 443;
147-
# set $upstream_proto https;
148-
# proxy_pass $upstream_proto://$upstream_app:$upstream_port;
149-
# }
143+
# include /config/nginx/proxy.conf;
144+
# resolver 127.0.0.11 valid=30s;
145+
# set $upstream_app heimdall;
146+
# set $upstream_port 443;
147+
# set $upstream_proto https;
148+
# proxy_pass $upstream_proto://$upstream_app:$upstream_port;
149+
# }
150150
#}
151151

152152
# enable subdomain method reverse proxy confs

‎root/defaults/geoip2.conf‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,22 @@ geo $allow_list {
5151
# Add the following if statements inside any server context where you want to geo block countries.
5252

5353
########################################
54-
# if ($allow_list = yes) {
55-
# set $allowed_country yes;
56-
# }
57-
# if ($allowed_country = no) {
58-
# return 444;
59-
# }
54+
# if ($allow_list = yes) {
55+
# set $allowed_country yes;
56+
# }
57+
# if ($allowed_country = no) {
58+
# return 444;
59+
# }
6060
#########################################
6161

6262
# Add the following if statements inside any server context where you want to geo block cities.
6363
########################################
64-
# if ($allow_list = yes) {
65-
# set $allowed_country yes;
66-
# }
67-
# if ($allowed_city = no) {
68-
# return 444;
69-
# }
64+
# if ($allow_list = yes) {
65+
# set $allowed_country yes;
66+
# }
67+
# if ($allowed_city = no) {
68+
# return 444;
69+
# }
7070
#########################################
7171

7272
# Example using a config from proxy-confs
@@ -90,12 +90,12 @@ geo $allow_list {
9090

9191
# # Allow lan access if default is set to no
9292
# if ($allow_list = yes) {
93-
# set $allowed_country yes;
93+
# set $allowed_country yes;
9494
# }
95-
# # Country geo block
96-
# if ($allowed_country = no) {
95+
# # Country geo block
96+
# if ($allowed_country = no) {
9797
# return 444;
98-
# }
98+
# }
9999

100100

101101
#

0 commit comments

Comments
 (0)