hyperledger-fabric: 1.0.4 with systemd service for peer node

5 files changed, 64 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 944b438377e2..be169ae5e9f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Oct 30 19:08:34 UTC 2017
+# Wed Nov  1 18:28:02 UTC 2017
 pkgbase = hyperledger-fabric
 	pkgdesc = A platform for distributed ledger solutions, underpinned by a modular architecture delivering high degrees of confidentiality, resiliency, flexibility and scalability
-	pkgver = 1.0.3
+	pkgver = 1.0.4
 	pkgrel = 1
 	url = https://github.com/hyperledger/fabric
 	install = hyperledger-fabric.install
@@ -15,10 +15,15 @@ pkgbase = hyperledger-fabric
 	license = APACHE
 	makedepends = git
 	depends = go
-	depends = docker
-	source = https://github.com/hyperledger/fabric/archive/v1.0.3.tar.gz
+	source = https://github.com/hyperledger/fabric/archive/v1.0.4.tar.gz
+	source = fabric-peer.sh
+	source = fabric-peer.conf
+	source = fabric-peer.service
 	source = arm-support.patch
-	md5sums = f2bb35c77b4a4070f017b723884a2761
+	md5sums = 00175d84c2365f6989a6b489efeda994
+	md5sums = ac4694c8c49e21c816df94535a60ddfe
+	md5sums = a0bafaaeb3be191ed2893662fe9a6fc7
+	md5sums = a34ec316d08b4cb6a3056e0df504d1af
 	md5sums = 6828396533a5cf1522465872a83a50de
 
 pkgname = hyperledger-fabric
diff --git a/PKGBUILD b/PKGBUILD
index 8f485d1900db..6ba439a5bb37 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,18 +2,22 @@
 
 _pkgname=fabric
 pkgname=hyperledger-${_pkgname}
-pkgver=1.0.3
+pkgver=1.0.4
 pkgrel=1
 pkgdesc="A platform for distributed ledger solutions, underpinned by a modular architecture delivering high degrees of confidentiality, resiliency, flexibility and scalability"
 arch=(armv6h armv7h arm i686 x86_64)
 url="https://github.com/hyperledger/fabric"
 license=('APACHE')
 groups=('hyperledger')
-depends=('go' 'docker')
+depends=('go')
 makedepends=('git')
 install=$pkgname.install
 source=("https://github.com/hyperledger/fabric/archive/v$pkgver.tar.gz"
-	arm-support.patch)
+		${_pkgname}-peer.sh
+		${_pkgname}-peer.conf
+		${_pkgname}-peer.service
+		arm-support.patch)
+
 export GOOS=linux
 case "$CARCH" in
   x86_64) export GOARCH=amd64 ;;
@@ -45,12 +49,20 @@ package() {
   install -Dm 644 -t "$pkgdir/usr/share/doc/$pkgname" README.md
 
   cp -r release/linux-$GOARCH/bin "$pkgdir/usr"
-  mkdir -p $pkgdir/etc/hyperledger/fabric
+  mkdir -p $pkgdir/etc/hyperledger/fabric/tls
   cp -r sampleconfig/* $pkgdir/etc/hyperledger/fabric
 
-  mkdir -p $pkgdir/var/hyperledger/{db,production}
+msg2 "Install systemd service"
+  install -Dm644 $srcdir/${_pkgname}-peer.service $pkgdir/usr/lib/systemd/system/${_pkgname}-peer.service
 
+msg2 "Install conf file"
+  install -Dm644 $srcdir/${_pkgname}-peer.conf $pkgdir/etc/conf.d/${_pkgname}-peer.conf
+  install -Dm644 $srcdir/${_pkgname}-peer.sh $pkgdir/etc/profile.d/${_pkgname}-peer.sh
+  mkdir -p $pkgdir/var/hyperledger/{db,production}
 }
 
-md5sums=('f2bb35c77b4a4070f017b723884a2761'
+md5sums=('00175d84c2365f6989a6b489efeda994'
+         'ac4694c8c49e21c816df94535a60ddfe'
+         'a0bafaaeb3be191ed2893662fe9a6fc7'
+         'a34ec316d08b4cb6a3056e0df504d1af'
          '6828396533a5cf1522465872a83a50de')
diff --git a/fabric-peer.conf b/fabric-peer.conf
new file mode 100644
index 000000000000..39b365e75d6f
--- /dev/null
+++ b/fabric-peer.conf
@@ -0,0 +1,11 @@
+FABRIC_CFG_PATH="/etc/hyperledger/fabric"
+CORE_LOGGING_LEVEL="ERROR"
+CORE_LOGGING_LEVEL="DEBUG"
+CORE_PEER_TLS_ENABLED="true"
+CORE_PEER_GOSSIP_USELEADERELECTION="true"
+CORE_PEER_GOSSIP_ORGLEADER="false"
+CORE_PEER_PROFILE_ENABLED="true"
+CORE_PEER_TLS_CERT_FILE="/etc/hyperledger/fabric/tls/server.crt"
+CORE_PEER_TLS_KEY_FILE="/etc/hyperledger/fabric/tls/server.key"
+CORE_PEER_TLS_ROOTCERT_FILE="/etc/hyperledger/fabric/tls/ca.crt"
+CORE_PEER_MSPCONFIGPATH="/etc/hyperledger/fabric/msp"
diff --git a/fabric-peer.service b/fabric-peer.service
new file mode 100644
index 000000000000..3985f7a6a011
--- /dev/null
+++ b/fabric-peer.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Hyperledger Fabric Peer Node
+After=network.target
+
+[Service]
+Type=forking
+User=hyperledger
+WorkingDirectory=/var/hyperledger
+ExecStart=/usr/bin/peer node start
+EnvironmentFile=/etc/conf.d/fabric-peer.conf
+
+
diff --git a/fabric-peer.sh b/fabric-peer.sh
new file mode 100644
index 000000000000..81319edfd1f8
--- /dev/null
+++ b/fabric-peer.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+export FABRIC_CFG_PATH="/etc/hyperledger/fabric"
+export CORE_LOGGING_LEVEL="ERROR"
+export CORE_LOGGING_LEVEL="DEBUG"
+export CORE_PEER_TLS_ENABLED="true"
+export CORE_PEER_GOSSIP_USELEADERELECTION="true"
+export CORE_PEER_GOSSIP_ORGLEADER="false"
+export CORE_PEER_PROFILE_ENABLED="true"
+export CORE_PEER_TLS_CERT_FILE="/etc/hyperledger/fabric/tls/server.crt"
+export CORE_PEER_TLS_KEY_FILE="/etc/hyperledger/fabric/tls/server.key"
+export CORE_PEER_TLS_ROOTCERT_FILE="/etc/hyperledger/fabric/tls/ca.crt"
+export CORE_PEER_MSPCONFIGPATH="/etc/hyperledger/fabric/msp"