Skip to content

Commit 8e2c2e1

Browse files
falkotimmefalkotimme
committed
- Added IPv6 support for nginx.
1 parent 793622b commit 8e2c2e1

File tree

3 files changed

+50
-44
lines changed

3 files changed

+50
-44
lines changed

‎server/conf/nginx_vhost.conf.master‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,51 @@
11
server {
22
listen <tmpl_var name='ip_address'>:80;
3-
<tmpl_if name='ssl_enabled'>
3+
<tmpl_if name='ipv6_enabled'>
4+
listen [<tmpl_var name='ipv6_address'>]:80;
5+
</tmpl_if>
46

7+
<tmpl_if name='ssl_enabled'>
58
listen <tmpl_var name='ip_address'>:443 ssl;
9+
<tmpl_if name='ipv6_enabled'>
10+
listen [<tmpl_var name='ipv6_address'>]:443 ssl;
11+
</tmpl_if>
612
ssl_certificate <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.crt;
713
ssl_certificate_key <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.key;
8-
</tmpl_if>
14+
</tmpl_if>
915

1016
server_name <tmpl_var name='domain'> <tmpl_var name='alias'>;
1117

1218
root <tmpl_var name='web_document_root_www'>;
1319

14-
<tmpl_if name='seo_redirect_enabled'>
15-
20+
<tmpl_if name='seo_redirect_enabled'>
1621
if ($http_host = "<tmpl_var name='seo_redirect_origin_domain'>") {
1722
rewrite ^ $scheme://<tmpl_var name='seo_redirect_target_domain'>$request_uri permanent;
1823
}
19-
</tmpl_if>
20-
21-
<tmpl_loop name="redirects">
24+
</tmpl_if>
2225

26+
<tmpl_loop name="redirects">
2327
if ($http_host ~* "<tmpl_var name='rewrite_domain'>$") {
2428
rewrite ^/(.+)$ <tmpl_var name='rewrite_target'>$1 <tmpl_var name='rewrite_type'>;
2529
}
26-
</tmpl_loop>
30+
</tmpl_loop>
2731

2832
index index.html index.htm index.php index.cgi index.pl index.xhtml;
2933

30-
<tmpl_if name='ssi' op='==' value='y'>
31-
34+
<tmpl_if name='ssi' op='==' value='y'>
3235
location ~ \.shtml$ {
3336
ssi on;
3437
}
35-
</tmpl_if>
38+
</tmpl_if>
3639

37-
<tmpl_if name='errordocs'>
38-
40+
<tmpl_if name='errordocs'>
3941
error_page 400 /error/400.html;
4042
error_page 401 /error/401.html;
4143
error_page 403 /error/403.html;
4244
error_page 404 /error/404.html;
4345
error_page 405 /error/405.html;
4446
error_page 500 /error/500.html;
4547
error_page 503 /error/503.html;
46-
</tmpl_if>
48+
</tmpl_if>
4749

4850
error_log /var/log/ispconfig/httpd/<tmpl_var name='domain'>/error.log;
4951
access_log /var/log/ispconfig/httpd/<tmpl_var name='domain'>/access.log combined;
@@ -72,26 +74,27 @@ server {
7274
auth_basic_user_file <tmpl_var name='stats_auth_passwd_file'>;
7375
}
7476

75-
<tmpl_if name='php' op='==' value='fast-cgi'>
76-
77+
<tmpl_if name='php' op='==' value='fast-cgi'>
7778
location ~ \.php$ {
7879
try_files $uri =404;
79-
<tmpl_var name='use_tcp'>fastcgi_pass 127.0.0.1:<tmpl_var name='fpm_port'>;
80-
<tmpl_var name='use_socket'>fastcgi_pass unix:<tmpl_var name='fpm_socket'>;
80+
<tmpl_if name='use_tcp'>
81+
fastcgi_pass 127.0.0.1:<tmpl_var name='fpm_port'>;
82+
</tmpl_if>
83+
<tmpl_if name='use_socket'>
84+
fastcgi_pass unix:<tmpl_var name='fpm_socket'>;
85+
</tmpl_if>
8186
fastcgi_index index.php;
8287
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
8388
fastcgi_param PATH_INFO $fastcgi_script_name;
8489
include /etc/nginx/fastcgi_params;
8590
}
86-
</tmpl_else>
87-
91+
</tmpl_else>
8892
location ~ \.php$ {
8993
deny all;
9094
}
91-
</tmpl_if>
92-
93-
<tmpl_if name='cgi' op='==' value='y'>
95+
</tmpl_if>
9496

97+
<tmpl_if name='cgi' op='==' value='y'>
9598
location /cgi-bin/ {
9699
try_files $uri =404;
97100
root <tmpl_var name='document_root'>;
@@ -101,10 +104,9 @@ server {
101104
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
102105
include /etc/nginx/fastcgi_params;
103106
}
104-
</tmpl_if>
107+
</tmpl_if>
105108

106-
<tmpl_loop name="nginx_directives">
109+
<tmpl_loop name="nginx_directives">
107110
<tmpl_var name='nginx_directive'>
108-
</tmpl_loop>
109-
111+
</tmpl_loop>
110112
}

‎server/conf/php_fpm_pool.conf.master‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
[<tmpl_var name='fpm_pool'>]
22

3-
<tmpl_var name='use_tcp'>listen = 127.0.0.1:<tmpl_var name='fpm_port'>
4-
<tmpl_var name='use_tcp'>listen.allowed_clients = 127.0.0.1
5-
6-
<tmpl_var name='use_socket'>listen = <tmpl_var name='fpm_socket'>
7-
<tmpl_var name='use_socket'>listen.owner = <tmpl_var name='fpm_user'>
8-
<tmpl_var name='use_socket'>listen.group = <tmpl_var name='fpm_group'>
9-
<tmpl_var name='use_socket'>listen.mode = 0660
3+
<tmpl_if name='use_tcp'>
4+
listen = 127.0.0.1:<tmpl_var name='fpm_port'>
5+
listen.allowed_clients = 127.0.0.1
6+
</tmpl_if>
7+
<tmpl_if name='use_socket'>
8+
listen = <tmpl_var name='fpm_socket'>
9+
listen.owner = <tmpl_var name='fpm_user'>
10+
listen.group = <tmpl_var name='fpm_group'>
11+
listen.mode = 0660
12+
</tmpl_if>
1013

1114
user = <tmpl_var name='fpm_user'>
1215
group = <tmpl_var name='fpm_group'>
@@ -20,7 +23,6 @@ pm.max_spare_servers = 35
2023
chdir = /
2124

2225
<tmpl_if name='security_level' op='==' value='20'>
23-
2426
<tmpl_var name='enable_php_open_basedir'>php_admin_value[open_basedir] = <tmpl_var name='php_open_basedir'>
2527
</tmpl_if>
2628

‎server/plugins-available/nginx_plugin.inc.php‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,9 @@ function update($event_name,$data) {
638638
$vhost_data['web_document_root'] = $data['new']['document_root'].'/web';
639639
$vhost_data['web_document_root_www'] = $web_config['website_basedir'].'/'.$data['new']['domain'].'/web';
640640
$vhost_data['web_basedir'] = $web_config['website_basedir'];
641-
$vhost_data['ssl_domain'] = $data['new']['ssl_domain'];
641+
642+
// IPv6
643+
if($data['new']['ipv6_address'] != '') $tpl->setVar('ipv6_enabled', 1);
642644

643645
// PHP-FPM
644646
$pool_dir = escapeshellcmd($web_config['php_fpm_pool_dir']);
@@ -648,11 +650,11 @@ function update($event_name,$data) {
648650
if(substr($socket_dir,-1) != '/') $socket_dir .= '/';
649651

650652
if($data['new']['php_fpm_use_socket'] == 'y'){
651-
$use_tcp = '#';
652-
$use_socket = '';
653+
$use_tcp = 0;
654+
$use_socket = 1;
653655
} else {
654-
$use_tcp = '';
655-
$use_socket = '#';
656+
$use_tcp = 1;
657+
$use_socket = 0;
656658
}
657659
$tpl->setVar('use_tcp', $use_tcp);
658660
$tpl->setVar('use_socket', $use_socket);
@@ -1113,12 +1115,12 @@ private function php_fpm_pool_update ($data,$web_config,$pool_dir,$pool_name,$so
11131115
$tpl->newTemplate('php_fpm_pool.conf.master');
11141116

11151117
if($data['new']['php_fpm_use_socket'] == 'y'){
1116-
$use_tcp = ';';
1117-
$use_socket = '';
1118+
$use_tcp = 0;
1119+
$use_socket = 1;
11181120
if(!is_dir($socket_dir)) exec('mkdir -p '.$socket_dir);
11191121
} else {
1120-
$use_tcp = '';
1121-
$use_socket = ';';
1122+
$use_tcp = 1;
1123+
$use_socket = 0;
11221124
}
11231125
$tpl->setVar('use_tcp', $use_tcp);
11241126
$tpl->setVar('use_socket', $use_socket);

0 commit comments

Comments
 (0)