diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | fabric-peer.service | 5 | ||||
| -rw-r--r-- | fabric-peer.sh | 13 | ||||
| -rw-r--r-- | hyperledger-fabric.install | 35 |
5 files changed, 9 insertions, 62 deletions
@@ -1,9 +1,7 @@ -# Generated by mksrcinfo v8 -# Tue Dec 19 15:40:09 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.5 - pkgrel = 1 + pkgrel = 2 url = https://github.com/hyperledger/fabric install = hyperledger-fabric.install arch = armv6h @@ -18,14 +16,12 @@ pkgbase = hyperledger-fabric makedepends = docker depends = go source = https://github.com/hyperledger/fabric/archive/v1.0.5.tar.gz - source = fabric-peer.sh source = fabric-peer.conf source = fabric-peer.service source = arm-support.patch md5sums = f2f2f3099eed8bbe593b8ece4851b776 - md5sums = ac4694c8c49e21c816df94535a60ddfe md5sums = a0bafaaeb3be191ed2893662fe9a6fc7 - md5sums = e3c871420b7b5af4ab6d6f7b4091d2da + md5sums = 19a55d9a62f467235b51b2e4d7b3c523 md5sums = 2e0e11a95f75e66b08206b685d21eb36 pkgname = hyperledger-fabric @@ -3,7 +3,7 @@ _pkgname=fabric pkgname=hyperledger-${_pkgname} pkgver=1.0.5 -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" @@ -13,7 +13,6 @@ depends=('go') makedepends=('git' 'docker') install=$pkgname.install source=("https://github.com/hyperledger/fabric/archive/v$pkgver.tar.gz" - ${_pkgname}-peer.sh ${_pkgname}-peer.conf ${_pkgname}-peer.service arm-support.patch) @@ -56,13 +55,10 @@ 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} + install -Dm644 $srcdir/${_pkgname}-peer.conf $pkgdir/usr/lib/environment.d/${_pkgname}-peer.conf } md5sums=('f2f2f3099eed8bbe593b8ece4851b776' - 'ac4694c8c49e21c816df94535a60ddfe' 'a0bafaaeb3be191ed2893662fe9a6fc7' - 'e3c871420b7b5af4ab6d6f7b4091d2da' + '19a55d9a62f467235b51b2e4d7b3c523' '2e0e11a95f75e66b08206b685d21eb36') diff --git a/fabric-peer.service b/fabric-peer.service index f0b086db03b8..988534f8b845 100644 --- a/fabric-peer.service +++ b/fabric-peer.service @@ -5,8 +5,9 @@ After=network.target [Service] Type=simple User=hyperledger -WorkingDirectory=/var/hyperledger +DynamicUser=yes +StateDirectory=hyperledger hyperledger/db hyperledger/production +EnvironmentFile=/usr/lib/environment.d/fabric-peer.conf ExecStart=/usr/bin/peer node start -EnvironmentFile=/etc/conf.d/fabric-peer.conf PIDFile=/var/run/fabric-peer.pid diff --git a/fabric-peer.sh b/fabric-peer.sh deleted file mode 100644 index 81319edfd1f8..000000000000 --- a/fabric-peer.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/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" diff --git a/hyperledger-fabric.install b/hyperledger-fabric.install index 15e21bc61da1..f873c96e3edb 100644 --- a/hyperledger-fabric.install +++ b/hyperledger-fabric.install @@ -1,49 +1,16 @@ -usr=hyperledger -home=/var/hyperledger - post_install() { - _mkuser - _chown # cryptogen generate > /dev/null # mv /crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/* /etc/hyperledger/fabric/tls # chmod 644 /etc/hyperledger/fabric/tls/* # rm -rf /crypto-config -cat << EOF -===> If you use a Wayland session, please add these -===> global variables to ~/.config/environment.d/fabric-peer.conf - FABRIC_CFG_PATH="/etc/hyperledger/fabric" - CORE_PEER_MSPCONFIGPATH="/etc/hyperledger/fabric/msp" - -===> Look at /etc/conf.d/fabric-peer.conf for an example -EOF -} - -post_upgrade() { - _mkuser - _chown } post_remove() { cat << EOF -===> Please remove $home and user $usr manually doing - userdel -rf $usr ===> WARNING!!!" Be sure to save your backup data" /etc/hyperledger/fabric/tls should be deleted manually" -===> Remember to review ~/.config/environment.d/fabric-peer.conf +===> Remember to review /usr/lib/environment.d/fabric-peer.conf EOF } - -_chown() { - chown -R $usr:$usr $home -} - -_mkuser() { - getent passwd $usr &>/dev/null || { - echo -n "Creating hyperledger user... " - grep -E "^hyperledger:" /etc/group >/dev/null || groupadd $usr - useradd -m -d $home -g $usr -s /usr/bin/nologin $usr 2>/dev/null - echo "done" - } -} |