From 3693942d822dc7a6428525a84d994d5338a34fc0 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 9 Dec 2012 12:30:43 +0100 Subject: [PATCH] Move static-mirroring templates into their own dir --- modules/roles/manifests/static_master.pp | 4 ++-- modules/roles/manifests/static_source.pp | 2 +- .../templates/{ => static-mirroring}/static-clients.conf.erb | 0 .../{ => static-mirroring}/static-master-authorized_keys.erb | 0 .../{ => static-mirroring}/static-mirror-authorized_keys.erb | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename modules/roles/templates/{ => static-mirroring}/static-clients.conf.erb (100%) rename modules/roles/templates/{ => static-mirroring}/static-master-authorized_keys.erb (100%) rename modules/roles/templates/{ => static-mirroring}/static-mirror-authorized_keys.erb (100%) diff --git a/modules/roles/manifests/static_master.pp b/modules/roles/manifests/static_master.pp index e1d61a141..df11d6a42 100644 --- a/modules/roles/manifests/static_master.pp +++ b/modules/roles/manifests/static_master.pp @@ -1,7 +1,7 @@ class roles::static_master inherits roles::static_base { file { '/etc/ssh/userkeys/staticsync': - content => template('roles/static-master-authorized_keys.erb'), + content => template('roles/static-mirroring/static-master-authorized_keys.erb'), ; '/usr/local/bin/static-master-run': source => "puppet:///modules/roles/static-mirroring/static-master-run", @@ -17,7 +17,7 @@ class roles::static_master inherits roles::static_base { ; '/etc/static-clients.conf': - content => template('roles/static-clients.conf.erb'), + content => template('roles/static-mirroring/static-clients.conf.erb'), ; } } diff --git a/modules/roles/manifests/static_source.pp b/modules/roles/manifests/static_source.pp index a3b61034b..e44624b99 100644 --- a/modules/roles/manifests/static_source.pp +++ b/modules/roles/manifests/static_source.pp @@ -1,7 +1,7 @@ class roles::static_source inherits roles::static_base { file { '/etc/ssh/userkeys/staticsync': - content => template('roles/static-mirror-authorized_keys.erb'), + content => template('roles/static-mirroring/static-mirror-authorized_keys.erb'), ; '/usr/local/bin/static-mirror-ssh-wrap': source => "puppet:///modules/roles/static-mirroring/static-mirror-ssh-wrap", diff --git a/modules/roles/templates/static-clients.conf.erb b/modules/roles/templates/static-mirroring/static-clients.conf.erb similarity index 100% rename from modules/roles/templates/static-clients.conf.erb rename to modules/roles/templates/static-mirroring/static-clients.conf.erb diff --git a/modules/roles/templates/static-master-authorized_keys.erb b/modules/roles/templates/static-mirroring/static-master-authorized_keys.erb similarity index 100% rename from modules/roles/templates/static-master-authorized_keys.erb rename to modules/roles/templates/static-mirroring/static-master-authorized_keys.erb diff --git a/modules/roles/templates/static-mirror-authorized_keys.erb b/modules/roles/templates/static-mirroring/static-mirror-authorized_keys.erb similarity index 100% rename from modules/roles/templates/static-mirror-authorized_keys.erb rename to modules/roles/templates/static-mirroring/static-mirror-authorized_keys.erb -- 2.20.1