summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorM0Rf302018-03-26 21:23:26 +0200
committerM0Rf302018-03-26 21:23:26 +0200
commiteab89a296818936adc7dedcf996848185f1874ff (patch)
treec0b1ea8c89e7c897d23a042eb4db8e8b772daea6
parentdb0760c4a266d1d8af8b20bad98b7ff19c5ffd4c (diff)
downloadaur-eab89a296818936adc7dedcf996848185f1874ff.tar.gz
hyperledger-fabric: cleanup
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD17
-rw-r--r--arm-support.patch11
-rw-r--r--fabric-peer.conf11
-rw-r--r--fabric-peer.service13
-rw-r--r--hyperledger-fabric.install14
6 files changed, 69 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7001dd03ebd3..2e51bda537a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
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.1.0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/hyperledger/fabric
+ install = hyperledger-fabric.install
arch = armv6h
arch = armv7h
arch = arm
@@ -15,9 +16,13 @@ pkgbase = hyperledger-fabric
makedepends = docker
depends = go
source = https://github.com/hyperledger/fabric/archive/v1.1.0.tar.gz
+ source = fabric-peer.conf
+ source = fabric-peer.service
source = arm-support.patch
md5sums = 3c9fcd96296a4f699f8f79fd96718b0f
- md5sums = a3b4e6d9f3c0675e9d53894e4e17cd15
+ md5sums = a0bafaaeb3be191ed2893662fe9a6fc7
+ md5sums = 19a55d9a62f467235b51b2e4d7b3c523
+ md5sums = ac9701b648b4a9e0aea5d18268c06a30
pkgname = hyperledger-fabric
diff --git a/PKGBUILD b/PKGBUILD
index 78b408f594a5..3ab5274c4c55 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname=fabric
pkgname=hyperledger-${_pkgname}
pkgver=1.1.0
-pkgrel=1
+pkgrel=2
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 aarch64 i686 x86_64)
url="https://github.com/hyperledger/fabric"
@@ -11,7 +11,10 @@ license=('APACHE')
groups=('hyperledger')
depends=('go')
makedepends=('git' 'docker')
+install=$pkgname.install
source=("https://github.com/hyperledger/fabric/archive/v$pkgver.tar.gz"
+ ${_pkgname}-peer.conf
+ ${_pkgname}-peer.service
arm-support.patch)
export GOOS=linux
@@ -46,8 +49,16 @@ package() {
cp -r release/linux-$GOARCH/bin "$pkgdir/usr"
install -dm 755 $pkgdir/etc/hyperledger/fabric/tls
- install -dm 755 $pkgdir/etc/hyperledger/fabric/msp
+ cp -r sampleconfig/* $pkgdir/etc/hyperledger/fabric
+
+ 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/usr/lib/environment.d/${_pkgname}-peer.conf
}
md5sums=('3c9fcd96296a4f699f8f79fd96718b0f'
- 'a3b4e6d9f3c0675e9d53894e4e17cd15')
+ 'a0bafaaeb3be191ed2893662fe9a6fc7'
+ '19a55d9a62f467235b51b2e4d7b3c523'
+ 'ac9701b648b4a9e0aea5d18268c06a30')
diff --git a/arm-support.patch b/arm-support.patch
index c4b5a74b71a9..1e336393799b 100644
--- a/arm-support.patch
+++ b/arm-support.patch
@@ -1,5 +1,5 @@
--- a/Makefile 2018-03-15 19:02:37.000000000 +0100
-+++ b/Makefile 2018-03-16 19:54:00.191232896 +0100
++++ b/Makefile 2018-03-26 21:19:44.498004326 +0200
@@ -348,6 +348,16 @@
release/%-amd64: GOARCH=amd64
release/linux-%: GOOS=linux
@@ -17,3 +17,12 @@
release/linux-ppc64le: GOARCH=ppc64le
release/linux-ppc64le: DOCKER_ARCH=ppc64le
release/linux-ppc64le: GO_TAGS+= nopkcs11
+@@ -431,6 +441,8 @@
+ -@rm -rf release/windows-amd64/hyperledger-fabric-windows-amd64.$(PROJECT_VERSION).tar.gz ||:
+ -@rm -rf release/darwin-amd64/hyperledger-fabric-darwin-amd64.$(PROJECT_VERSION).tar.gz ||:
+ -@rm -rf release/linux-amd64/hyperledger-fabric-linux-amd64.$(PROJECT_VERSION).tar.gz ||:
++ -@rm -rf release/linux-arm/hyperledger-fabric-linux-arm64.$(PROJECT_VERSION).tar.gz ||:
++ -@rm -rf release/linux-arm64/hyperledger-fabric-linux-arm64.$(PROJECT_VERSION).tar.gz ||:
+ -@rm -rf release/linux-ppc64le/hyperledger-fabric-linux-ppc64le.$(PROJECT_VERSION).tar.gz ||:
+ -@rm -rf release/linux-s390x/hyperledger-fabric-linux-s390x.$(PROJECT_VERSION).tar.gz ||:
+
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..988534f8b845
--- /dev/null
+++ b/fabric-peer.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Hyperledger Fabric Peer Node
+After=network.target
+
+[Service]
+Type=simple
+User=hyperledger
+DynamicUser=yes
+StateDirectory=hyperledger hyperledger/db hyperledger/production
+EnvironmentFile=/usr/lib/environment.d/fabric-peer.conf
+ExecStart=/usr/bin/peer node start
+PIDFile=/var/run/fabric-peer.pid
+
diff --git a/hyperledger-fabric.install b/hyperledger-fabric.install
new file mode 100644
index 000000000000..e51194c79360
--- /dev/null
+++ b/hyperledger-fabric.install
@@ -0,0 +1,14 @@
+post_install() {
+ chmod 644 /etc/hyperledger/fabric/tls/*
+ rm -rf /crypto-config
+}
+
+post_remove() {
+ cat << EOF
+===> WARNING!!!"
+ Be sure to save your backup data"
+ /etc/hyperledger/fabric/tls should be deleted manually"
+
+===> Remember to review /usr/lib/environment.d/fabric-peer.conf
+EOF
+}