[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f0092a6e3e246846caa55458364514064f2c5103

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f0092a6e3e246846caa55458364514064f2c5103

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 4462 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  f0092a6e3e246846caa55458364514064f2c5103 (commit)
       via  d499e86b168ca1267b6155496cbefa11ec11b916 (commit)
       via  5cf83d56fa06a2e04e70db4aba4a0fb4195a5157 (commit)
      from  f622fd8ed09d60b627da3589d91b9fc8d6a77393 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f0092a6e3e246846caa55458364514064f2c5103
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Jan 13 12:50:26 2019 +0100

    keepalived: Move change of conntrack sysctl option into package
    
    The setting cannot be set on the default system because the ip_vs
    module is not loaded by default and there is no reason to load it
    just because we would be able to set the setting.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit d499e86b168ca1267b6155496cbefa11ec11b916
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Jan 13 12:28:10 2019 +0100

    GeoIP: Add accidentially removed paths to database
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 5cf83d56fa06a2e04e70db4aba4a0fb4195a5157
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Jan 13 11:53:41 2019 +0100

    firewall-lib.pl: Fix incorrect path to geoip-functions.pl
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/cfgroot/geoip-functions.pl   | 3 +++
 config/etc/sysctl.conf              | 3 ---
 config/firewall/firewall-lib.pl     | 2 +-
 lfs/keepalived                      | 2 +-
 src/initscripts/packages/keepalived | 6 ++++++
 5 files changed, 11 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/config/cfgroot/geoip-functions.pl b/config/cfgroot/geoip-functions.pl
index c8ff47d2e..d03503a3f 100644
--- a/config/cfgroot/geoip-functions.pl
+++ b/config/cfgroot/geoip-functions.pl
@@ -26,6 +26,9 @@ package GeoIP;
 use Geo::IP::PurePerl;
 use Locale::Codes::Country;
 
+my $geoip_database_dir = "/var/lib/GeoIP";
+my $location_database = "GeoLite2-Country-Locations-en.csv";
+
 my $database;
 
 sub lookup($) {
diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf
index dd087d2d9..4066af767 100644
--- a/config/etc/sysctl.conf
+++ b/config/etc/sysctl.conf
@@ -26,9 +26,6 @@ net.ipv4.conf.all.accept_redirects = 0
 net.ipv4.conf.all.accept_source_route = 0
 net.ipv4.conf.all.log_martians = 1
 
-# Enable connection tracking for IPVS
-net.ipv4.vs.conntrack = 1
-
 kernel.printk = 1 4 1 7
 vm.swappiness=1
 vm.mmap_min_addr = 4096
diff --git a/config/firewall/firewall-lib.pl b/config/firewall/firewall-lib.pl
index c14023e7b..2820eea65 100644
--- a/config/firewall/firewall-lib.pl
+++ b/config/firewall/firewall-lib.pl
@@ -39,7 +39,7 @@ my %ovpnsettings=();
 my %aliases=();
 
 require '/var/ipfire/general-functions.pl';
-require '${General::swroot}/geoip-locations.pl';
+require '/var/ipfire/geoip-functions.pl';
 
 my $confignet		= "${General::swroot}/fwhosts/customnetworks";
 my $confighost		= "${General::swroot}/fwhosts/customhosts";
diff --git a/lfs/keepalived b/lfs/keepalived
index 4b4ae2300..8e01e979d 100644
--- a/lfs/keepalived
+++ b/lfs/keepalived
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = keepalived
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = ""
 
diff --git a/src/initscripts/packages/keepalived b/src/initscripts/packages/keepalived
index baccdc15a..4dda336d5 100644
--- a/src/initscripts/packages/keepalived
+++ b/src/initscripts/packages/keepalived
@@ -13,6 +13,12 @@
 
 case "${1}" in
 	start)
+		# Load IPVS module
+		modprobe ip_vs
+
+		# Enable connection tracking for IPVS
+		sysctl -w net.ipv4.vs.conntrack=1 &>/dev/null
+
 		boot_mesg "Starting keepalive daemon..."
 		loadproc /usr/sbin/keepalived ${KEEPALIVED_OPTIONS}
 		;;


hooks/post-receive
--
IPFire 2.x development tree