Version bump to 1.1.1

5 files changed, 82 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 32af71731452..ebd8b1244933 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Nov 14 20:51:41 UTC 2017
+# Sun Jan  7 16:44:57 UTC 2018
 pkgbase = python2-carbon
 	pkgdesc = Backend data caching and persistence daemon for Graphite
-	pkgver = 1.0.2
-	pkgrel = 3
+	pkgver = 1.1.1
+	pkgrel = 1
 	url = https://github.com/graphite-project/carbon
 	arch = any
 	license = Apache
@@ -22,12 +22,26 @@ pkgbase = python2-carbon
 	backup = etc/carbon/storage-aggregation.conf
 	backup = etc/carbon/storage-schemas.conf
 	backup = etc/carbon/whitelist.conf
-	source = https://github.com/graphite-project/carbon/archive/1.0.2.tar.gz
-	source = carbon.service
+	source = python2-carbon-1.1.1.tar.gz::https://github.com/graphite-project/carbon/archive/1.1.1.tar.gz
 	source = carbon.conf
-	md5sums = 5dacf9b12c4d76d76ac3b3bc7409e243
-	md5sums = 5305b294d608a62945d5fc11854e25cd
-	md5sums = 4b6d054aed3304af567552782b72ea8b
+	source = carbon-aggregator.service
+	source = carbon-aggregator@.service
+	source = carbon-cache.service
+	source = carbon-cache@.service
+	source = carbon-relay.service
+	source = carbon-relay@.service
+	source = carbon.sysusers
+	source = carbon.tmpfiles
+	md5sums = fdadbf316a9d1145fe14ec7fdf5cf732
+	md5sums = c6201ce8a290d919b7f486916fb2f9b9
+	md5sums = 33c2251f7dfbe484e1a627e0408fdf36
+	md5sums = f7914dbb75fc3d65623a159333ea0528
+	md5sums = 11354dec647b82eb4099e9d2025ddf61
+	md5sums = d4d37f4e603f1ab798e77caae335358f
+	md5sums = 5440bb9e2bb2aa8a48ee8de985f50cb8
+	md5sums = 35eeae37bf98235ec77ae0b2ecd3270c
+	md5sums = 89269343d20915b28b75d8d845c8e71f
+	md5sums = 035251ab4036df23c75c521b702fbea1
 
 pkgname = python2-carbon
 
diff --git a/PKGBUILD b/PKGBUILD
index 534d2e84274a..26734d0042fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 ## Initial Maintainer: Augusto F. Hack <hack.augusto@gmail.com>
 Maintainer='Gilles Hamel <hamelg@laposte.net>'
 pkgname=python2-carbon
-pkgver=1.0.2
-pkgrel=3
+pkgver=1.1.1
+pkgrel=1
 pkgdesc='Backend data caching and persistence daemon for Graphite'
 arch=('any')
 url='https://github.com/graphite-project/carbon'
@@ -11,23 +11,70 @@ depends=('python2' 'python2-whisper' 'python2-twisted>=13.2.0')
 optdepends=('python2-txamqp: AMQP support')
 makedepends=('python2-setuptools')
 options=(!emptydirs)
