iankelling.org
/
git
/
distro-setup
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d4a62c1
)
fixes
author
Ian Kelling
<ian@iankelling.org>
Fri, 12 May 2023 04:55:37 +0000
(
00:55
-0400)
committer
Ian Kelling
<ian@iankelling.org>
Fri, 12 May 2023 04:55:37 +0000
(
00:55
-0400)
conflink
patch
|
blob
|
history
distro-end
patch
|
blob
|
history
diff --git
a/conflink
b/conflink
index 03c58408443153340df5557c75a221962c512975..afbb9562ba8b577fc18eebd766b85dd0fb59f3b6 100755
(executable)
--- a/
conflink
+++ b/
conflink
@@
-244,8
+244,10
@@
case $user in
fi
fi
fi
fi
- if [[ -d /var/lib/bitcoind ]]; then
+ if [[ -d /var/lib/bitcoind
&& -d /p/c/user-specific/bitcoin
]]; then
s rsync -clpgoDiSAX --chmod=Dg-s --chown=bitcoin:bitcoin /p/c/user-specific/bitcoin/settings.json /var/lib/bitcoind
s rsync -clpgoDiSAX --chmod=Dg-s --chown=bitcoin:bitcoin /p/c/user-specific/bitcoin/settings.json /var/lib/bitcoind
+ # i'm not sure of the perfect permissions here, but
+ # 640 seems good.
s rsync -rclpgoDiSAX --chmod=Dg-s --chown=root:bitcoin /p/c/user-specific/bitcoin/bitcoin /etc
fi
##### end special extra stuff #####
s rsync -rclpgoDiSAX --chmod=Dg-s --chown=root:bitcoin /p/c/user-specific/bitcoin/bitcoin /etc
fi
##### end special extra stuff #####
diff --git
a/distro-end
b/distro-end
index 3d3a9e18e77bb71962ab31c1fe6c5fe29e41b242..64630404c0a4806f089b25a2833124c670b4f01c 100755
(executable)
--- a/
distro-end
+++ b/
distro-end
@@
-2176,12
+2176,13
@@
esac
case $HOSTNAME in
sy|kd)
case $HOSTNAME in
sy|kd)
- sudo install -m 0755 -o root -g root -t /usr/bin /a/opt/bitcoin-24.1/bin/*
+ sudo install -m 0755 -o root -g root -t /usr/bin /a/opt/bitcoin-24.
0.
1/bin/*
sgo bitcoind
# note: the bitcoin user & group are setup in fai
sudo usermod -a -G bitcoin iank
sgo bitcoind
# note: the bitcoin user & group are setup in fai
sudo usermod -a -G bitcoin iank
+ # todo: make bitcoin have a stable uid/gid
if [[ ! $(readlink -f /var/lib/bitcoind/wallets) == /q/wallets ]]; then
if [[ ! $(readlink -f /var/lib/bitcoind/wallets) == /q/wallets ]]; then
- s
udo
lnf /q/wallets /var/lib/bitcoind
+ s lnf /q/wallets /var/lib/bitcoind
sudo chown -h bitcoin:bitcoin /var/lib/bitcoind/wallets
fi
# note, there exists
sudo chown -h bitcoin:bitcoin /var/lib/bitcoind/wallets
fi
# note, there exists