File tree Expand file tree Collapse file tree 15 files changed +1110
-628
lines changed Expand file tree Collapse file tree 15 files changed +1110
-628
lines changed Original file line number Diff line number Diff line change 1
- 2.2.1
1
+ 2.2.2
Original file line number Diff line number Diff line change 1
1
<p align =" center " >
2
2
<img src =" https://nginxproxymanager.com/github.png " >
3
3
<br ><br >
4
- <img src =" https://img.shields.io/badge/version-2.2.1 -green.svg?style=for-the-badge " >
4
+ <img src =" https://img.shields.io/badge/version-2.2.2 -green.svg?style=for-the-badge " >
5
5
<a href =" https://hub.docker.com/repository/docker/jc21/nginx-proxy-manager " >
6
6
<img src="https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge">
7
7
</a >
Original file line number Diff line number Diff line change @@ -4,3 +4,5 @@ yarn-error.log
4
4
tmp
5
5
certbot.log
6
6
node_modules
7
+ core. *
8
+
Original file line number Diff line number Diff line change @@ -224,6 +224,9 @@ const internalNginx = {
224
224
locationsPromise = Promise . resolve ( ) ;
225
225
}
226
226
227
+ // Set the IPv6 setting for the host
228
+ host . ipv6 = internalNginx . ipv6Enabled ( ) ;
229
+
227
230
locationsPromise . then ( ( ) => {
228
231
renderEngine
229
232
. parseAndRender ( template , host )
@@ -396,6 +399,18 @@ const internalNginx = {
396
399
*/
397
400
advancedConfigHasDefaultLocation : function ( config ) {
398
401
return ! ! config . match ( / ^ (?: .* ; ) ? \s * ?l o c a t i o n \s * ?\/ \s * ?{ / im) ;
402
+ } ,
403
+
404
+ /**
405
+ * @returns {boolean }
406
+ */
407
+ ipv6Enabled : function ( ) {
408
+ if ( typeof process . env . DISABLE_IPV6 !== 'undefined' ) {
409
+ const disabled = process . env . DISABLE_IPV6 . toLowerCase ( ) ;
410
+ return ! ( disabled === 'on' || disabled === 'true' || disabled === '1' || disabled === 'yes' ) ;
411
+ }
412
+
413
+ return true ;
399
414
}
400
415
} ;
401
416
Original file line number Diff line number Diff line change 4
4
"description" : " A beautiful interface for creating Nginx endpoints" ,
5
5
"main" : " js/index.js" ,
6
6
"dependencies" : {
7
- "ajv" : " ^6.11 .0" ,
7
+ "ajv" : " ^6.12 .0" ,
8
8
"batchflow" : " ^0.4.0" ,
9
- "bcrypt" : " ^3 .0.8 " ,
9
+ "bcrypt" : " ^4 .0.1 " ,
10
10
"body-parser" : " ^1.19.0" ,
11
11
"compression" : " ^1.7.4" ,
12
- "config" : " ^3.2.5 " ,
12
+ "config" : " ^3.3.1 " ,
13
13
"diskdb" : " ^0.1.17" ,
14
14
"express" : " ^4.17.1" ,
15
15
"express-fileupload" : " ^1.1.6" ,
16
16
"gravatar" : " ^1.8.0" ,
17
17
"html-entities" : " ^1.2.1" ,
18
- "json-schema-ref-parser" : " ^7.1.3 " ,
18
+ "json-schema-ref-parser" : " ^8.0.0 " ,
19
19
"jsonwebtoken" : " ^8.5.1" ,
20
- "knex" : " ^0.20.10 " ,
21
- "liquidjs" : " ^9.7.1 " ,
20
+ "knex" : " ^0.20.13 " ,
21
+ "liquidjs" : " ^9.11.10 " ,
22
22
"lodash" : " ^4.17.15" ,
23
23
"moment" : " ^2.24.0" ,
24
24
"mysql" : " ^2.18.1" ,
25
- "node-rsa" : " ^1.0.7 " ,
25
+ "node-rsa" : " ^1.0.8 " ,
26
26
"nodemon" : " ^2.0.2" ,
27
27
"objection" : " ^2.1.3" ,
28
28
"path" : " ^0.12.7" ,
40
40
"devDependencies" : {
41
41
"eslint" : " ^6.8.0" ,
42
42
"eslint-plugin-align-assignments" : " ^1.1.2" ,
43
- "prettier" : " ^1.19.1 "
43
+ "prettier" : " ^2.0.4 "
44
44
}
45
45
}
Original file line number Diff line number Diff line change 1
1
listen 80;
2
+ {% if ipv6 -%}
3
+ listen [::]:80;
4
+ {% else -%}
5
+ #listen [::]:80;
6
+ {% endif %}
2
7
{% if certificate -%}
3
8
listen 443 ssl{% if http2_support %} http2{% endif %};
9
+ {% if ipv6 -%}
10
+ listen [::]:443;
11
+ {% else -%}
12
+ #listen [::]:443;
13
+ {% endif %}
4
14
{% endif %}
5
15
server_name {{ domain_names | join: " " }};
Original file line number Diff line number Diff line change 6
6
{% if tcp_forwarding == 1 or tcp_forwarding == true -%}
7
7
server {
8
8
listen {{ incoming_port }};
9
+ {% if ipv6 -%}
10
+ listen [::]:{{ incoming_port }};
11
+ {% else -%}
12
+ #listen [::]:{{ incoming_port }};
13
+ {% endif %}
14
+
9
15
proxy_pass {{ forward_ip }}:{{ forwarding_port }};
10
16
11
17
# Custom
@@ -16,6 +22,11 @@ server {
16
22
{% if udp_forwarding == 1 or udp_forwarding == true %}
17
23
server {
18
24
listen {{ incoming_port }} udp;
25
+ {% if ipv6 -%}
26
+ listen [::]:{{ incoming_port }} udp;
27
+ {% else -%}
28
+ #listen [::]:{{ incoming_port }} udp;
29
+ {% endif %}
19
30
proxy_pass {{ forward_ip }}:{{ forwarding_port }};
20
31
21
32
# Custom
You can’t perform that action at this time.
0 commit comments