From f09a2ca12b06675d82ef6f18a3c722e634560649 Mon Sep 17 00:00:00 2001
From: Martin Boehm <martin.boehm@1mbsoftware.net>
Date: Wed, 6 Jun 2018 11:20:27 +0200
Subject: [PATCH] Rename ehtereum backend packages to match coin naming
 convention

---
 contrib/backends/ethereum/debian/changelog                  | 6 ++++++
 contrib/backends/ethereum/debian/control                    | 4 ++--
 contrib/backends/ethereum/debian/ethereum-eth.dirs          | 1 -
 contrib/backends/ethereum/debian/ethereum-eth.install       | 1 -
 contrib/backends/ethereum/debian/ethereum-ropsten.dirs      | 1 -
 contrib/backends/ethereum/debian/ethereum-ropsten.install   | 1 -
 ...eum-eth.conffiles => ethereum-testnet-ropsten.conffiles} | 0
 .../backends/ethereum/debian/ethereum-testnet-ropsten.dirs  | 1 +
 .../ethereum/debian/ethereum-testnet-ropsten.install        | 1 +
 ...eum-eth.logrotate => ethereum-testnet-ropsten.logrotate} | 2 +-
 ...m-ropsten.postinst => ethereum-testnet-ropsten.postinst} | 4 ++--
 ...eum-ropsten.service => ethereum-testnet-ropsten.service} | 6 +++---
 .../{ethereum-ropsten.conffiles => ethereum.conffiles}      | 0
 contrib/backends/ethereum/debian/ethereum.dirs              | 1 +
 contrib/backends/ethereum/debian/ethereum.install           | 1 +
 .../{ethereum-ropsten.logrotate => ethereum.logrotate}      | 2 +-
 .../debian/{ethereum-eth.postinst => ethereum.postinst}     | 4 ++--
 .../debian/{ethereum-eth.service => ethereum.service}       | 6 +++---
 18 files changed, 24 insertions(+), 18 deletions(-)
 delete mode 100644 contrib/backends/ethereum/debian/ethereum-eth.dirs
 delete mode 100644 contrib/backends/ethereum/debian/ethereum-eth.install
 delete mode 100644 contrib/backends/ethereum/debian/ethereum-ropsten.dirs
 delete mode 100644 contrib/backends/ethereum/debian/ethereum-ropsten.install
 rename contrib/backends/ethereum/debian/{ethereum-eth.conffiles => ethereum-testnet-ropsten.conffiles} (100%)
 create mode 100644 contrib/backends/ethereum/debian/ethereum-testnet-ropsten.dirs
 create mode 100644 contrib/backends/ethereum/debian/ethereum-testnet-ropsten.install
 rename contrib/backends/ethereum/debian/{ethereum-eth.logrotate => ethereum-testnet-ropsten.logrotate} (58%)
 rename contrib/backends/ethereum/debian/{ethereum-ropsten.postinst => ethereum-testnet-ropsten.postinst} (52%)
 rename contrib/backends/ethereum/debian/{ethereum-ropsten.service => ethereum-testnet-ropsten.service} (69%)
 rename contrib/backends/ethereum/debian/{ethereum-ropsten.conffiles => ethereum.conffiles} (100%)
 create mode 100644 contrib/backends/ethereum/debian/ethereum.dirs
 create mode 100644 contrib/backends/ethereum/debian/ethereum.install
 rename contrib/backends/ethereum/debian/{ethereum-ropsten.logrotate => ethereum.logrotate} (70%)
 rename contrib/backends/ethereum/debian/{ethereum-eth.postinst => ethereum.postinst} (57%)
 rename contrib/backends/ethereum/debian/{ethereum-eth.service => ethereum.service} (74%)

diff --git a/contrib/backends/ethereum/debian/changelog b/contrib/backends/ethereum/debian/changelog
index d0c0c269..b4a4d04b 100644
--- a/contrib/backends/ethereum/debian/changelog
+++ b/contrib/backends/ethereum/debian/changelog
@@ -1,3 +1,9 @@
+ethereum (1.8.10-satoshilabs2) unstable; urgency=medium
+
+  * Rename packages and directories
+
+ -- Martin Bohm <martin.bohm@satoshilabs.com>  Wed, 06 Jun 2018 11:12:13 +0200
+
 ethereum (1.8.10-satoshilabs1) unstable; urgency=medium
 
   * Initial build