-source=("https://github.com/graphite-project/carbon/archive/$pkgver.tar.gz" carbon.service carbon.conf)
-md5sums=(5dacf9b12c4d76d76ac3b3bc7409e243 5305b294d608a62945d5fc11854e25cd 4b6d054aed3304af567552782b72ea8b)
-backup=(etc/carbon/aggregation-rules.conf etc/carbon/blacklist.conf etc/carbon/carbon.amqp.conf etc/carbon/carbon.conf etc/carbon/relay-rules.conf etc/carbon/rewrite-rules.conf etc/carbon/storage-aggregation.conf etc/carbon/storage-schemas.conf etc/carbon/whitelist.conf)
+source=(
+	"$pkgname-$pkgver.tar.gz::https://github.com/graphite-project/carbon/archive/$pkgver.tar.gz"
+	carbon.conf
+	carbon-aggregator.service
+	carbon-aggregator@.service
+	carbon-cache.service
+	carbon-cache@.service
+	carbon-relay.service
+	carbon-relay@.service
+	carbon.sysusers
+	carbon.tmpfiles)
+	
+md5sums=(
+	fdadbf316a9d1145fe14ec7fdf5cf732
+	c6201ce8a290d919b7f486916fb2f9b9
+	33c2251f7dfbe484e1a627e0408fdf36
+	f7914dbb75fc3d65623a159333ea0528
+	11354dec647b82eb4099e9d2025ddf61
+	d4d37f4e603f1ab798e77caae335358f
+	5440bb9e2bb2aa8a48ee8de985f50cb8
+	35eeae37bf98235ec77ae0b2ecd3270c
+	89269343d20915b28b75d8d845c8e71f
+	035251ab4036df23c75c521b702fbea1)
+	
+backup=(
+	etc/carbon/aggregation-rules.conf
+	etc/carbon/blacklist.conf
+	etc/carbon/carbon.amqp.conf
+	etc/carbon/carbon.conf
+	etc/carbon/relay-rules.conf
+	etc/carbon/rewrite-rules.conf
+	etc/carbon/storage-aggregation.conf
+	etc/carbon/storage-schemas.conf
+	etc/carbon/whitelist.conf)
 
 package() {
+
+  cd "$srcdir"
+  ls *.service | while read service; do
+    install -D -m644 $service "$pkgdir"/usr/lib/systemd/system/$service
+  done ;
+  install -Dm644 carbon.sysusers "$pkgdir"/usr/lib/sysusers.d/carbon.conf
+  install -Dm644 carbon.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/carbon.conf
+
   cd "$srcdir/carbon-$pkgver"
   python2 setup.py install --root="$pkgdir/" --install-lib=/usr/lib/python2.7/site-packages --install-data=/var/lib/graphite --install-scripts=/usr/bin --optimize=1
-  install -D -m644 $srcdir/carbon.service $pkgdir/usr/lib/systemd/system/carbon.service
-
+  
   # change the directory of the config files
   ls conf | while read conf; do
-    install -D -m644 conf/$conf $pkgdir/etc/carbon/${conf/.example}
+    install -D -m644 conf/$conf "$pkgdir"/etc/carbon/examples/${conf/.example}
   done;
-  rm -r $pkgdir/var
+  rm -r "$pkgdir"/var
 
-  # use our config with FHS
-  install -D -m644 $srcdir/carbon.conf $pkgdir/etc/carbon/carbon.conf
+  install -D -m644 /dev/null "$pkgdir"/etc/carbon/aggregation-rules.conf
+  install -D -m644 /dev/null "$pkgdir"/etc/carbon/blacklist.conf
+  install -D -m644 /dev/null "$pkgdir"/etc/carbon/carbon.amqp.conf
+  install -D -m644 /dev/null "$pkgdir"/etc/carbon/relay-rules.conf
+  install -D -m644 /dev/null "$pkgdir"/etc/carbon/rewrite-rules.conf
+  install -D -m644 /dev/null "$pkgdir"/etc/carbon/whitelist.conf
+  install -D -m644 conf/storage-aggregation.conf.example "$pkgdir"/etc/carbon/storage-aggregation.conf
+  install -D -m644 conf/storage-schemas.conf.example "$pkgdir"/etc/carbon/storage-schemas.conf
+  
+  # use our simple config with FHS
+  install -D -m644 "$srcdir"/carbon.conf "$pkgdir"/etc/carbon/carbon.conf
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/carbon.service b/carbon.service
deleted file mode 100644
index cdc84d0651b8..000000000000
--- a/carbon.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Graphite/Carbon
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/carbon-cache.py --config=/etc/carbon/carbon.conf start
-
-[Install]
-WantedBy=multi-user.target
diff --git a/carbon.sysusers b/carbon.sysusers
new file mode 100644
index 000000000000..81d853624a5e
--- /dev/null
+++ b/carbon.sysusers
@@ -0,0 +1 @@
+u carbon - "graphite carbon daemons" /var/lib/carbon
diff --git a/carbon.tmpfiles b/carbon.tmpfiles
new file mode 100644
index 000000000000..f598ae625715
--- /dev/null
+++ b/carbon.tmpfiles
@@ -0,0 +1 @@
+d /var/lib/carbon 0755 carbon carbon