X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fweblog_provider.pp;h=bed4aaca4ba84f193bfb04e1b3c94d4b7b972efc;hb=33a685862291e6f3c0c7f9df702b930430bbe419;hp=0c8b0487f667bee7be4429e062aeab459191b14f;hpb=dd86267553d18aec658a353881a063c283239211;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/weblog_provider.pp b/modules/roles/manifests/weblog_provider.pp
index 0c8b0487f..bed4aaca4 100644
--- a/modules/roles/manifests/weblog_provider.pp
+++ b/modules/roles/manifests/weblog_provider.pp
@@ -3,14 +3,14 @@ class roles::weblog_provider {
   ssh::keygen {'weblogsync': }
   ssh::authorized_key_add { 'weblongsync-provider::destination':
     target_user => 'weblogsync',
+    key         => dig($facts, 'ssh_keys_users', 'weblogsync', 'id_rsa.pub', 'line'),
     command     => "/srv/weblogs.debian.org/bin/ssh-wrap ${::fqdn}",
-    key         => $facts['weblogsync_key'],
     collect_tag => 'weblogsync',
   }
 
   file { '/etc/cron.d/puppet-weblog-provider': ensure => absent, }
-  concat::fragment { 'dsa-puppet-stuff--weblog-provider':
-    target => '/etc/cron.d/dsa-puppet-stuff',
+  concat::fragment { 'puppet-crontab--weblog-provider':
+    target => '/etc/cron.d/puppet-crontab',
     content  => @(EOF)
                 0 1 * * * weblogsync sleep $((RANDOM \% 1800)); rsync -a --delete-excluded --include 'www.debian.org-access.log-*gz' --include '*-public-access.log-*gz' --exclude '**' /var/log/apache2/. weblogsync@wolkenstein.debian.org:-weblogs-incoming-
                 | EOF