summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--INSTALL/cfengine-lts/.SRCINFO30
-rw-r--r--INSTALL/cfengine-lts/PKGBUILD59
-rw-r--r--INSTALL/cfengine-lts/cf-execd.service11
-rw-r--r--INSTALL/cfengine-lts/cf-monitord.service11
-rw-r--r--INSTALL/cfengine-lts/cf-serverd.service11
-rw-r--r--INSTALL/cfengine-lts/cfengine.install24
-rw-r--r--INSTALL/cfengine/.SRCINFO34
-rw-r--r--INSTALL/cfengine/PKGBUILD83
-rw-r--r--INSTALL/cfengine/cf-execd.service27
-rw-r--r--INSTALL/cfengine/cf-monitord.service25
-rw-r--r--INSTALL/cfengine/cf-serverd.service22
-rw-r--r--INSTALL/cfengine/cfengine.install40
-rw-r--r--INSTALL/cfengine/cfengine3.service14
-rw-r--r--README5
14 files changed, 249 insertions, 147 deletions
diff --git a/INSTALL/cfengine-lts/.SRCINFO b/INSTALL/cfengine-lts/.SRCINFO
deleted file mode 100644
index 2cadd98..0000000
--- a/INSTALL/cfengine-lts/.SRCINFO
+++ /dev/null
@@ -1,30 +0,0 @@
-pkgbase = cfengine
- pkgdesc = Automated suite of programs for configuring and maintaining Unix-like computers.
- pkgver = 3.6.0
- pkgrel = 1
- url = http://www.cfengine.org
- install = cfengine.install
- arch = i686
- arch = x86_64
- license = GPL3
- makedepends = which
- depends = qdbm
- depends = openssl
- depends = pcre
- depends = libxml2
- optdepends = tokyocabinet
- optdepends = libvirt
- optdepends = postgresql-libs
- optdepends = libmariadbclient
- optdepends = acl
- source = cfengine-3.6.0.tar.gz::https://s3.amazonaws.com/cfengine.package-repos/tarballs/cfengine-3.6.0.tar.gz
- source = cf-execd.service
- source = cf-monitord.service
- source = cf-serverd.service
- md5sums = 42b0d3a90a1b60bf25cf63ccd6366f59
- md5sums = dba17dc5133b8fa86de11577120d46c5
- md5sums = a2f9db31408f288cb934397ffb474db3
- md5sums = ff28f7de9b81b4673082a2640a318896
-
-pkgname = cfengine
-
diff --git a/INSTALL/cfengine-lts/PKGBUILD b/INSTALL/cfengine-lts/PKGBUILD
deleted file mode 100644
index 62118a2..0000000
--- a/INSTALL/cfengine-lts/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# Maintainer: Kuba Serafinowski <zizzfizzix AT gmail DOT com>
-# https://github.com/zizzfizzix/pkgbuilds
-#
-# Contributor: Phillip Smith <fukawi2@NO-SPAM.gmail.com>
-# Contributor: Christian Berendt <christian@thorlin.de>
-
-pkgname=cfengine
-pkgver=3.7.2
-pkgrel=1
-pkgdesc='Automated suite of programs for configuring and maintaining Unix-like computers.'
-url='http://www.cfengine.org'
-license=('GPL3')
-arch=('i686' 'x86_64')
-depends=('qdbm' 'openssl' 'pcre' 'libxml2')
-makedepends=('which')
-optdepends=('tokyocabinet' 'libvirt' 'postgresql-libs' 'libmariadbclient' 'acl')
-install=${pkgname}.install
-source=("https://cfengine-package-repos.s3.amazonaws.com/tarballs/${pkgname}-${pkgver}.tar.gz"
- 'cf-execd.service'
- 'cf-monitord.service'
- 'cf-serverd.service')
-md5sums=('aff92abe87a5424680afd285d0384bef'
- 'dba17dc5133b8fa86de11577120d46c5'
- 'a2f9db31408f288cb934397ffb474db3'
- 'ff28f7de9b81b4673082a2640a318896')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- ./configure \
- --prefix=/usr \
- --with-workdir=/var/${pkgname} \
- --with-openssl \
- --with-pcre \
- --with-libacl=check \
- --with-libxml2 \
- --with-libvirt=check \
- --with-qdbm \
- --with-mysql=check \
- --with-tokyocabinet=check \
- --with-postgresql=check
-
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- make DESTDIR=$pkgdir install
-
- install -D -m644 ${srcdir}/cf-execd.service \
- ${pkgdir}/usr/lib/systemd/system/cf-execd.service
- install -D -m644 ${srcdir}/cf-serverd.service \
- ${pkgdir}/usr/lib/systemd/system/cf-serverd.service
- install -D -m644 ${srcdir}/cf-monitord.service \
- ${pkgdir}/usr/lib/systemd/system/cf-monitord.service
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/INSTALL/cfengine-lts/cf-execd.service b/INSTALL/cfengine-lts/cf-execd.service
deleted file mode 100644
index b56fb41..0000000
--- a/INSTALL/cfengine-lts/cf-execd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=CFEngine Execution Daemon
-After=syslog.target
-
-[Service]
-ExecStart=/var/cfengine/bin/cf-execd
-Type=forking
-PIDFile=/var/cfengine/cf-execd.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/INSTALL/cfengine-lts/cf-monitord.service b/INSTALL/cfengine-lts/cf-monitord.service
deleted file mode 100644
index b76135d..0000000
--- a/INSTALL/cfengine-lts/cf-monitord.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=CFEngine Monitoring Daemon
-After=syslog.target
-
-[Service]
-ExecStart=/var/cfengine/bin/cf-monitord
-Type=forking
-PIDFile=/var/cfengine/cf-monitord.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/INSTALL/cfengine-lts/cf-serverd.service b/INSTALL/cfengine-lts/cf-serverd.service
deleted file mode 100644
index 3ad8ebe..0000000
--- a/INSTALL/cfengine-lts/cf-serverd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=CFEngine Server Daemon
-After=syslog.target
-
-[Service]
-ExecStart=/var/cfengine/bin/cf-serverd
-Type=forking
-PIDFile=/var/cfengine/cf-serverd.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/INSTALL/cfengine-lts/cfengine.install b/INSTALL/cfengine-lts/cfengine.install
deleted file mode 100644
index fad7bba..0000000
--- a/INSTALL/cfengine-lts/cfengine.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
-
- if [ ! -f /var/cfengine/ppkeys/localhost.priv ]; then
- cf-key > /dev/null
- fi
-
- if ! [ -f /var/cfengine/masterfiles/promises.cf ]; then
- cp -R /usr/share/CoreBase/* /var/cfengine/masterfiles/
- fi
-
- if ! [ -f /var/cfengine/bin/cf-promises ]; then
- cd /var/cfengine/bin
- ln -s /usr/bin/cf-* .
- fi
-
- echo "Bootstrap cfengine with cf-agent --bootstrap <IP address of policy server>"
-
-}
-post_remove() {
-
- if [ -d /var/cfengine/bin ]; then
- rm /var/cfengine/bin/*
- fi
-}
diff --git a/INSTALL/cfengine/.SRCINFO b/INSTALL/cfengine/.SRCINFO
new file mode 100644
index 0000000..8deca05
--- /dev/null
+++ b/INSTALL/cfengine/.SRCINFO
@@ -0,0 +1,34 @@
+pkgbase = cfengine
+ pkgdesc = Automated suite of programs for configuring and maintaining Unix-like computers.
+ pkgver = 3.7.4
+ pkgrel = 1
+ url = http://www.cfengine.org
+ install = cfengine.install
+ arch = i686
+ arch = x86_64
+ license = GPL3
+ makedepends = which
+ depends = lmdb
+ depends = openssl
+ depends = pcre
+ depends = libxml2
+ depends = pam
+ optdepends = libvirt
+ optdepends = postgresql-libs
+ optdepends = libmariadbclient
+ optdepends = acl
+ source = cfengine-3.7.4.tar.gz::https://cfengine-package-repos.s3.amazonaws.com/tarballs/cfengine-3.7.4.tar.gz
+ source = cfengine-masterfiles-3.7.4.tar.gz::https://cfengine-package-repos.s3.amazonaws.com/tarballs/cfengine-masterfiles-3.7.4.tar.gz
+ source = cf-execd.service
+ source = cf-monitord.service
+ source = cf-serverd.service
+ source = cfengine3.service
+ md5sums = 7322acc96a693bda2726030365c90bcc
+ md5sums = c52543997cc3921213c56f4579d68fdc
+ md5sums = 6edac71eaac0a19fc5b8129f17d82bb2
+ md5sums = 199a7867b60a3e4013da4ac42343e22e
+ md5sums = f8783637895f6f3dd19a6ba689181d41
+ md5sums = 4b89518da032b45073e46a993fd7fe26
+
+pkgname = cfengine
+
diff --git a/INSTALL/cfengine/PKGBUILD b/INSTALL/cfengine/PKGBUILD
new file mode 100644
index 0000000..d793167
--- /dev/null
+++ b/INSTALL/cfengine/PKGBUILD
@@ -0,0 +1,83 @@
+# Maintainer: Vanush Misha Paturyan <ektich+cfengine-aur@gmail.com>
+# https://aur.archlinux.org/cfengine.git
+#
+# Contributor: Kuba Serafinowski <zizzfizzix AT gmail DOT com>
+# Contributor: Phillip Smith <fukawi2@NO-SPAM.gmail.com>
+# Contributor: Christian Berendt <christian@thorlin.de>
+
+pkgname=cfengine
+pkgver=3.7.4
+pkgrel=1
+pkgdesc='Automated suite of programs for configuring and maintaining Unix-like computers.'
+url='http://www.cfengine.org'
+license=('GPL3')
+arch=('i686' 'x86_64')
+depends=('lmdb' 'openssl' 'pcre' 'libxml2' 'pam')
+makedepends=('which')
+optdepends=('libvirt' 'postgresql-libs' 'libmariadbclient' 'acl')
+install=${pkgname}.install
+#https://cfengine-package-repos.s3.amazonaws.com/tarballs/cfengine-3.7.4.tar.gz
+source=("${pkgname}-${pkgver}.tar.gz::https://cfengine-package-repos.s3.amazonaws.com/tarballs/${pkgname}-${pkgver}.tar.gz"
+ "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'
+ 'cfengine3.service')
+
+md5sums=('7322acc96a693bda2726030365c90bcc'
+ 'c52543997cc3921213c56f4579d68fdc'
+ '6edac71eaac0a19fc5b8129f17d82bb2'
+ '199a7867b60a3e4013da4ac42343e22e'
+ 'f8783637895f6f3dd19a6ba689181d41'
+ '4b89518da032b45073e46a993fd7fe26')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ ./configure \
+ --prefix=/usr \
+ --with-workdir=/var/${pkgname} \
+ --with-openssl \
+ --with-pcre \
+ --with-libacl=check \
+ --with-libxml2 \
+ --with-libvirt=check \
+ --with-lmdb \
+ --with-mysql=check \
+ --with-postgresql=check
+
+ make
+ # now build masterfiles
+ cd ${srcdir}/${pkgname}-masterfiles-${pkgver}
+ ./configure \
+ --prefix=/usr/share/doc/cfengine/CoreBase \
+ --with-core=../cfengine-${pkgver}
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=$pkgdir install
+
+ # masterfiles
+ cd ${srcdir}/${pkgname}-masterfiles-${pkgver}
+ make DESTDIR=$pkgdir install
+
+ install -D -m644 ${srcdir}/cf-execd.service \
+ ${pkgdir}/usr/lib/systemd/system/cf-execd.service
+ install -D -m644 ${srcdir}/cf-serverd.service \
+ ${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
+
+ for f in $(ls ${pkgdir}/usr/bin); do
+ /bin/ln -s /usr/bin/$f ${pkgdir}/var/cfengine/bin
+ done
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/INSTALL/cfengine/cf-execd.service b/INSTALL/cfengine/cf-execd.service
new file mode 100644
index 0000000..9c05e81
--- /dev/null
+++ b/INSTALL/cfengine/cf-execd.service
@@ -0,0 +1,27 @@
+[Unit]
+Description=CFEngine Execution Daemon
+Documentation=man:cf-execd https://docs.cfengine.com/latest/reference-components-cf-execd.html
+
+After=network.target
+
+# The following ensures that the service is activated only if we have a
+# promises.cf in place. If there is no promises.cf, there is no configuration
+# for the service either...
+ConditionPathExists=/var/cfengine/inputs/promises.cf
+
+# The following allows stopping/restarting of this service when
+# cfengine3.serice is stopped/restarted
+PartOf=cfengine3.service
+
+[Install]
+# The following ensures that the symlink to this unit is created in the
+# cfengine3.service.requires/ directory when this unit is enabled
+# with "systemctl enable" command, and removed with "systemctl disable"
+RequiredBy=cfengine3.service
+
+[Service]
+ExecStart=/var/cfengine/bin/cf-execd
+Type=forking
+PIDFile=/var/cfengine/cf-execd.pid
+
+
diff --git a/INSTALL/cfengine/cf-monitord.service b/INSTALL/cfengine/cf-monitord.service
new file mode 100644
index 0000000..53d1136
--- /dev/null
+++ b/INSTALL/cfengine/cf-monitord.service
@@ -0,0 +1,25 @@
+[Unit]
+Description=CFEngine Monitoring Daemon
+Documentation=man:cf-monitord https://docs.cfengine.com/latest/reference-components-cf-monitord.html
+
+After=network.target
+
+# The following ensures that the service is activated only if we have a
+# promises.cf in place.
+ConditionPathExists=/var/cfengine/inputs/promises.cf
+
+# The following allows stopping/restarting of this service when
+# cfengine3.serice is stopped/restarted
+PartOf=cfengine3.service
+
+[Install]
+# The following ensures that the symlink to this unit is created in the
+# cfengine3.service.requires/ directory when this unit is enabled
+# with "systemctl enable" command, and removed with "systemctl disable"
+RequiredBy=cfengine3.service
+
+
+[Service]
+ExecStart=/var/cfengine/bin/cf-monitord
+Type=forking
+PIDFile=/var/cfengine/cf-monitord.pid
diff --git a/INSTALL/cfengine/cf-serverd.service b/INSTALL/cfengine/cf-serverd.service
new file mode 100644
index 0000000..3aba3f6
--- /dev/null
+++ b/INSTALL/cfengine/cf-serverd.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=CFEngine Server Daemon
+Documentation=man:cf-serverd https://docs.cfengine.com/latest/reference-components-cf-serverd.html
+
+After=network.target
+
+# The following ensures that the service is activated only if we have a
+# promises.cf in place.
+PartOf=cfengine3.service
+
+[Install]
+# The following ensures that the symlink to this unit is created in the
+# cfengine3.service.requires/ directory when this unit is enabled
+# with "systemctl enable" command, and removed with "systemctl disable"
+RequiredBy=cfengine3.service
+
+[Service]
+ExecStart=/var/cfengine/bin/cf-serverd
+Type=forking
+PIDFile=/var/cfengine/cf-serverd.pid
+
+
diff --git a/INSTALL/cfengine/cfengine.install b/INSTALL/cfengine/cfengine.install
new file mode 100644
index 0000000..c0e436a
--- /dev/null
+++ b/INSTALL/cfengine/cfengine.install
@@ -0,0 +1,40 @@
+PREFIX=/var/cfengine
+
+post_install() {
+
+# generate a host key
+ if [ ! -f $PREFIX/ppkeys/localhost.priv ]; then
+ $PREFIX/bin/cf-key > /dev/null
+ fi
+
+# copy the stock policy for the new installations and create promies_validated
+ if ! [ -f $PREFIX/masterfiles/promises.cf ]; then
+ /bin/cp -R /usr/share/doc/cfengine/CoreBase/masterfiles/* $PREFIX/masterfiles/
+ $PREFIX/bin/cf-promises -T $PREFIX/masterfiles
+ fi
+
+# copy modules/packages (part of stock policy)
+ if ! [ -f $PREFIX/modules/packages ]; then
+ mkdir -p $PREFIX/modules/packages
+ fi
+ if cd /usr/share/doc/cfengine/CoreBase/modules/packages; then
+ for module in *; do
+ if ! [ -f $PREFIX/modules/packages/$module ]; then
+ cp $module $PREFIX/modules/packages
+ fi
+ done
+ fi
+ #if ! [ -f /var/cfengine/bin/cf-promises ]; then
+ # cd /var/cfengine/bin
+ # ln -s /usr/bin/cf-* .
+ #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() {
+
+ if [ -d /var/cfengine/bin ]; then
+ rm /var/cfengine/bin/*
+ fi
+}
diff --git a/INSTALL/cfengine/cfengine3.service b/INSTALL/cfengine/cfengine3.service
new file mode 100644
index 0000000..47c39c6
--- /dev/null
+++ b/INSTALL/cfengine/cfengine3.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=CFEngine 3 daemons
+Documentation=https://docs.cfengine.com/lts
+
+After=network.target
+
+[Service]
+Type=oneshot
+ExecStart=/bin/true
+ExecReload=/bin/true
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target \ No newline at end of file
diff --git a/README b/README
index c373235..4a76723 100644
--- a/README
+++ b/README
@@ -3,12 +3,15 @@ Requirements
pacman -S archiso qemu syslinux darkhttpd
+or
+
+pacman -S libvirt qemu qemu-arch-extra
+
ArchISO and optional local cache
--------------------------------
# We build a live Arch boot CD.
-export http_proxy=http://192.168.1.12:3128
mkdir archlive
cp -r /usr/share/archiso/configs/releng/* archlive/.
cd archlive