delete kotod.service and system-wide koto.conf

5 files changed, 14 insertions, 74 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2876220232ce..430b2714d8b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = koto
 	pkgdesc = Decentralized and open source cryptocurrency
 	pkgver = 1.0.14
-	pkgrel = 1
+	pkgrel = 2
 	url = https://koto.cash
 	install = koto.install
 	arch = i686
@@ -14,17 +14,12 @@ pkgbase = koto
 	provides = koto-cli
 	provides = koto-tx
 	provides = koto-fetch-params
-	backup = etc/koto.conf
 	source = koto-180210.tar.gz::https://github.com/koto-dev/koto/archive/180210.tar.gz
 	source = 0001-fetch-param-directory-env.patch
 	source = koto.install
-	source = koto.conf
-	source = kotod.service
 	sha1sums = 0ceb84cdd7087ec7bcd91a3fe1c2e7b941fb4fa3
 	sha1sums = e27ee657c0652137537c1bb9b48ce1730cba3423
-	sha1sums = 47a54c280e049495900d8c4c39115e3c11b971df
-	sha1sums = 2c4e98f61b702cbfaf656c7e3ae50f030a5a3543
-	sha1sums = 51c9722a954b3e9573f418881330194052fffc4c
+	sha1sums = e1e1155f7618c4da3c51517ba6530178f33cee28
 
 pkgname = koto
 
diff --git a/PKGBUILD b/PKGBUILD
index 88b6e53aec6b..5167e1f326cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=koto
 pkgver=1.0.14
 _tag=180210
-pkgrel=1
+pkgrel=2
 pkgdesc="Decentralized and open source cryptocurrency"
 arch=('i686' 'x86_64')
 url="https://koto.cash"
@@ -11,17 +11,12 @@ license=(MIT)
 depends=('bash')
 makedepends=('wget' 'unzip')
 provides=('kotod' 'koto-cli' 'koto-tx' 'koto-fetch-params')
-backup=('etc/koto.conf')
 source=("${pkgname}-${_tag}.tar.gz::https://github.com/koto-dev/koto/archive/${_tag}.tar.gz"
         "0001-fetch-param-directory-env.patch"
-        "koto.install"
-        "koto.conf"
-        "kotod.service")
+        "koto.install")
 sha1sums=('0ceb84cdd7087ec7bcd91a3fe1c2e7b941fb4fa3'
           'e27ee657c0652137537c1bb9b48ce1730cba3423'
-          '47a54c280e049495900d8c4c39115e3c11b971df'
-          '2c4e98f61b702cbfaf656c7e3ae50f030a5a3543'
-          '51c9722a954b3e9573f418881330194052fffc4c')
+          'e1e1155f7618c4da3c51517ba6530178f33cee28')
 install=koto.install
 
 prepare() {
@@ -59,7 +54,4 @@ package() {
 
   install -Dm644 "${srcdir}/${pkgname}-${_tag}/contrib/kotod.bash-completion" "${pkgdir}/usr/share/bash-completion/completions/kotod"
   install -Dm644 "${srcdir}/${pkgname}-${_tag}/contrib/koto-cli.bash-completion" "${pkgdir}/usr/share/bash-completion/completions/koto-cli"
-
-  install -Dm644 "${srcdir}/kotod.service" "${pkgdir}/usr/lib/systemd/system/kotod.service"
-  install -Dm644 "${srcdir}/koto.conf" "${pkgdir}/etc/koto.conf"
 }
diff --git a/koto.conf b/koto.conf
deleted file mode 100644
index 71d426551ec5..000000000000
--- a/koto.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-rpcconnect=127.0.0.1
-rpcport=8432
-rpcuser=koto
-rpcpassword=<secret>
-rpcallowip=127.0.0.1
-datadir=/var/lib/koto/data
-zcparamsdir=/var/lib/koto/zcash-params
diff --git a/koto.install b/koto.install
index df66f87b077c..b6f0ba1fd12b 100644
--- a/koto.install
+++ b/koto.install
@@ -1,17 +1,11 @@
-_koto_user=koto
-_koto_group=koto
-
 post_install() {
-  _mkuser
-  pw=`< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c32;echo;`
-  sed -i -e "s/<secret>/$pw/g" /etc/koto.conf
-  chown -R $_koto_user:$_koto_group /var/lib/koto
   printf "%b\n" "$koto"
 }
 
 post_upgrade() {
-  _mkuser
-  chown -R $_koto_user:$_koto_group /var/lib/koto
+  _rmuser
+  systemctl stop kotod
+  rm -rf /usr/lib/systemd/system/kotod.service
   printf "%b\n" "$koto"
 }
 
@@ -20,18 +14,6 @@ post_remove() {
   rm -rf /var/lib/koto
 }
 
-_mkuser() {
-  getent passwd $_koto_user &>/dev/null || {
-    echo -n "Creating koto user... "
-    grep -E "^$_koto_group:" /etc/group >/dev/null || groupadd $_koto_group
-    useradd -m -d /var/lib/koto -g $_koto_group -s /usr/bin/nologin $_koto_user 2>/dev/null
-    mkdir /var/lib/koto/data
-    mkdir /var/lib/koto/.koto
-    ln -s /etc/koto.conf /var/lib/koto/.koto/koto.conf
-    echo "done"
-  }
-}
-
 _rmuser() {
   echo -n "Removing koto user... "
   userdel -rf $_koto_user 2>/dev/null
@@ -45,10 +27,13 @@ read -d '' koto <<'EOF'
 ##  Koto                                                              ##
 ##  ____________                                                      ##
 ##                                                                    ##
-##  To start kotod:                                                   ##
+##  !!!!!WARNING!!!!!                                                 ##
+##                                                                    ##
+##  latest version is removed kotod.service.                          ##
+##  If you use systemd (e.g. you run `systemctl start kotod`),        ##
+##  stop kotod service, and backup wallet.dat.                        ##
 ##                                                                    ##
-##      # PARAMS_DIR=/var/lib/koto/zcash-params koto-fetch-params     ##
-##      # systemctl start kotod                                       ##
+########################################################################
 ##                                                                    ##
 ##  To communicate with koto as a normal user:                        ##
 ##                                                                    ##
@@ -60,8 +45,6 @@ read -d '' koto <<'EOF'
 ##                                                                    ##
 ##      $ koto-fetch-params                                           ##
 ##                                                                    ##
-##  Config:         /etc/koto.conf                                    ##
-##  Data Directory: /var/lib/koto/data                                ##
 ##  Documentation:  /usr/share/doc/koto                               ##
 ##                                                                    ##
 ########################################################################
diff --git a/kotod.service b/kotod.service
deleted file mode 100644
index 09d576432d54..000000000000
--- a/kotod.service
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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 kotod.service
-# See "man systemd.service" for details.
-
-# Note that almost all daemon options could be specified in
-# /etc/koto.conf
-
-[Unit]
-Description=Koto daemon
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/kotod -daemon=0 -pid=/run/kotod/koto.pid
-ExecReload=/usr/bin/kill -HUP $MAINPID
-ExecStop=/usr/bin/koto-cli stop
-User=koto
-Group=koto
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target