diff --git a/contrib/backends/ethereum/debian/control b/contrib/backends/ethereum/debian/control
index 1d1f743e..35bd4ac3 100644
--- a/contrib/backends/ethereum/debian/control
+++ b/contrib/backends/ethereum/debian/control
@@ -5,12 +5,12 @@ Maintainer: martin.bohm@satoshilabs.com
 Build-Depends: debhelper, wget, tar, gzip, make, dh-systemd, dh-exec
 Standards-Version: 3.9.5
 
-Package: ethereum-eth
+Package: ethereum
 Architecture: amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}, logrotate
 Description: Satoshilabs packaged ethereum geth server
 
-Package: ethereum-ropsten
+Package: ethereum-testnet-ropsten
 Architecture: amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}, logrotate
 Description: Satoshilabs packaged ethereum geth server
diff --git a/contrib/backends/ethereum/debian/ethereum-eth.dirs b/contrib/backends/ethereum/debian/ethereum-eth.dirs
deleted file mode 100644
index abf53edc..00000000
--- a/contrib/backends/ethereum/debian/ethereum-eth.dirs
+++ /dev/null
@@ -1 +0,0 @@
-/opt/coins/data/eth/eth
\ No newline at end of file
diff --git a/contrib/backends/ethereum/debian/ethereum-eth.install b/contrib/backends/ethereum/debian/ethereum-eth.install
deleted file mode 100644
index fb75665c..00000000
--- a/contrib/backends/ethereum/debian/ethereum-eth.install
+++ /dev/null
@@ -1 +0,0 @@
-ethereum/* /opt/coins/nodes/ethereum/eth
diff --git a/contrib/backends/ethereum/debian/ethereum-ropsten.dirs b/contrib/backends/ethereum/debian/ethereum-ropsten.dirs
deleted file mode 100644
index fdac20f2..00000000
--- a/contrib/backends/ethereum/debian/ethereum-ropsten.dirs
+++ /dev/null
@@ -1 +0,0 @@
-/opt/coins/data/eth-ropsten/eth
\ No newline at end of file
diff --git a/contrib/backends/ethereum/debian/ethereum-ropsten.install b/contrib/backends/ethereum/debian/ethereum-ropsten.install
deleted file mode 100644
index ced5fdba..00000000
--- a/contrib/backends/ethereum/debian/ethereum-ropsten.install
+++ /dev/null
@@ -1 +0,0 @@
-ethereum/* /opt/coins/nodes/ethereum/eth-ropsten
diff --git a/contrib/backends/ethereum/debian/ethereum-eth.conffiles b/contrib/backends/ethereum/debian/ethereum-testnet-ropsten.conffiles
similarity index 100%
rename from contrib/backends/ethereum/debian/ethereum-eth.conffiles
rename to contrib/backends/ethereum/debian/ethereum-testnet-ropsten.conffiles
diff --git a/contrib/backends/ethereum/debian/ethereum-testnet-ropsten.dirs b/contrib/backends/ethereum/debian/ethereum-testnet-ropsten.dirs
new file mode 100644
index 00000000..21b78fe7
--- /dev/null
+++ b/contrib/backends/ethereum/debian/ethereum-testnet-ropsten.dirs
@@ -0,0 +1 @@
+/opt/coins/data/ethereum_testnet_ropsten/backend
\ No newline at end of file
diff --git a/contrib/backends/ethereum/debian/ethereum-testnet-ropsten.install b/contrib/backends/ethereum/debian/ethereum-testnet-ropsten.install
new file mode 100644
index 00000000..65c1d9dc
--- /dev/null
+++ b/contrib/backends/ethereum/debian/ethereum-testnet-ropsten.install
@@ -0,0 +1 @@
+ethereum/* /opt/coins/nodes/ethereum_testnet_ropsten
diff --git a/contrib/backends/ethereum/debian/ethereum-eth.logrotate b/contrib/backends/ethereum/debian/ethereum-testnet-ropsten.logrotate
similarity index 58%
rename from contrib/backends/ethereum/debian/ethereum-eth.logrotate
rename to contrib/backends/ethereum/debian/ethereum-testnet-ropsten.logrotate
index 4ecb953d..cd024adc 100644
--- a/contrib/backends/ethereum/debian/ethereum-eth.logrotate
+++ b/contrib/backends/ethereum/debian/ethereum-testnet-ropsten.logrotate
@@ -1,4 +1,4 @@
-/opt/coins/data/eth/eth/eth.log
+/opt/coins/data/ethereum_testnet_ropsten/backend/ethereum_testnet_ropsten.log
 {
         rotate 7
         daily
diff --git a/contrib/backends/ethereum/debian/ethereum-ropsten.postinst b/contrib/backends/ethereum/debian/ethereum-testnet-ropsten.postinst
similarity index 52%
rename from contrib/backends/ethereum/debian/ethereum-ropsten.postinst
rename to contrib/backends/ethereum/debian/ethereum-testnet-ropsten.postinst
index 0b509afa..3aa02f01 100644
--- a/contrib/backends/ethereum/debian/ethereum-ropsten.postinst
+++ b/contrib/backends/ethereum/debian/ethereum-testnet-ropsten.postinst
@@ -9,9 +9,9 @@ case "$1" in
         useradd --system -M -U ethereum -s /bin/false
     fi
 
-    if [ "$(stat -c '%U' /opt/coins/data/eth-ropsten/eth)" != "ethereum" ]
+    if [ "$(stat -c '%U' /opt/coins/data/ethereum_testnet_ropsten/backend)" != "ethereum" ]
     then
-        chown -R ethereum:ethereum /opt/coins/data/eth-ropsten/eth
+        chown -R ethereum:ethereum /opt/coins/data/ethereum_testnet_ropsten/backend
     fi
   ;;
 
diff --git a/contrib/backends/ethereum/debian/ethereum-ropsten.service b/contrib/backends/ethereum/debian/ethereum-testnet-ropsten.service
similarity index 69%
rename from contrib/backends/ethereum/debian/ethereum-ropsten.service
rename to contrib/backends/ethereum/debian/ethereum-testnet-ropsten.service
index 7eb55cf7..646d4b64 100644
--- a/contrib/backends/ethereum/debian/ethereum-ropsten.service
+++ b/contrib/backends/ethereum/debian/ethereum-testnet-ropsten.service
@@ -1,7 +1,7 @@
 # It is not recommended to modify this file in-place, because it will
 # be overwritten during package upgrades. If you want to add further
 # options or overwrite existing ones then use
-# $ systemctl edit ethereum-ropsten.service
+# $ systemctl edit ethereum-testnet-ropsten.service
 # See "man systemd.service" for details.
 
 [Unit]
@@ -9,11 +9,11 @@ Description=Ethereum daemon (ropsten testnet)
 After=network.target
 
 [Service]
-ExecStart=/bin/sh -c '/opt/coins/nodes/ethereum/eth-ropsten/geth --ipcdisable --testnet --cache 1024 --datadir /opt/coins/data/eth-ropsten/eth --port 48333 --ws --wsaddr 0.0.0.0 --wsport 18036 --wsorigins * 2>>/opt/coins/data/eth-ropsten/eth/eth.log'
+ExecStart=/bin/sh -c '/opt/coins/nodes/ethereum_testnet_ropsten/geth --ipcdisable --testnet --cache 1024 --datadir /opt/coins/data/ethereum_testnet_ropsten/backend --port 48333 --ws --wsaddr 0.0.0.0 --wsport 18036 --wsorigins * 2>>/opt/coins/data/ethereum_testnet_ropsten/backend/ethereum_testnet_ropsten.log'
 User=ethereum
 Type=simple
 Restart=on-failure
-WorkingDirectory=/opt/coins/nodes/ethereum/eth-ropsten/
+WorkingDirectory=/opt/coins/nodes/ethereum_testnet_ropsten
 
 # Resource limits
 LimitNOFILE=500000
diff --git a/contrib/backends/ethereum/debian/ethereum-ropsten.conffiles b/contrib/backends/ethereum/debian/ethereum.conffiles
similarity index 100%
rename from contrib/backends/ethereum/debian/ethereum-ropsten.conffiles
rename to contrib/backends/ethereum/debian/ethereum.conffiles
diff --git a/contrib/backends/ethereum/debian/ethereum.dirs b/contrib/backends/ethereum/debian/ethereum.dirs
new file mode 100644
index 00000000..200cff98
--- /dev/null
+++ b/contrib/backends/ethereum/debian/ethereum.dirs
@@ -0,0 +1 @@
+/opt/coins/data/ethereum/backend
\ No newline at end of file
diff --git a/contrib/backends/ethereum/debian/ethereum.install b/contrib/backends/ethereum/debian/ethereum.install
new file mode 100644
index 00000000..cecaa2a1
--- /dev/null
+++ b/contrib/backends/ethereum/debian/ethereum.install
@@ -0,0 +1 @@
+ethereum/* /opt/coins/nodes/ethereum
diff --git a/contrib/backends/ethereum/debian/ethereum-ropsten.logrotate b/contrib/backends/ethereum/debian/ethereum.logrotate
similarity index 70%
rename from contrib/backends/ethereum/debian/ethereum-ropsten.logrotate
rename to contrib/backends/ethereum/debian/ethereum.logrotate
index f49829e7..3ca48f1a 100644
--- a/contrib/backends/ethereum/debian/ethereum-ropsten.logrotate
+++ b/contrib/backends/ethereum/debian/ethereum.logrotate
@@ -1,4 +1,4 @@
-/opt/coins/data/eth-ropsten/eth/eth.log
+/opt/coins/data/ethereum/backend/ethereum.log
 {
         rotate 7
         daily
diff --git a/contrib/backends/ethereum/debian/ethereum-eth.postinst b/contrib/backends/ethereum/debian/ethereum.postinst
similarity index 57%
rename from contrib/backends/ethereum/debian/ethereum-eth.postinst
rename to contrib/backends/ethereum/debian/ethereum.postinst
index acbcc05e..24d1d255 100644
--- a/contrib/backends/ethereum/debian/ethereum-eth.postinst
+++ b/contrib/backends/ethereum/debian/ethereum.postinst
@@ -9,9 +9,9 @@ case "$1" in
         useradd --system -M -U ethereum -s /bin/false
     fi
 
-    if [ "$(stat -c '%U' /opt/coins/data/eth/eth)" != "ethereum" ]
+    if [ "$(stat -c '%U' /opt/coins/data/ethereum/backend)" != "ethereum" ]
     then
-        chown -R ethereum:ethereum /opt/coins/data/eth/eth
+        chown -R ethereum:ethereum /opt/coins/data/ethereum/backend
     fi
   ;;
 
diff --git a/contrib/backends/ethereum/debian/ethereum-eth.service b/contrib/backends/ethereum/debian/ethereum.service
similarity index 74%
rename from contrib/backends/ethereum/debian/ethereum-eth.service
rename to contrib/backends/ethereum/debian/ethereum.service
index 9c13f0a1..3e65aa7d 100644
--- a/contrib/backends/ethereum/debian/ethereum-eth.service
+++ b/contrib/backends/ethereum/debian/ethereum.service
@@ -1,7 +1,7 @@
 # It is not recommended to modify this file in-place, because it will
 # be overwritten during package upgrades. If you want to add further
 # options or overwrite existing ones then use
-# $ systemctl edit ethereum-eth.service
+# $ systemctl edit ethereum.service
 # See "man systemd.service" for details.
 
 [Unit]
@@ -9,11 +9,11 @@ Description=Ethereum daemon (mainnet)
 After=network.target
 
 [Service]
-ExecStart=/bin/sh -c '/opt/coins/nodes/ethereum/eth/geth --ipcdisable --syncmode full --cache 1024 --datadir /opt/coins/data/eth/eth --port 38336 --ws --wsaddr 0.0.0.0 --wsport 8036 --wsorigins * 2>>/opt/coins/data/eth/eth/eth.log'
+ExecStart=/bin/sh -c '/opt/coins/nodes/ethereum/geth --ipcdisable --syncmode full --cache 1024 --datadir /opt/coins/data/eth/eth --port 38336 --ws --wsaddr 0.0.0.0 --wsport 8036 --wsorigins * 2>>/opt/coins/data/ethereum/backend/ethereum.log'
 User=ethereum
 Type=simple
 Restart=on-failure
-WorkingDirectory=/opt/coins/nodes/ethereum/eth
+WorkingDirectory=/opt/coins/nodes/ethereum
 
 # Resource limits
 LimitNOFILE=500000