diff options
| -rw-r--r-- | config/defaults.yaml | 6 | ||||
| -rw-r--r-- | config/eip/defaults.yaml | 1 | ||||
| -rw-r--r-- | puppet/manifests/site.pp | 8 | 
3 files changed, 14 insertions, 1 deletions
diff --git a/config/defaults.yaml b/config/defaults.yaml index 489975b2..62f047e3 100644 --- a/config/defaults.yaml +++ b/config/defaults.yaml @@ -1,3 +1,7 @@  ---  testpw: secret -ssh-keys: -   +services: - none + +ssh_keys: +  test_key: +    key: ssh-rsa random_noiseAAdABIwAAAGEA3FSyQwBI6Z+nCSjUUk8EEAnnkhXlukKoppND/RRClWz2s5TCzIkd3Ou5+Cyz71X0XmazM3l5WgeErvtIwQMyT1KjNoMhoJMrJnWqQPOt5Q8zWd9qG7PBl9+eiH5qV7NZ diff --git a/config/eip/defaults.yaml b/config/eip/defaults.yaml index 0938e655..29022408 100644 --- a/config/eip/defaults.yaml +++ b/config/eip/defaults.yaml @@ -2,3 +2,4 @@  # make shure 'false' is quoted    tor: 'false'  openvpn_server_configs: - + diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp index f7b7303f..a897de11 100644 --- a/puppet/manifests/site.pp +++ b/puppet/manifests/site.pp @@ -5,6 +5,14 @@ node 'default' {    $services=hiera_array('services')    notice("Services for $fqdn: $services") +  # configure ssh and inculde ssh-keys +  #include sshd +  $ssh_keys=hiera_hash('ssh_keys') +  include site_sshd +  notice($ssh_keys) +  create_resources('site_sshd::ssh_key', $ssh_keys) + +    if 'eip' in $services {      include site_openvpn  | 
