[acassen/keepalived] 2fe3f8: Merge pull request #725 from pqarmitage/fixes

  Branch: refs/heads/beta
  Home:   https://github.com/acassen/keepalived
  Commit: 2fe3f8ecfbf68344e27ae89c35b58e30f15ee1ef
      https://github.com/acassen/keepalived/commit/2fe3f8ecfbf68344e27ae89c35b58e30f15ee1ef
  Author: pqarmitage <[email protected]>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

  Changed paths:
    M Makefile.am
    M doc/man/man1/genhash.1
    M genhash/Makefile.am
    M genhash/http.c
    M genhash/include/hash.h
    M genhash/include/http.h
    M genhash/include/layer4.h
    M genhash/include/main.h
    M genhash/include/sock.h
    M genhash/include/ssl.h
    M genhash/layer4.c
    M genhash/main.c
    M genhash/sock.c
    M genhash/ssl.c
    M keepalived/Makefile.am
    M keepalived/check/check_api.c
    M keepalived/check/check_daemon.c
    M keepalived/check/check_data.c
    M keepalived/check/check_dns.c
    M keepalived/check/check_http.c
    M keepalived/check/check_misc.c
    M keepalived/check/check_parser.c
    M keepalived/check/check_smtp.c
    M keepalived/check/check_snmp.c
    M keepalived/check/check_ssl.c
    M keepalived/check/check_tcp.c
    M keepalived/check/ipvswrapper.c
    M keepalived/check/ipwrapper.c
    M keepalived/core/Makefile.am
    M keepalived/core/daemon.c
    M keepalived/core/global_data.c
    M keepalived/core/global_parser.c
    M keepalived/core/layer4.c
    M keepalived/core/main.c
    M keepalived/core/namespaces.c
    M keepalived/core/pidfile.c
    M keepalived/core/smtp.c
    M keepalived/core/snmp.c
    M keepalived/include/check_api.h
    M keepalived/include/check_daemon.h
    M keepalived/include/check_data.h
    M keepalived/include/check_dns.h
    M keepalived/include/check_http.h
    M keepalived/include/check_misc.h
    M keepalived/include/check_parser.h
    M keepalived/include/check_smtp.h
    M keepalived/include/check_snmp.h
    M keepalived/include/check_ssl.h
    M keepalived/include/check_tcp.h
    M keepalived/include/daemon.h
    M keepalived/include/global_data.h
    M keepalived/include/global_parser.h
    M keepalived/include/ipvswrapper.h
    M keepalived/include/ipwrapper.h
    M keepalived/include/keepalived_netlink.h
    M keepalived/include/layer4.h
    M keepalived/include/main.h
    M keepalived/include/pidfile.h
    M keepalived/include/smtp.h
    M keepalived/include/snmp.h
    M keepalived/include/vrrp.h
    M keepalived/include/vrrp_arp.h
    M keepalived/include/vrrp_daemon.h
    M keepalived/include/vrrp_data.h
    M keepalived/include/vrrp_if.h
    M keepalived/include/vrrp_if_config.h
    M keepalived/include/vrrp_index.h
    M keepalived/include/vrrp_ip_rule_route_parser.h
    M keepalived/include/vrrp_ipaddress.h
    M keepalived/include/vrrp_iproute.h
    M keepalived/include/vrrp_iprule.h
    M keepalived/include/vrrp_ipsecah.h
    M keepalived/include/vrrp_ipset.h
    M keepalived/include/vrrp_iptables.h
    M keepalived/include/vrrp_iptables_calls.h
    M keepalived/include/vrrp_json.h
    M keepalived/include/vrrp_ndisc.h
    M keepalived/include/vrrp_notify.h
    M keepalived/include/vrrp_parser.h
    M keepalived/include/vrrp_print.h
    M keepalived/include/vrrp_scheduler.h
    M keepalived/include/vrrp_snmp.h
    M keepalived/include/vrrp_sync.h
    M keepalived/include/vrrp_track.h
    M keepalived/include/vrrp_vmac.h
    M keepalived/vrrp/Makefile.am
    M keepalived/vrrp/vrrp.c
    M keepalived/vrrp/vrrp_arp.c
    M keepalived/vrrp/vrrp_daemon.c
    M keepalived/vrrp/vrrp_data.c
    M keepalived/vrrp/vrrp_dbus.c
    M keepalived/vrrp/vrrp_if.c
    M keepalived/vrrp/vrrp_if_config.c
    M keepalived/vrrp/vrrp_index.c
    M keepalived/vrrp/vrrp_ip_rule_route_parser.c
    M keepalived/vrrp/vrrp_ipaddress.c
    M keepalived/vrrp/vrrp_iproute.c
    M keepalived/vrrp/vrrp_iprule.c
    M keepalived/vrrp/vrrp_ipsecah.c
    M keepalived/vrrp/vrrp_ipset.c
    M keepalived/vrrp/vrrp_iptables.c
    M keepalived/vrrp/vrrp_iptables_calls.c
    M keepalived/vrrp/vrrp_json.c
    M keepalived/vrrp/vrrp_ndisc.c
    M keepalived/vrrp/vrrp_notify.c
    M keepalived/vrrp/vrrp_parser.c
    M keepalived/vrrp/vrrp_print.c
    M keepalived/vrrp/vrrp_scheduler.c
    M keepalived/vrrp/vrrp_snmp.c
    M keepalived/vrrp/vrrp_sync.c
    M keepalived/vrrp/vrrp_track.c
    M keepalived/vrrp/vrrp_vmac.c
    M lib/Makefile.am
    M lib/bitops.h
    M lib/html.c
    M lib/html.h
    M lib/list.c
    M lib/list.h
    M lib/logger.c
    M lib/logger.h
    M lib/memory.c
    M lib/memory.h
    M lib/notify.c
    M lib/notify.h
    M lib/parser.c
    M lib/parser.h
    M lib/rttables.c
    M lib/rttables.h
    M lib/scheduler.c
    M lib/scheduler.h
    M lib/signals.c
    M lib/signals.h
    M lib/timer.c
    M lib/timer.h
    M lib/utils.c
    M lib/utils.h
    M lib/vector.c
    M lib/vector.h
    A utils/update_source_copyright_year

  Log Message:
  -----------
  Merge pull request #725 from pqarmitage/fixes

