diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-31 10:45:34 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-31 10:45:34 -0300 |
commit | db6d80995b7f835ba0b581a007bd0040e7d138b0 (patch) | |
tree | 00d3b174ccb85f692744e12059bcd04cddb2137c /community/keepalived | |
parent | 8226dd7c223cb14962fe6a76f369b96684563155 (diff) | |
parent | 68cdc08aec92abf91448a542e06fabbedbb583bf (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/glibc/PKGBUILD
extra/telepathy-logger-qt/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
testing/openssh/PKGBUILD
testing/openssh/sshd
testing/openssh/sshd.service
testing/spamassassin/PKGBUILD
testing/spamassassin/spamassassin.install
testing/upower/PKGBUILD
Diffstat (limited to 'community/keepalived')
-rw-r--r-- | community/keepalived/PKGBUILD | 8 | ||||
-rw-r--r-- | community/keepalived/keepalived.service | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD index 835ead41a..85c397d94 100644 --- a/community/keepalived/PKGBUILD +++ b/community/keepalived/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 75353 2012-08-21 06:05:32Z seblu $ +# $Id: PKGBUILD 75723 2012-08-29 14:02:05Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Andrea Zucchelli <zukka77@gmail.com> pkgname=keepalived -pkgver=1.2.6 +pkgver=1.2.7 pkgrel=1 pkgdesc='Failover and monitoring daemon for LVS clusters' arch=('i686' 'x86_64' 'mips64el') @@ -15,9 +15,9 @@ source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz" 'keepalived.rc' 'keepalived.service' 'keepalived.conf') -md5sums=('299f8c7eae521753c3e1f2689974982a' +md5sums=('8551a34ee048895dbe5350a031ff29c1' '0d7ea6296bce403a5d24be305a0a9d73' - '7a327df915700dcd45a049d099c9c42b' + 'dd0a003a24057eba1e4dc09f372aaa52' '9c8142da8730ad27a345587dea83ced7') build() { diff --git a/community/keepalived/keepalived.service b/community/keepalived/keepalived.service index c20f18695..e29deeebd 100644 --- a/community/keepalived/keepalived.service +++ b/community/keepalived/keepalived.service @@ -2,8 +2,7 @@ Description=Keepalive Daemon [Service] -EnvironmentFile=/etc/conf.d/keepalived -ExecStart=/usr/sbin/keepalived --dont-fork $DAEMON_OPTS +ExecStart=/usr/sbin/keepalived --dont-fork [Install] WantedBy=multi-user.target |