X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_master.pp;h=df11d6a4231bccbbd87c70f157d3c1eb336cf840;hb=3693942d822dc7a6428525a84d994d5338a34fc0;hp=4f982bd3947f200939db34b7cee6bbefe45c7416;hpb=5a0eade9f4a8531e7394b19ddaad072e8f38692d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/static_master.pp b/modules/roles/manifests/static_master.pp
index 4f982bd39..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",
@@ -16,11 +16,8 @@ class roles::static_master inherits roles::static_base {
             mode => 555,
             ;
 
-        '/etc/static-components.conf':
-            source  => "puppet:///modules/roles/static-mirroring/static-components.conf",
-            ;
         '/etc/static-clients.conf':
-            content => template('roles/static-clients.conf.erb'),
+            content => template('roles/static-mirroring/static-clients.conf.erb'),
             ;
     }
 }