Cosmetic tidying of code, update use of OpenSSL, copyright updates


  Commit: 63fc8a605b34dd64c88334f9f86d1fceed9fd30e
      https://github.com/acassen/keepalived/commit/63fc8a605b34dd64c88334f9f86d1fceed9fd30e
  Author: Quentin Armitage <[email protected]>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

  Changed paths:
    M Makefile.in
    M genhash/Makefile.in
    M keepalived/Makefile.in
    M keepalived/core/Makefile.in
    M keepalived/vrrp/Makefile.in
    M lib/Makefile.in

  Log Message:
  -----------
  Copyright update

Signed-off-by: Quentin Armitage <[email protected]>


  Commit: 7b968043d7cff17b084ac3b01ed4425be76841af
      https://github.com/acassen/keepalived/commit/7b968043d7cff17b084ac3b01ed4425be76841af
  Author: Quentin Armitage <[email protected]>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

  Changed paths:
    M utils/update_source_copyright_year

  Log Message:
  -----------
  Include Makefile.in files in copyright update

Signed-off-by: Quentin Armitage <[email protected]>


  Commit: aaf623b761832e6215dcd5054deccd935febd2d2
      https://github.com/acassen/keepalived/commit/aaf623b761832e6215dcd5054deccd935febd2d2
  Author: Quentin Armitage <[email protected]>
  Date:   2017-12-22 (Fri, 22 Dec 2017)

  Changed paths:
    M doc/keepalived.conf.SYNOPSIS
    M doc/man/man5/keepalived.conf.5
    M lib/parser.c
    M lib/parser.h

  Log Message:
  -----------
  Add replaceable parameters in configuration files

Substitutable parameters can be specified. The format for defining a parameter is:
$PARAMETER=VALUE
where there must be no space before the '=' and only whitespace may preceed to '$'.
Empty values are allowed.

Parameter names can be made up of any combination of A-Za-z0-9 and _, but cannot start
with a digit.

After a parameter is defined, any occurrence of $PARAMETER followed by
whitespace, or any occurrence of ${PARAMETER} (which need not be followed by
whitespace) will be replaced by VALUE.

Replacement is recursive, so that if a parameter value itself includes a
replaceable parameter, then after the first substitution, the parameter
in the value will then be replaced; the substitution is done at replacement
time and not at definition time, so for example:

$ADDRESS_BASE=10.2.${ADDRESS_BASE_SUB}
$ADDRESS_BASE_SUB=0
    ${ADDRESS_BASE}.100/32
$ADDRESS_BASE_SUB=10
    ${ADDRESS_BASE}.100/32

will produce:
    10.2.0.100/32
    10.2.10.100/32

