Skip to content

Commit b1a22f9

Browse files
author
Kristan Kenney
committed
Revert "Merge branch 'fix/nginx-ssl-sni' into staging/fixes"
This reverts commit 86b06ef.
1 parent 88df5f6 commit b1a22f9

File tree

4 files changed

+2
-15
lines changed

4 files changed

+2
-15
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ All notable changes to this project will be documented in this file.
2121
- Fixed an issue where a `no backend template doesn't exist` could potentially would appear after upgrade with older templates (#1322).
2222
- Introduced caching templates for nginx + php-fpm configurations - thanks **@cmstew**!
2323
- Fixed an issue where DNS cluster updates could fail due to the format of a DKIM record in an available zone - thanks **@jrohde**!
24-
- Improved the behavior of nginx SSL SNI detection to reject connections for domains which have no SSL certificate - thanks **@myrevery**!
2524
- Improved the quality of comment formatting in command line scripts - thanks **@bisubus**!
2625
- Fixed an issue where the logo was not displayed in the File Manager - thanks **@robothemes**!
2726
- Fixed an issue in the Control Panel UI which caused databases and additional FTP accounts to be named incorrectly if manually prefaced with the username.
2827
- Improved the visibility of service availability in the Control Panel UI.
2928

29+
3030
## [1.3.0] - Major Release (Feature / Quality Update)
3131
### Features
3232
- Users can now choose to point a domain to a different document root location (similar to domain parking).

install/deb/nginx/unassigned.inc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ server {
3737
server_name _;
3838
ssl_certificate /usr/local/hestia/ssl/certificate.crt;
3939
ssl_certificate_key /usr/local/hestia/ssl/certificate.key;
40-
ssl_reject_handshake on;
4140

4241
return 301 http://$host$request_uri;
4342

install/deb/templates/web/nginx/proxy_ip.tpl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@ server {
1313
}
1414

1515
server {
16-
listen %ip%:%proxy_ssl_port% ssl http2 default;
16+
listen %ip%:%proxy_ssl_port% ssl http2;
1717
server_name _;
1818
ssl_certificate /usr/local/hestia/ssl/certificate.crt;
1919
ssl_certificate_key /usr/local/hestia/ssl/certificate.key;
20-
ssl_reject_handshake on;
2120
2221
return 301 http://$host$request_uri;
2322

install/upgrade/versions/1.3.1.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,3 @@
55
#######################################################################################
66
####### Place additional commands below. #######
77
#######################################################################################
8-
9-
# Update nginx configuration to block connections for unsigned (no SSL certificate) domains
10-
for ipaddr in $(ls /usr/local/hestia/data/ips/ 2>/dev/null); do
11-
web_conf="/etc/$PROXY_SYSTEM/conf.d/$ipaddr.conf"
12-
13-
if [ "$PROXY_SYSTEM" = "nginx" ]; then
14-
echo "[ * ] Hardening nginx SSL SNI configuration..."
15-
cp -f $HESTIA_INSTALL_DIR/nginx/unassigned.inc $web_conf
16-
sed -i 's/directIP/'$ipaddr'/g' $web_conf
17-
fi
18-
done

0 commit comments

Comments
 (0)