[packages/ucarp] rel 6; allow ip different than instance name

[mmazur]

commit 0877c1d10908e75e76fe00cf75979f110539bc32
Author: Mariusz Mazur <mmazur at axeos.com>
Date:   Wed Feb 4 14:37:43 2015 +0000

    rel 6; allow ip different than instance name

 ucarp.config.template | 1 +
 ucarp.spec            | 2 +-
 ucarp at .service        | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/ucarp.spec b/ucarp.spec
index bc59155..9037657 100644
--- a/ucarp.spec
+++ b/ucarp.spec
@@ -2,7 +2,7 @@ Summary:	Common Address Redundancy Protocol (CARP) for Unix
 Summary(pl.UTF-8):	CARP (Common Address Redundancy Protocol) dla Uniksa
 Name:		ucarp
 Version:	1.5.2
-Release:	5
+Release:	6
 License:	BSD
 Group:		Applications/Networking
 Source0:	ftp://ftp.ucarp.org/pub/ucarp/%{name}-%{version}.tar.gz
diff --git a/ucarp.config.template b/ucarp.config.template
index ac74008..31cfbc0 100644
--- a/ucarp.config.template
+++ b/ucarp.config.template
@@ -25,4 +25,5 @@
 # make sure to specify at least --srcip, --vhid and --pass (or --passfile),
 # --upscript and --downscript
 
+#VIP=SOMEIP     # if not set, instance name is used
 #UCARP_OPTS="--upscript=/etc/ucarp/vip-up.sh --downscript=/etc/ucarp/vip-down.sh"
diff --git a/ucarp at .service b/ucarp at .service
index ba1a16b..090d3ca 100644
--- a/ucarp at .service
+++ b/ucarp at .service
@@ -5,8 +5,9 @@ After=ucarp.target
 
 [Service]
 Type=simple
+Environment="VIP=%i"
 EnvironmentFile=/etc/ucarp/%i.conf
-ExecStart=/usr/sbin/ucarp --addr %i $UCARP_OPTS
+ExecStart=/usr/sbin/ucarp --addr ${VIP} $UCARP_OPTS
 
 [Install]
 WantedBy=ucarp.target
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ucarp.git/commitdiff/0877c1d10908e75e76fe00cf75979f110539bc32