Note in the above examples the use of both ADDRESS_BASE and ADDRESS_BASE_SUB
required braces ({}) since the parameters were not followed by whitespace
(after the first substitution which produced 10.2.${ADDRESS_BASE_SUB}.100/32
the parameter is still not followed by whitespace).

If a parameter is not defined, it will not be replaced at all, so for
example ${UNDEF_PARAMETER} will remain in the configuration if it is
undefined; this means that existing configuration that contains a '$'
character (for example in a script definition) will not be changed so
long as no new parameter definitions are added to the configuration.

Parameter substitution works in conjunction with conditional configuration.
For example:
@main $PRIORITY=240
@backup $PRIORITY=200
...
vrrp_instance VI_0 {
    priority $PRIORITY
}

will produce:
...
vrrp_instance VI_0 }
    priority 240
}
if the config_id is main.

$IF_MAIN=@main
$IF_MAIN priority 240

will produce
 priority 240
if the config_id is main and nothing if the config_id is not main, although
why anyone would want to use this rather than simply
@main priority 240
is not known.

Signed-off-by: Quentin Armitage <[email protected]>


  Commit: e3441e68cb7209b306b7be91e914ab3c1b4005d4
      https://github.com/acassen/keepalived/commit/e3441e68cb7209b306b7be91e914ab3c1b4005d4
  Author: pqarmitage <[email protected]>
  Date:   2017-12-22 (Fri, 22 Dec 2017)

  Changed paths:
    M Makefile.in
    M doc/keepalived.conf.SYNOPSIS
    M doc/man/man5/keepalived.conf.5
    M genhash/Makefile.in
    M keepalived/Makefile.in
    M keepalived/core/Makefile.in
    M keepalived/vrrp/Makefile.in
    M lib/Makefile.in
    M lib/parser.c
    M lib/parser.h
    M utils/update_source_copyright_year

  Log Message:
  -----------
  Merge pull request #727 from pqarmitage/fixes

Add configurable parameters for configurations


  Commit: a80f0125e97bde6d1d0fea4c3f7113f8675a672a
      https://github.com/acassen/keepalived/commit/a80f0125e97bde6d1d0fea4c3f7113f8675a672a
  Author: Quentin Armitage <[email protected]>
  Date:   2017-12-23 (Sat, 23 Dec 2017)

  Changed paths:
    M Makefile.in
    M doc/keepalived.conf.SYNOPSIS
    M doc/man/man5/keepalived.conf.5
    M genhash/Makefile.in
    M keepalived/Makefile.in
    M keepalived/core/Makefile.in
    M keepalived/dbus/Makefile.in
    M keepalived/vrrp/Makefile.in
    M lib/Makefile.in
    M lib/parser.c
    M lib/parser.h
    M utils/update_source_copyright_year

  Log Message:
  -----------
  Merge branch 'fixes' into beta


  Commit: f68343b1a68675f6d82897ba5e8cc07bed340fcd
      https://github.com/acassen/keepalived/commit/f68343b1a68675f6d82897ba5e8cc07bed340fcd
  Author: Quentin Armitage <[email protected]>
  Date:   2017-12-23 (Sat, 23 Dec 2017)

  Changed paths:
    M bin_install/Makefile.in
    M keepalived/check/Makefile.in

  Log Message:
  -----------
  Copyright update

Signed-off-by: Quentin Armitage <[email protected]>


  Commit: ec761d9c9b2e42a929a66006e3cb19f721cfb121
      https://github.com/acassen/keepalived/commit/ec761d9c9b2e42a929a66006e3cb19f721cfb121
  Author: pqarmitage <[email protected]>
  Date:   2017-12-23 (Sat, 23 Dec 2017)

  Changed paths:
    M Makefile.in
    M bin_install/Makefile.in
    M doc/keepalived.conf.SYNOPSIS
    M doc/man/man5/keepalived.conf.5
    M genhash/Makefile.in
    M keepalived/Makefile.in
    M keepalived/check/Makefile.in
    M keepalived/core/Makefile.in
    M keepalived/dbus/Makefile.in
    M keepalived/vrrp/Makefile.in
    M lib/Makefile.in
    M lib/parser.c
    M lib/parser.h
    M utils/update_source_copyright_year

  Log Message:
  -----------
  Merge pull request #728 from pqarmitage/beta

Add configuration replaceable parameters


Compare: https://github.com/acassen/keepalived/compare/d7ea94119851...ec761d9c9b2e

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot

_______________________________________________
Keepalived-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/keepalived-devel