diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2018-05-26 10:52:51 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2018-05-26 10:52:51 -0300 |
| commit | b75fa5cc871c958284d2e25dc0845a99058d3e88 (patch) | |
| tree | 2685d701b43030f4f31297f9d264cc17622a2270 /share/hydra/import-keys | |
| parent | 37d3e5c6463e2b62e34ed06de3b371f5614e7376 (diff) | |
| download | hydra-b75fa5cc871c958284d2e25dc0845a99058d3e88.tar.gz hydra-b75fa5cc871c958284d2e25dc0845a99058d3e88.tar.bz2 | |
Fix import-keys for borg
Diffstat (limited to 'share/hydra/import-keys')
| -rwxr-xr-x | share/hydra/import-keys | 50 |
1 files changed, 27 insertions, 23 deletions
diff --git a/share/hydra/import-keys b/share/hydra/import-keys index 59114bf..21fe744 100755 --- a/share/hydra/import-keys +++ b/share/hydra/import-keys @@ -126,39 +126,43 @@ EOF function hydra_import_keys_borg { if [ "`facter fqdn`" != "$hostname" ]; then echo "-----------------------------------------------------" - echo "Importing borg key at $hostname:/root/.borg/hydra/key..." + echo "Importing borg key at $hostname:/root/.config/borg/hydra/key..." echo "-----------------------------------------------------" - echo "Creating folder structure at $hostname:/root/.borg..." + echo "Creating folder structure at $hostname:/root/.config/borg..." $HYDRA_CONNECT $hostname <<EOF - sudo mkdir -p /root/.borg/hydra - sudo chown root.root /root/.borg - sudo chown root.root /root/.borg/hydra - sudo chmod 700 /root/.borg - sudo chmod 700 /root/.borg/hydra - sudo touch /root/.borg/hydra/key - sudo chmod 600 /root/.borg/hydra/key + sudo rm -rf /root/.borg + sudo mkdir -p /root/.config/borg/hydra + sudo chown root.root /root/.config/borg + sudo chown root.root /root/.config/borg/hydra + sudo chmod 700 /root/.config/borg + sudo chmod 700 /root/.config/borg/hydra + sudo touch /root/.config/borg/hydra/key + sudo chmod 600 /root/.config/borg/hydra/key EOF - echo "Importing borg key from keyringer to $hostname:/root/.borg/hydra/key..." + echo "Importing borg key from keyringer to $hostname:/root/.config/borg/hydra/key..." keyringer $HYDRA decrypt nodes/$hostname/borg/key | \ - $HYDRA_CONNECT $hostname "cat - | sudo tee /root/.borg/hydra/key > /dev/null" + $HYDRA_CONNECT $hostname "cat - | sudo tee /root/.config/borg/hydra/key > /dev/null" else echo "-----------------------------------------------------" - echo "Importing borg key at $hostname:/root/.borg/hydra/key..." + echo "Importing borg key at $hostname:/root/.config/borg/hydra/key..." echo "-----------------------------------------------------" - echo "Creating folder structure at $hostname:/root/.borg..." - sudo mkdir -p /root/.borg/hydra - sudo chown root.root /root/.borg - sudo chown root.root /root/.borg/hydra - sudo chmod 700 /root/.borg - sudo chmod 700 /root/.borg/hydra - sudo touch /root/.borg/hydra/key - sudo chmod 600 /root/.borg/hydra/key - - echo "Importing borg key from keyringer to $hostname:/root/.borg/hydra/key..." - keyringer $HYDRA decrypt nodes/$hostname/borg/key | sudo tee /root/.borg/hydra/key > /dev/null + # Remove old, wrong borg config + sudo rm -rf /root/.borg + + echo "Creating folder structure at $hostname:/root/.config/borg..." + sudo mkdir -p /root/.config/borg/hydra + sudo chown root.root /root/.config/borg + sudo chown root.root /root/.config/borg/hydra + sudo chmod 700 /root/.config/borg + sudo chmod 700 /root/.config/borg/hydra + sudo touch /root/.config/borg/hydra/key + sudo chmod 600 /root/.config/borg/hydra/key + + echo "Importing borg key from keyringer to $hostname:/root/.config/borg/hydra/key..." + keyringer $HYDRA decrypt nodes/$hostname/borg/key | sudo tee /root/.config/borg/hydra/key > /dev/null fi } |