Skip to content
Permalink
Browse files

Merge branch 'master-5.10' into v5.10

Signed-off-by: Alvaro Cano <alvaro.cano@zevenet.com>
  • Loading branch information...
alvarocano-zevenet committed Oct 11, 2019
2 parents c550920 + d9b036e commit ec54f566ea8b73765ddbbe75d5e337c3bddc1abc
@@ -1,9 +1,9 @@
Package: zevenet
Version: 5.10.0
Version: 5.10.1
Maintainer: Zevenet SL <zevenet-ce-users@zevenet.com>
Architecture: amd64
Section: admin
Priority: optional
Description: Zevenet Load Balancer Community Edition
Zevenet is a Multilayered Aplication Delivery Controller (ADC) and high performance load balancer whith an easy configuration, usability and user-friendly web GUI for layer 3, 4 and 7 networking management.
Depends: libnftables1, nftables (>= 0.9.1), linux-headers-amd64 (>= 4.19+105), linux-image-amd64 (>= 4.19+105), rrdtool, libnet-netmask-perl, libproc-daemon-perl, libnetwork-ipv4addr-perl, librrds-perl, libio-interface-perl, libdata-validate-ip-perl, libpcap0.8, ntpdate, libfile-grep-perl, iputils-arping, openssl, unzip, libev4, libjson-perl, libjson-xs-perl, libcgi-session-perl, libauthen-simple-perl, libauthen-simple-passwd-perl, conntrack, liburi-perl, libtimedate-perl, libconfig-tiny-perl, snmpd, libnet-ssleay-perl, libnetaddr-ip-perl, libswitch-perl, libcgi-simple-perl, libunix-syslog-perl, monitoring-plugins, monitoring-plugins-common, net-tools, cherokee, pound, libregexp-ipv6-perl, nftlb, curl, zproxy
Depends: libnftables1, nftables (>= 0.9.1), linux-headers-amd64 (>= 4.19+105), linux-image-amd64 (>= 4.19+105), rrdtool, libnet-netmask-perl, libproc-daemon-perl, libnetwork-ipv4addr-perl, librrds-perl, libio-interface-perl, libdata-validate-ip-perl, libpcap0.8, ntpdate, libfile-grep-perl, iputils-arping, openssl, unzip, libev4, libjson-perl, libjson-xs-perl, libcgi-session-perl, libauthen-simple-perl, libauthen-simple-passwd-perl, conntrack, liburi-perl, libtimedate-perl, libconfig-tiny-perl, snmpd, libnet-ssleay-perl, libnetaddr-ip-perl, libswitch-perl, libcgi-simple-perl, libunix-syslog-perl, monitoring-plugins, monitoring-plugins-common, net-tools, cherokee, pound, libregexp-ipv6-perl, nftlb, curl, zproxy (>= 0.1.0-5.10.1)
@@ -5,6 +5,15 @@ for i in $(find /usr/local/zevenet/config/ -name "*pound.cfg");
do
echo "Migrating config file $i from pound to l7 proxy"
sed -i -e 's/pound.socket/proxy.socket/' $i
sed -i -e 's/pound\/etc/zproxy\/etc/' $i
sed -i -e 's/(pound\/etc/zproxy\/etc/' $i
mv "$i" "$(echo "$i" | sed s/pound.cfg/proxy.cfg/)"
done

# Migrate zhttp config file to l7 proxy config file
for i in $(find /usr/local/zevenet/config/ -name "*_proxy.cfg");
do
if grep -q 'app\/zhttp\/etc' $i; then
echo "Migrating config file $i from pound to l7 proxy"
sed -i -e 's/app\/zhttp\/etc/app\/zproxy\/etc/' $i
fi
done
@@ -19,7 +19,7 @@ Alive 10
Client 30
ThreadModel dynamic
Control "/tmp/[DESC]_proxy.socket"
#DHParams "/usr/local/zevenet/app/zhttp/etc/dh2048.pem"
#DHParams "/usr/local/zevenet/app/zproxy/etc/dh2048.pem"
##ECDHCurve "prime256v1"


@@ -411,8 +411,11 @@ sub modify_http_farm # ( $json_obj, $farmname )
{
$ciphers_lib = $c{ $json_obj->{ ciphers } };

my $ssloff = &eload( module => 'Zevenet::Farm::HTTP::HTTPS::Ext',
func => 'getFarmCipherSSLOffLoadingSupport', );
my $ssloff = 1;
$ssloff = &eload(
module => 'Zevenet::Farm::HTTP::HTTPS::Ext',
func => 'getFarmCipherSSLOffLoadingSupport',
) if ( $eload );

unless ( $ssloff )
{
@@ -115,8 +115,12 @@ sub modify_l4xnat_farm # ( $json_obj, $farmname )
}

# Modify the vport if protocol is set to 'all'
$json_obj->{ vport } = "*"
if ( exists $json_obj->{ protocol } and $json_obj->{ protocol } eq 'all' );
if ( ( exists $json_obj->{ protocol } and $json_obj->{ protocol } eq 'all' )
or ( exists $json_obj->{ vport } and $json_obj->{ vport } eq '*' ) )
{
$json_obj->{ vport } = "*";
$json_obj->{ protocol } = "all";
}

# Check allowed parameters
my $error_msg = &checkZAPIParams( $json_obj, $params );
@@ -23,6 +23,12 @@

use strict;

my $eload;
if ( eval { require Zevenet::ELoad; } )
{
$eload = 1;
}

my $configdir = &getGlobalConfiguration( 'configdir' );

=begin nd
@@ -271,7 +277,8 @@ sub getFarmCipherSet # ($farm_name)
{
$output = "cipherpci";
}
elsif ( $cipher_list eq &getGlobalConfiguration( 'cipher_ssloffloading' ) )
elsif ( $eload
&& $cipher_list eq &getGlobalConfiguration( 'cipher_ssloffloading' ) )
{
$output = "cipherssloffloading";
}

0 comments on commit ec54f56

Please sign in to comment.
You can’t perform that action at this time.