Re: [PATCH] keepalived: Update to version 2.0.20 .

[ummeegge <ummeegge@ipfire.org>]

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

Hi Michael,

Am Sonntag, den 15.03.2020, 09:23 +0000 schrieb Michael Tremer:
> Hi, this looks good.
> 
> But should we not ship /etc/sysconfig/keepalived, too?
since it is also commented in the old version ileft it out but i can
include it no problem. This is the content:

# Options for keepalived. See `keepalived --help' output and
keepalived(8) and
# keepalived.conf(5) man pages for a list of all options. Here are the
most
# common ones :
#
# --vrrp               -P    Only run with VRRP subsystem.
# --check              -C    Only run with Health-checker subsystem.
# --dont-release-vrrp  -V    Dont remove VRRP VIPs & VROUTEs on daemon
stop.
# --dont-release-ipvs  -I    Dont remove IPVS topology on daemon stop.
# --dump-conf          -d    Dump the configuration data.
# --log-detail         -D    Detailed log messages.
# --log-facility       -S    0-7 Set local syslog facility
(default=LOG_DAEMON)
#

KEEPALIVED_OPTIONS="-D"

do you think this makes sens ?

Best,

Erik

> 
> -Michael
> 
> > On 10 Mar 2020, at 16:10, Erik Kapfer <erik.kapfer(a)ipfire.org>
> > wrote:
> > 
> > Since this update is a mayor version update, it brings a lot of
> > changes.
> > The changelog can be found in here --> 
> > http://www.keepalived.com/changelog.html .
> > 
> > Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
> > ---
> > config/rootfiles/packages/keepalived |  9 ++++++---
> > lfs/keepalived                       | 10 +++++-----
> > 2 files changed, 11 insertions(+), 8 deletions(-)
> > 
> > diff --git a/config/rootfiles/packages/keepalived
> > b/config/rootfiles/packages/keepalived
> > index fbf5702cb..ff4a7b797 100644
> > --- a/config/rootfiles/packages/keepalived
> > +++ b/config/rootfiles/packages/keepalived
> > @@ -7,6 +7,7 @@ etc/keepalived/samples
> > #etc/keepalived/samples/keepalived.conf.IPv6
> > #etc/keepalived/samples/keepalived.conf.SMTP_CHECK
> > #etc/keepalived/samples/keepalived.conf.SSL_GET
> > +#etc/keepalived/samples/keepalived.conf.conditional_conf
> > #etc/keepalived/samples/keepalived.conf.fwmark
> > #etc/keepalived/samples/keepalived.conf.inhibit
> > #etc/keepalived/samples/keepalived.conf.misc_check
> > @@ -21,18 +22,20 @@ etc/keepalived/samples
> > #etc/keepalived/samples/keepalived.conf.vrrp.localcheck
> > #etc/keepalived/samples/keepalived.conf.vrrp.lvs_syncd
> > #etc/keepalived/samples/keepalived.conf.vrrp.routes
> > +#etc/keepalived/samples/keepalived.conf.vrrp.rules
> > #etc/keepalived/samples/keepalived.conf.vrrp.scripts
> > #etc/keepalived/samples/keepalived.conf.vrrp.static_ipaddress
> > #etc/keepalived/samples/keepalived.conf.vrrp.sync
> > #etc/keepalived/samples/root.pem
> > #etc/keepalived/samples/sample.misccheck.smbcheck.sh
> > -#etc/sysconfig/keepalived
> > +#etc/keepalived/samples/sample_notify_fifo.sh
> > etc/rc.d/init.d/keepalived
> > +#etc/sysconfig/keepalived
> > usr/bin/genhash
> > usr/sbin/keepalived
> > +#usr/share/doc/keepalived
> > +#usr/share/doc/keepalived/README
> > #usr/share/man/man1/genhash.1
> > #usr/share/man/man5/keepalived.conf.5
> > #usr/share/man/man8/keepalived.8
> > -#usr/share/snmp/mibs/KEEPALIVED-MIB
> > -#usr/share/snmp/mibs/VRRP-MIB
> > var/ipfire/backup/addons/includes/keepalived
> > diff --git a/lfs/keepalived b/lfs/keepalived
> > index c18625f38..905f1d070 100644
> > --- a/lfs/keepalived
> > +++ b/lfs/keepalived
> > @@ -1,7 +1,7 @@
> > ###################################################################
> > ############
> > #                                                                  
> >            #
> > # IPFire.org - A linux based
> > firewall                                         #
> > -# Copyright (C) 2007-2018  IPFire Team  <info(a)ipfire.org>         
> >             #
> > +# Copyright (C) 2007-2020  IPFire Team  <info(a)ipfire.org>         
> >             #
> > #                                                                  
> >            #
> > # This program is free software: you can redistribute it and/or
> > modify        #
> > # it under the terms of the GNU General Public License as published
> > by        #
> > @@ -24,7 +24,7 @@
> > 
> > include Config
> > 
> > -VER        = 1.2.17
> > +VER        = 2.0.20
> > 
> > THISAPP    = keepalived-$(VER)
> > DL_FILE    = $(THISAPP).tar.gz
> > @@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
> > DIR_APP    = $(DIR_SRC)/$(THISAPP)
> > TARGET     = $(DIR_INFO)/$(THISAPP)
> > PROG       = keepalived
> > -PAK_VER    = 7
> > +PAK_VER    = 8
> > 
> > DEPS       = ""
> > 
> > @@ -44,7 +44,7 @@ objects = $(DL_FILE)
> > 
> > $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> > 
> > -$(DL_FILE)_MD5 = 8d6400e1be43fc303175164d69125dce
> > +$(DL_FILE)_MD5 = a5966e8433b60998709c4a922a407bac
> > 
> > install : $(TARGET)
> > 
> > @@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> > 	@$(PREBUILD)
> > 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf
> > $(DIR_DL)/$(DL_FILE)
> > 	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
> > -		--with-kernel-dir=/usr/include
> > +		--with-kernel-dir=/usr
> > 	cd $(DIR_APP) && make $(MAKETUNING)
> > 	cd $(DIR_APP) && make install
> > 
> > -- 
> > 2.12.2
> > 
> 
>