summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD15
-rw-r--r--cf-execd.service4
-rw-r--r--cf-monitord.service4
-rw-r--r--cf-serverd.service4
-rw-r--r--cfengine.install2
-rw-r--r--cfengine3.service13
7 files changed, 39 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 197a5e5bac01..610c06066f58 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = cfengine
pkgdesc = Automated suite of programs for configuring and maintaining Unix-like computers.
pkgver = 3.7.3
- pkgrel = 1
+ pkgrel = 2
url = http://www.cfengine.org
install = cfengine.install
arch = i686
@@ -22,11 +22,13 @@ pkgbase = cfengine
source = cf-execd.service
source = cf-monitord.service
source = cf-serverd.service
+ source = cfengine3.service
md5sums = dcd0a8b9490dfafad124c5135900f08b
md5sums = f7d1260a6fe9f6ce9a00c70c984a7252
- md5sums = dba17dc5133b8fa86de11577120d46c5
- md5sums = a2f9db31408f288cb934397ffb474db3
- md5sums = ff28f7de9b81b4673082a2640a318896
+ md5sums = a6d35b4460d5478afe03c7b920f09da6
+ md5sums = 674271fe623d27b0410642cabc1d442e
+ md5sums = 542358aab95c89017ca6dc65b864c079
+ md5sums = 2f950573baa3dfa7ee06e011ece2f2d8
pkgname = cfengine
diff --git a/PKGBUILD b/PKGBUILD
index b4d073bc1eee..b416d7ace542 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
pkgname=cfengine
pkgver=3.7.3
-pkgrel=1
+pkgrel=2
pkgdesc='Automated suite of programs for configuring and maintaining Unix-like computers.'
url='http://www.cfengine.org'
license=('GPL3')
@@ -20,12 +20,14 @@ source=("${pkgname}-${pkgver}.tar.gz::https://cfengine-package-repos.s3.amazonaw
"cfengine-masterfiles-${pkgver}.tar.gz::https://cfengine-package-repos.s3.amazonaws.com/tarballs/cfengine-masterfiles-${pkgver}.tar.gz"
'cf-execd.service'
'cf-monitord.service'
- 'cf-serverd.service')
+ 'cf-serverd.service'
+ 'cfengine3.service')
md5sums=('dcd0a8b9490dfafad124c5135900f08b'
'f7d1260a6fe9f6ce9a00c70c984a7252'
- 'dba17dc5133b8fa86de11577120d46c5'
- 'a2f9db31408f288cb934397ffb474db3'
- 'ff28f7de9b81b4673082a2640a318896')
+ 'a6d35b4460d5478afe03c7b920f09da6'
+ '674271fe623d27b0410642cabc1d442e'
+ '542358aab95c89017ca6dc65b864c079'
+ '2f950573baa3dfa7ee06e011ece2f2d8')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -64,6 +66,9 @@ package() {
${pkgdir}/usr/lib/systemd/system/cf-serverd.service
install -D -m644 ${srcdir}/cf-monitord.service \
${pkgdir}/usr/lib/systemd/system/cf-monitord.service
+ install -D -m644 ${srcdir}/cfengine3.service \
+ ${pkgdir}/usr/lib/systemd/system/cfengine3.service
+
install -d -m755 ${pkgdir}/var/cfengine/bin
install -d -m755 ${pkgdir}/var/cfengine/masterfiles
diff --git a/cf-execd.service b/cf-execd.service
index b56fb41a7d24..6e384c045c64 100644
--- a/cf-execd.service
+++ b/cf-execd.service
@@ -1,6 +1,7 @@
[Unit]
Description=CFEngine Execution Daemon
-After=syslog.target
+After=network.target
+PartOf=cfengine3.service
[Service]
ExecStart=/var/cfengine/bin/cf-execd
@@ -8,4 +9,5 @@ Type=forking
PIDFile=/var/cfengine/cf-execd.pid
[Install]
+WantedBy=cfengine3.service
WantedBy=multi-user.target
diff --git a/cf-monitord.service b/cf-monitord.service
index b76135df2ae8..cd8fc2f92d4b 100644
--- a/cf-monitord.service
+++ b/cf-monitord.service
@@ -1,6 +1,7 @@
[Unit]
Description=CFEngine Monitoring Daemon
-After=syslog.target
+PartOf=cfengine3.service
+After=network.target
[Service]
ExecStart=/var/cfengine/bin/cf-monitord
@@ -8,4 +9,5 @@ Type=forking
PIDFile=/var/cfengine/cf-monitord.pid
[Install]
+WantedBy=cfengine3.service
WantedBy=multi-user.target
diff --git a/cf-serverd.service b/cf-serverd.service
index 3ad8ebee44d8..2b01f3b8e31d 100644
--- a/cf-serverd.service
+++ b/cf-serverd.service
@@ -1,6 +1,7 @@
[Unit]
Description=CFEngine Server Daemon
-After=syslog.target
+PartOf=cfengine3.service
+After=network.target
[Service]
ExecStart=/var/cfengine/bin/cf-serverd
@@ -8,4 +9,5 @@ Type=forking
PIDFile=/var/cfengine/cf-serverd.pid
[Install]
+WantedBy=cfengine3.service
WantedBy=multi-user.target
diff --git a/cfengine.install b/cfengine.install
index d9820b511648..c0e436a68643 100644
--- a/cfengine.install
+++ b/cfengine.install
@@ -30,7 +30,7 @@ post_install() {
#fi
echo -e "\nBootstrap cfengine with cf-agent --bootstrap <IP address of policy server>\n"
-
+ echo -e "\nRun systemctl enable cfengine3 to enable CFEngine 3\n"
}
post_remove() {
diff --git a/cfengine3.service b/cfengine3.service
new file mode 100644
index 000000000000..92a2b7fc354f
--- /dev/null
+++ b/cfengine3.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=CFEngine 3 daemons
+After=network.target
+Requires=cf-execd.service cf-monitord.service cf-serverd.service
+
+[Service]
+Type=oneshot
+ExecStart=/bin/true
+ExecReload=/bin/true
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target \ No newline at end of file