diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-09-24 12:32:18 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-09-24 12:32:18 -0300 |
| commit | 276f87ff39a0df4688c442003fb58a7754922914 (patch) | |
| tree | daa35c556480f81716d3cb7ebe87b9aa8071e802 | |
| parent | 07bb3f7af94c114a91213a9cf05194f234109b54 (diff) | |
| download | hydra-276f87ff39a0df4688c442003fb58a7754922914.tar.gz hydra-276f87ff39a0df4688c442003fb58a7754922914.tar.bz2 | |
Fixes eyaml
| -rwxr-xr-x | share/hydra/eyaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/share/hydra/eyaml b/share/hydra/eyaml index 17edf58..24e714d 100755 --- a/share/hydra/eyaml +++ b/share/hydra/eyaml @@ -53,7 +53,7 @@ PUB_CRYPT="nodes/$FQDN/eyaml/public_key.pkcs7.pem" if [ -e "$HYDRA_FOLDER/puppet/keys/private_key.pkcs7.pem" ] && [ ! -h "$HYDRA_FOLDER/puppet/keys/private_key.pkcs7.pem" ]; then PRIV="$HYDRA_FOLDER/puppet/keys/private_key.pkcs7.pem" PUB="$HYDRA_FOLDER/puppet/keys/public_key.pkcs7.pem" - PRIV_CRYPT="domains/$DOMAIN/eyaml/private_key.pkcs7.pem.asc" + PRIV_CRYPT="domains/$DOMAIN/eyaml/private_key.pkcs7.pem" PUB_CRYPT="domains/$DOMAIN/eyaml/public_key.pkcs7.pem" fi @@ -62,10 +62,10 @@ ARGS="--pkcs7-private-key $PRIV --pkcs7-public-key $PUB" # Generate keypair if needed if [ ! -e "$PRIV" ]; then - if [ -e "$HYDRA_FOLDER/keyring/keys/$PRIV_CRYPT" ]; then + if [ -e "$HYDRA_FOLDER/keyring/keys/$PRIV_CRYPT.asc" ]; then echo "Getting eyaml keys for $FDQN from keyringer..." keyringer $HYDRA decrypt $PRIV_CRYPT > $PRIV - keyringer $HYDRA decrypt $PUB_CRYOT > $PUB + keyringer $HYDRA decrypt $PUB_CRYPT > $PUB else echo "Generating eyaml keys for $FQDN..." eyaml createkeys $ARGS |