mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-09-20 06:54:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed trackomatron, updated config to tendermint 0.16 (config dir) and changed services to in-process

Browse Source
This commit is contained in:
Greg Szabo
2018-02-19 19:38:29 -05:00
parent 9bd1f28b8d
commit 1eb7a8a2cc
24 changed files with 216 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/Makefile
+6 -18
View File
@@ -35,12 +35,12 @@ endif
# Here comes the real deal
###
binaries = tendermint basecoin ethermint trackomatron gaia
build-binaries = build-tendermint build-basecoin build-ethermint build-trackomatron build-gaia
package-rpm = package-rpm-tendermint package-rpm-basecoin package-rpm-ethermint package-rpm-trackomatron package-rpm-gaia
install-rpm = install-rpm-tendermint install-rpm-basecoin install-rpm-ethermint install-rpm-trackomatron install-rpm-gaia
package-deb = package-deb-tendermint package-deb-basecoin package-deb-ethermint package-deb-trackomatron package-deb-gaia
install-deb = install-deb-tendermint install-deb-basecoin install-deb-ethermint install-deb-trackomatron install-deb-gaia
binaries = tendermint basecoin ethermint gaia
build-binaries = build-tendermint build-basecoin build-ethermint build-gaia
package-rpm = package-rpm-tendermint package-rpm-basecoin package-rpm-ethermint package-rpm-gaia
install-rpm = install-rpm-tendermint install-rpm-basecoin install-rpm-ethermint install-rpm-gaia
package-deb = package-deb-tendermint package-deb-basecoin package-deb-ethermint package-deb-gaia
install-deb = install-deb-tendermint install-deb-basecoin install-deb-ethermint install-deb-gaia
all: $(binaries)
build: $(build-binaries)
@@ -76,14 +76,6 @@ build-ethermint: git-branch gopath-setup
cp $(GOPATH)/src/github.com/tendermint/ethermint/build/ethermint $(GOPATH)/bin
@echo "*** Built ethermint"
build-trackomatron: git-branch gopath-setup
@echo "*** Building trackomatron"
go get -d -u github.com/tendermint/trackomatron/cmd/tracko
cd $(GOPATH)/src/github.com/tendermint/trackomatron && git checkout "$(GIT_BRANCH)" && git pull
export PATH=$(GOPATH)/bin:$(PATH) && $(MAKE) -C $(GOPATH)/src/github.com/tendermint/trackomatron get_vendor_deps install
@echo "Workaround: trackomatron package has tracko as the binary - trackomatron needed for proper packaging" && rm -rf $(GOPATH)/bin/trackomatron && ln -s $(GOPATH)/bin/tracko $(GOPATH)/bin/trackomatron
@echo "*** Built trackomatron"
build-gaia: git-branch gopath-setup
@echo "*** Building gaia"
go get -d -u go github.com/cosmos/gaia || echo "Workaround for go downloads."
@@ -126,7 +118,6 @@ prepare-tendermint =
prepare-ethermint = mkdir -p $(build_folder)/etc/ethermint && \
cp $(GOPATH)/src/github.com/tendermint/ethermint/setup/genesis.json $(build_folder)/etc/ethermint/genesis.json && \
cp -r $(GOPATH)/src/github.com/tendermint/ethermint/setup/keystore $(build_folder)/etc/ethermint
prepare-trackomatron = rm -f $(build_folder)/usr/bin/trackomatron && cp $(GOPATH)/bin/tracko $(GOPATH)/bin/trackocli $(build_folder)/usr/bin
prepare-gaia =
prepare-basecoin = cp $(GOPATH)/bin/basecoin $(build_folder)/usr/bin
@@ -289,13 +280,10 @@ distclean: clean
rm -rf $(GOPATH)/src/github.com/tendermint/tendermint
rm -rf $(GOPATH)/src/github.com/cosmos/cosmos-sdk
rm -rf $(GOPATH)/src/github.com/tendermint/ethermint
rm -rf $(GOPATH)/src/github.com/tendermint/trackomatron
rm -rf $(GOPATH)/bin/tendermint
rm -rf $(GOPATH)/bin/basecoin
rm -rf $(GOPATH)/bin/ethermint
rm -rf $(GOPATH)/bin/gaia
rm -rf $(GOPATH)/bin/tracko
rm -rf $(GOPATH)/bin/trackocli
.PHONY : clean
build/basecoin/DEBIAN/postinst
-1
View File
@@ -21,7 +21,6 @@ case "$1" in
configure)
chown basecoin.basecoin /etc/basecoin
sudo -Hu basecoin basecoin node init --home /etc/basecoin 2B24DEE2364762300168DF19B6C18BCE2D399EA2
sudo -Hu basecoin tendermint init --home /etc/basecoin
systemctl daemon-reload
;;
build/basecoin/DEBIAN/prerm
-1
View File
@@ -19,7 +19,6 @@ set -e
case "$1" in
remove|upgrade|deconfigure)
systemctl stop basecoin 2> /dev/null || :
systemctl stop basecoin-service 2> /dev/null || :
;;
failed-upgrade)
build/basecoin/etc/systemd/system-preset/50-basecoin.preset
-1
View File
@@ -1,3 +1,2 @@
disable basecoin.service
disable basecoin-server.service
build/basecoin/etc/systemd/system/basecoin-server.service
-24
View File
@@ -1,24 +0,0 @@
[Unit]
Description=Basecoin server
Requires=network-online.target
BindTo=basecoin.service
PartOf=basecoin.service
Before=basecoin.service
After=network-online.target
PropagatesReloadTo=basecoin.service
ReloadPropagatedFrom=basecoin.service
[Service]
Environment="TMHOME=/etc/basecoin"
Restart=on-failure
User=basecoin
Group=basecoin
PermissionsStartOnly=true
ExecStart=/usr/bin/tendermint node
ExecReload=/bin/kill -HUP $MAINPID
KillSignal=SIGTERM
[Install]
WantedBy=multi-user.target
Also=basecoin.service
build/basecoin/etc/systemd/system/basecoin.service
+3 -13
View File
@@ -1,16 +1,7 @@
[Unit]
Description=Basecoin
#propagates activation, deactivation and activation fails.
Requires=network-online.target
#propagates activation, deactivation, activation fails and stops
BindTo=basecoin-server.service
#propagates stop and restart (one-way)
PartOf=basecoin-server.service
#order
After=network-online.target basecoin-server.service
#propagates reload
PropagatesReloadTo=basecoin-server.service
ReloadPropagatedFrom=basecoin-server.service
After=network-online.target
[Service]
Environment="BCHOME=/etc/basecoin"
@@ -18,11 +9,10 @@ Restart=on-failure
User=basecoin
Group=basecoin
PermissionsStartOnly=true
ExecStart=/usr/bin/basecoin start --without-tendermint
ExecStart=/usr/bin/basecoind start
ExecReload=/bin/kill -HUP $MAINPID
KillSignal=SIGTERM
[Install]
WantedBy=multi-user.target basecoin-server.service
Also=basecoin-server.service
WantedBy=multi-user.target
build/ethermint/DEBIAN/postinst
+1 -1
View File
@@ -1,5 +1,5 @@
#!/bin/sh
# postinst script for basecoin
# postinst script for ethermint
#
set -e
build/ethermint/DEBIAN/prerm
-1
View File
@@ -19,7 +19,6 @@ set -e
case "$1" in
remove|upgrade|deconfigure)
systemctl stop ethermint 2> /dev/null || :
systemctl stop ethermint-service 2> /dev/null || :
;;
failed-upgrade)
build/ethermint/etc/systemd/system-preset/50-ethermint.preset
-1
View File
@@ -1,3 +1,2 @@
disable ethermint.service
disable ethermint-server.service
build/ethermint/etc/systemd/system/ethermint-server.service
-24
View File
@@ -1,24 +0,0 @@
[Unit]
Description=Ethermint server
Requires=network-online.target
BindTo=ethermint.service
PartOf=ethermint.service
Before=ethermint.service
After=network-online.target
PropagatesReloadTo=ethermint.service
ReloadPropagatedFrom=ethermint.service
[Service]
Environment="TMHOME=/etc/ethermint"
Restart=on-failure
User=ethermint
Group=ethermint
PermissionsStartOnly=true
ExecStart=/usr/bin/tendermint node
ExecReload=/bin/kill -HUP $MAINPID
KillSignal=SIGTERM
[Install]
WantedBy=multi-user.target ethermint.service
Also=ethermint.service
build/ethermint/etc/systemd/system/ethermint.service
+2 -12
View File
@@ -1,16 +1,7 @@
[Unit]
Description=Ethermint
#propagates activation, deactivation and activation fails.
Requires=network-online.target
#propagates activation, deactivation, activation fails and stops
BindTo=ethermint-server.service
#propagates stop and restart (one-way)
PartOf=ethermint-server.service
#order
After=network-online.target ethermint-server.service
#propagates reload
PropagatesReloadTo=ethermint-server.service
ReloadPropagatedFrom=ethermint-server.service
After=network-online.target
[Service]
Restart=on-failure
@@ -22,6 +13,5 @@ ExecReload=/bin/kill -HUP $MAINPID
KillSignal=SIGTERM
[Install]
WantedBy=multi-user.target ethermint-server.service
Also=ethermint-server.service
WantedBy=multi-user.target
build/gaia/DEBIAN/postinst
-1
View File
@@ -21,7 +21,6 @@ case "$1" in
configure)
chown gaia.gaia /etc/gaia
sudo -Hu gaia gaia node init --home /etc/gaia 2B24DEE2364762300168DF19B6C18BCE2D399EA2
sudo -Hu gaia tendermint init --home /etc/gaia
systemctl daemon-reload
;;
build/gaia/DEBIAN/prerm
-1
View File
@@ -19,7 +19,6 @@ set -e
case "$1" in
remove|upgrade|deconfigure)
systemctl stop gaia 2> /dev/null || :
systemctl stop gaia-service 2> /dev/null || :
;;
failed-upgrade)
build/gaia/etc/systemd/system-preset/50-gaia.preset
-1
View File
@@ -1,3 +1,2 @@
disable gaia.service
disable gaia-server.service
build/gaia/etc/systemd/system/gaia-server.service
-24
View File
@@ -1,24 +0,0 @@
[Unit]
Description=Gaia server
Requires=network-online.target
BindTo=gaia.service
PartOf=gaia.service
Before=gaia.service
After=network-online.target
PropagatesReloadTo=gaia.service
ReloadPropagatedFrom=gaia.service
[Service]
Environment="TMHOME=/etc/gaia"
Restart=on-failure
User=gaia
Group=gaia
PermissionsStartOnly=true
ExecStart=/usr/bin/tendermint node
ExecReload=/bin/kill -HUP $MAINPID
KillSignal=SIGTERM
[Install]
WantedBy=multi-user.target
Also=gaia.service
build/gaia/etc/systemd/system/gaia.service
+3 -13
View File
@@ -1,27 +1,17 @@
[Unit]
Description=Gaia
#propagates activation, deactivation and activation fails.
Requires=network-online.target
#propagates activation, deactivation, activation fails and stops
BindTo=gaia-server.service
#propagates stop and restart (one-way)
PartOf=gaia-server.service
#order
After=network-online.target gaia-server.service
#propagates reload
PropagatesReloadTo=gaia-server.service
ReloadPropagatedFrom=gaia-server.service
After=network-online.target
[Service]
Restart=on-failure
User=gaia
Group=gaia
PermissionsStartOnly=true
ExecStart=/usr/bin/gaia node start --without-tendermint --home=/etc/gaia
ExecStart=/usr/bin/gaia node start --home=/etc/gaia
ExecReload=/bin/kill -HUP $MAINPID
KillSignal=SIGTERM
[Install]
WantedBy=multi-user.target gaia-server.service
Also=gaia-server.service
WantedBy=multi-user.target
build/spectemplates/app-template.spec
-7
View File
@@ -35,18 +35,11 @@ cd %{name}-%{version}-%{release}
%{__cp} -a * %{buildroot}
%post
sudo -Hu %{name} tendermint init --home %{_sysconfdir}/%{name}
sudo -Hu %{name} %{name} node init --home %{_sysconfdir}/%{name} 2B24DEE2364762300168DF19B6C18BCE2D399EA2
#Temporary until https://github.com/tendermint/basecoin/issues/123
rm -f %{_sysconfdir}/%{name}/key.json
rm -f %{_sysconfdir}/%{name}/key2.json
systemctl daemon-reload
%preun
systemctl stop %{name} 2> /dev/null || :
systemctl stop %{name}-service 2> /dev/null || :
%postun
systemctl daemon-reload
build/spectemplates/cosmos-sdk.data
-5
View File
@@ -1,5 +0,0 @@
PACKAGE_SUMMARY="cosmos-sdk is a Proof-of-Stake framework"
PACKAGE_URL="https://cosmos.network/"
PACKAGE_ADDITIONAL_HEADER="Provides: basecoin"
PACKAGE_DESCRIPTION="Cosmos-SDK is a general purpose framework for the Tendermint consensus engine to form a Proof-of-Stake cryptocurrency."
build/spectemplates/trackomatron.data
-5
View File
@@ -1,5 +0,0 @@
PACKAGE_SUMMARY="Trackomatron - Track invoices on the blockchain"
PACKAGE_URL="https://tendermint.com/"
PACKAGE_ADDITIONAL_HEADER=""
PACKAGE_DESCRIPTION="This software is intended to create a space to easily send invoices between and within institutions. Firstly, the commands of trackmatron are separated into two broad categories: submitting information to the blockchain (transactions), and retrieving information from the blockchain (query)."
build/spectemplates/trackomatron.spec
-63
View File
@@ -1,63 +0,0 @@
Version: @VERSION@
Release: @BUILD_NUMBER@
%define __spec_install_post %{nil}
%define debug_package %{nil}
%define __os_install_post %{nil}
Name: @PACKAGE_NAME@
Summary: @PACKAGE_SUMMARY@
License: Apache 2.0
URL: @PACKAGE_URL@
Packager: Greg Szabo
Requires: tendermint >= 0.11.0
@PACKAGE_ADDITIONAL_HEADER@
%description
@PACKAGE_DESCRIPTION@
%pre
if ! %{__grep} -q '^%{name}:' /etc/passwd ; then
useradd -r -b %{_sysconfdir} %{name}
mkdir -p %{_sysconfdir}/%{name}
chmod 755 %{_sysconfdir}/%{name}
chown %{name}.%{name} %{_sysconfdir}/%{name}
fi
%prep
# Nothing to do here. - It is done in the Makefile.
%build
# Nothing to do here.
%install
cd %{name}-%{version}-%{release}
%{__cp} -a * %{buildroot}
%post
sudo -Hu %{name} tendermint init --home %{_sysconfdir}/%{name}
sudo -Hu %{name} tracko init --home %{_sysconfdir}/%{name} 2B24DEE2364762300168DF19B6C18BCE2D399EA2
#Temporary until https://github.com/tendermint/basecoin/issues/123
rm -f %{_sysconfdir}/%{name}/key.json
rm -f %{_sysconfdir}/%{name}/key2.json
systemctl daemon-reload
%preun
systemctl stop %{name} 2> /dev/null || :
systemctl stop %{name}-service 2> /dev/null || :
%postun
systemctl daemon-reload
%files
%ghost %attr(0755, %{name}, %{name}) %dir %{_sysconfdir}/%{name}
%{_bindir}/*
%{_sysconfdir}/systemd/system/*
%{_sysconfdir}/systemd/system-preset/*
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%dir %{_defaultlicensedir}/%{name}
%doc %{_defaultlicensedir}/%{name}/LICENSE