From a95dfc2201046441a1b3bc2dc9aeccd1f8020e97 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 8 Dec 2012 14:49:35 +0100 Subject: [PATCH] Also add static-base class --- modules/roles/manifests/static_base.pp | 11 +++++++++++ modules/roles/manifests/static_master.pp | 2 +- modules/roles/manifests/static_mirror.pp | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 modules/roles/manifests/static_base.pp diff --git a/modules/roles/manifests/static_base.pp b/modules/roles/manifests/static_base.pp new file mode 100644 index 00000000..2de3b9b6 --- /dev/null +++ b/modules/roles/manifests/static_base.pp @@ -0,0 +1,11 @@ +class roles::static_base { + if ! $::staticsync_key { + exec { 'create-staticsync-key': + command => '/bin/su - staticsync -c \'mkdir -p -m 02700 .ssh && ssh-keygen -C "`whoami`@`hostname` (`date +%Y-%m-%d`)" -P "" -f .ssh/id_rsa -q\'', + onlyif => '/usr/bin/getent passwd staticsync > /dev/null && ! [ -e /home/staticsync/.ssh/id_rsa ]' + } + } +} +# vim:set et: +# vim:set sts=4 ts=4: +# vim:set shiftwidth=4: diff --git a/modules/roles/manifests/static_master.pp b/modules/roles/manifests/static_master.pp index 6750aa6a..cd5b061b 100644 --- a/modules/roles/manifests/static_master.pp +++ b/modules/roles/manifests/static_master.pp @@ -1,4 +1,4 @@ -class roles::static_master inherits roles::mirror_base { +class roles::static_master inherits roles::static_base { file { '/etc/ssh/userkeys/staticsync': content => template('roles/static-master-authorized_keys.erb'), diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp index 9b10b103..bacdc46c 100644 --- a/modules/roles/manifests/static_mirror.pp +++ b/modules/roles/manifests/static_mirror.pp @@ -1,4 +1,4 @@ -class roles::static_mirror inherits roles::mirror_base { +class roles::static_mirror inherits roles::static_base { file { '/etc/ssh/userkeys/staticsync': content => template('roles/static-mirror-authorized_keys.erb'), -- 2.39.2