Browse Source

Fix keymaster file declaration, and try and echo to a file on the puppetmaster

master
Aaron Hicks 6 years ago
parent
commit
a652c40924
2 changed files with 5 additions and 3 deletions
  1. 2
    2
      manifests/keymaster.pp
  2. 3
    1
      manifests/keymaster/setup.pp

+ 2
- 2
manifests/keymaster.pp View File

@@ -5,7 +5,7 @@ class gpg::keymaster {

require gpg

file{$gpg::params::keymaster_ring_dir:
file{$gpg::params::ring_dir:
ensure => directory,
owner => puppet,
group => puppet,
@@ -13,7 +13,7 @@ class gpg::keymaster {
recurse => true
}

file{$gpg::params::keymaster_keyring:
file{$gpg::params::ring_file:
ensure => file,
owner => puppet,
group => puppet,

+ 3
- 1
manifests/keymaster/setup.pp View File

@@ -48,10 +48,12 @@ define gpg::keymaster::setup(
}
}

$comment = "$keytype $keylength $subkeytype $subkeylength"
# Putting some of the key parameters in the comment
$comment = "${keytype} ${keylength} ${subkeytype} ${subkeylength}"

# Create the GPG key gen file for using gpg in batch mode
$keygen_content = template('gpg/keygen.txt.erb')
generate('echo',"'${keygen_content}'",'>',$keygen_file)

# Create the GPG key pair


Loading…
Cancel
Save