Merge branch 'fix-chown'
This commit is contained in:
commit
415f0cbe0f
|
@ -207,15 +207,13 @@ in {
|
|||
preStart = ''
|
||||
if ! test -e ${cfg.dataDir}; then
|
||||
mkdir -m 0770 -p '${cfg.dataDir}'
|
||||
chown -R '${cfg.user}:${cfg.group}' '${cfg.dataDir}'
|
||||
fi
|
||||
if ! test -e ${cfg.dataDir}/blocks; then
|
||||
mkdir -m 0770 -p '${cfg.dataDir}/blocks'
|
||||
chown -R '${cfg.user}:${cfg.group}' '${cfg.dataDir}/blocks'
|
||||
fi
|
||||
cp '${cfg.configFileOption}' '${cfg.dataDir}/bitcoin.conf'
|
||||
chmod o-rw '${cfg.dataDir}/bitcoin.conf'
|
||||
chown '${cfg.user}:${cfg.group}' '${cfg.dataDir}/bitcoin.conf'
|
||||
chown -R '${cfg.user}:${cfg.group}' '${cfg.dataDir}'
|
||||
echo "rpcpassword=$(cat /secrets/bitcoin-rpcpassword)" >> '${cfg.dataDir}/bitcoin.conf'
|
||||
chmod -R g+rX '${cfg.dataDir}/blocks'
|
||||
'';
|
||||
|
|
|
@ -180,11 +180,10 @@ in {
|
|||
preStart = ''
|
||||
if ! test -e ${cfg.dataDir}; then
|
||||
mkdir -m 0770 -p '${cfg.dataDir}'
|
||||
chown '${cfg.user}:${cfg.group}' '${cfg.dataDir}'
|
||||
fi
|
||||
cp '${configFile}' '${cfg.dataDir}/liquid.conf'
|
||||
chmod o-rw '${cfg.dataDir}/liquid.conf'
|
||||
chown '${cfg.user}:${cfg.group}' '${cfg.dataDir}/liquid.conf'
|
||||
chown '${cfg.user}:${cfg.group}' '${cfg.dataDir}'
|
||||
echo "rpcpassword=$(cat /secrets/liquid-rpcpassword)" >> '${cfg.dataDir}/liquid.conf'
|
||||
echo "mainchainrpcpassword=$(cat /secrets/bitcoin-rpcpassword)" >> '${cfg.dataDir}/liquid.conf'
|
||||
'';
|
||||
|
|
Loading…
Reference in New Issue
Block a user