Also add static-base class

diff --git a/modules/roles/manifests/static_base.pp b/modules/roles/manifests/static_base.pp
new file mode 100644 (file)
index 0000000..2de3b9b
--- /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 6750aa6a931086b6a03eca1907126623789dd10c..cd5b061b22fbddc3263fa9c23e63c12b6c90adfc 100644 (file)
--- 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 9b10b1039b9516eef4915a24db8a48dc88ce7aa1..bacdc46c11bcafdd59deed377ac6239abcbc8fc4 100644 (file)
--- 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'),