From cffc207b24462fc909193bbf305c4352b1f3501d Mon Sep 17 00:00:00 2001
From: nolash <dev@holbrook.no>
Date: Thu, 11 Nov 2021 11:33:18 +0100
Subject: [PATCH] Add enc key to correct homedir, finish env for systemd

---
 requirements.txt                     | 2 +-
 setup.sh                             | 7 +++----
 setup_key.sh                         | 2 +-
 setup_systemd.sh                     | 2 ++
 systemd/env/01-cic-cache-server.conf | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index f24f6eb..40eb538 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
 cic-cache==0.2.1a10
-clicada==0.0.1a7
+clicada==0.0.1a8
diff --git a/setup.sh b/setup.sh
index cd81f17..ef69c00 100644
--- a/setup.sh
+++ b/setup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 want_cic_cache_version=0.2.1a10
-want_cicada_version=0.0.1a7
+want_cicada_version=0.0.1a8
 #want_evm=bloxberg
 want_evm=
 
@@ -84,9 +84,8 @@ if [ ! -f  "$HOME/.config/cic/staff-client/key_fingerprint" ]; then
 		dbg $dbg_info "using key $AUTH_KEY"
 	fi
 	export AUTH_KEY=`cat $HOME/.config/cic/staff-client/key_fingerprint`
-	export AUTH_KEYRING_PATH=$HOME/.config/staff-client/.gnupg
-	export 
-
+	export AUTH_KEYRING_PATH=$HOME/.config/cic/staff-client/.gnupg
+	export AUTH_DB_PATH=$HOME/.local/share/cic/clicada
 fi
 set +e
 
diff --git a/setup_key.sh b/setup_key.sh
index 9653e4c..f58b495 100644
--- a/setup_key.sh
+++ b/setup_key.sh
@@ -72,6 +72,6 @@ gpg --homedir $HOME/.config/cic/staff-client/.gnupg --export -a > $HOME/.config/
 
 gpg --list-packets $HOME/.config/cic/staff-client/user.asc | awk '/issuer fpr/ { print $9; }' | cut -b -40 > $HOME/.config/cic/staff-client/key_fingerprint
 
-gpg --homedir $t --pinentry-mode loopback --passphrase-file $password_file --quick-add-key `cat $HOME/.config/cic/staff-client/key_fingerprint` default encrypt 0
+gpg --homedir $HOME/.config/cic/staff-client/.gnupg --pinentry-mode loopback --passphrase-file $password_file --quick-add-key `cat $HOME/.config/cic/staff-client/key_fingerprint` default encrypt 0
 
 shred -v $password_file
diff --git a/setup_systemd.sh b/setup_systemd.sh
index cb234cf..e069a0e 100644
--- a/setup_systemd.sh
+++ b/setup_systemd.sh
@@ -18,3 +18,5 @@ done
 cp -v systemd/bin/cic_cache_server_start.sh $HOME/.local/bin/
 
 chmod -v 750 $HOME/.local/bin/cic_cache_server_start.sh
+
+systemctl --user daemon-reload
diff --git a/systemd/env/01-cic-cache-server.conf b/systemd/env/01-cic-cache-server.conf
index a2167b6..7c27214 100644
--- a/systemd/env/01-cic-cache-server.conf
+++ b/systemd/env/01-cic-cache-server.conf
@@ -1,6 +1,6 @@
 RPC_PROVIDER={{RPC_PROVIDER}}
 CHAIN_SPEC={{CHAIN_SPEC}}
 SERVER_HOST=localhost
-SERVER_PORT=8636
-TX_CACHE_URL=http://localhost:8636
+SERVER_PORT=8313
+TX_CACHE_URL=http://localhost:8313
 #META_URL=