Skip to content

Commit 43538da

Browse files
authored
Merge pull request hestiacp#2796 from hestiacp/staging/nginx-conf
Update nginx configuration
2 parents 0220e08 + 1ad306c commit 43538da

File tree

7 files changed

+36
-8
lines changed

7 files changed

+36
-8
lines changed

install/deb/nginx/nginx.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ http {
3636
charset utf-8;
3737

3838
# FastCGI settings
39-
fastcgi_buffers 4 256k;
39+
fastcgi_buffers 8 256k;
4040
fastcgi_buffer_size 256k;
4141
fastcgi_busy_buffers_size 256k;
4242
fastcgi_temp_file_write_size 256k;
@@ -54,8 +54,8 @@ http {
5454
proxy_set_header X-Real-IP $remote_addr;
5555
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
5656
proxy_pass_header Set-Cookie;
57-
proxy_buffer_size 8k;
5857
proxy_buffers 32 4k;
58+
proxy_buffer_size 8k;
5959
proxy_connect_timeout 30s;
6060
proxy_read_timeout 300s;
6161
proxy_send_timeout 180s;

install/rpm/nginx/nginx.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ http {
3434
charset utf-8;
3535

3636
# FastCGI settings
37-
fastcgi_buffers 4 256k;
37+
fastcgi_buffers 8 256k;
3838
fastcgi_buffer_size 256k;
3939
fastcgi_busy_buffers_size 256k;
4040
fastcgi_temp_file_write_size 256k;
@@ -50,8 +50,8 @@ http {
5050
proxy_set_header X-Real-IP $remote_addr;
5151
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
5252
proxy_pass_header Set-Cookie;
53-
proxy_buffer_size 8k;
5453
proxy_buffers 32 4k;
54+
proxy_buffer_size 8k;
5555
proxy_connect_timeout 30s;
5656
proxy_read_timeout 300s;
5757
proxy_send_timeout 180s;

install/upgrade/versions/1.6.6.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# Hestia Control Panel upgrade script for target version 1.6.4
3+
# Hestia Control Panel upgrade script for target version 1.6.6
44

55
#######################################################################################
66
####### Place additional commands below. #######

install/upgrade/versions/1.6.7.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ if [ -f "/etc/roundcube/config.inc.php" ]; then
2727

2828
#For older installs
2929
sed -i "s/\$config\['default_host']/\$config\['imap_host']/g" /etc/roundcube/config.inc.php
30-
fi
30+
fi

install/upgrade/versions/1.6.8.sh

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/bin/bash
2+
3+
# Hestia Control Panel upgrade script for target version unreleased
4+
5+
#######################################################################################
6+
####### Place additional commands below. #######
7+
#######################################################################################
8+
####### Pass through information to the end user in case of a issue or problem #######
9+
####### #######
10+
####### Use add_upgrade_message "My message here" to include a message #######
11+
####### in the upgrade notification email. Example: #######
12+
####### #######
13+
####### add_upgrade_message "My message here" #######
14+
####### #######
15+
####### You can use \n within the string to create new lines. #######
16+
#######################################################################################
17+
18+
upgrade_config_set_value 'UPGRADE_UPDATE_WEB_TEMPLATES' 'no'
19+
upgrade_config_set_value 'UPGRADE_UPDATE_DNS_TEMPLATES' 'no'
20+
upgrade_config_set_value 'UPGRADE_UPDATE_MAIL_TEMPLATES' 'no'
21+
upgrade_config_set_value 'UPGRADE_REBUILD_USERS' 'no'
22+
upgrade_config_set_value 'UPGRADE_UPDATE_FILEMANAGER_CONFIG' 'false'
23+
24+
if [ -f /etc/nginx/nginx.conf ]; then
25+
sed -i "s/fastcgi_buffers 4 256k;/fastcgi_buffers 8 256k;/g" /etc/nginx/nginx.conf
26+
fi

src/deb/nginx/nginx.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ http {
3434
charset utf-8;
3535

3636
# FastCGI settings
37-
fastcgi_buffers 4 256k;
37+
fastcgi_buffers 8 256k;
3838
fastcgi_buffer_size 256k;
3939
fastcgi_busy_buffers_size 256k;
4040
fastcgi_temp_file_write_size 256k;
@@ -49,6 +49,7 @@ http {
4949
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
5050
proxy_pass_header Set-Cookie;
5151
proxy_buffers 32 4k;
52+
proxy_buffer_size 8k;
5253
proxy_connect_timeout 30s;
5354
proxy_read_timeout 300s;
5455
proxy_send_timeout 180s;

src/rpm/nginx/nginx.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ http {
3434
charset utf-8;
3535

3636
# FastCGI settings
37-
fastcgi_buffers 4 256k;
37+
fastcgi_buffers 8 256k;
3838
fastcgi_buffer_size 256k;
3939
fastcgi_busy_buffers_size 256k;
4040
fastcgi_temp_file_write_size 256k;
@@ -49,6 +49,7 @@ http {
4949
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
5050
proxy_pass_header Set-Cookie;
5151
proxy_buffers 32 4k;
52+
proxy_buffer_size 8k;
5253
proxy_connect_timeout 30s;
5354
proxy_read_timeout 300s;
5455
proxy_send_timeout 180s;

0 commit comments

Comments
 (0)