Andrew Bogott has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/95478


Change subject: Fixed a bunch of file resource paths.
......................................................................

Fixed a bunch of file resource paths.

Change-Id: I1576588f9ab3761b8d0e86fe482e5620feb4fbdd
---
M modules/download/manifests/cron-rsync-dumps.pp
M modules/download/manifests/gluster.pp
M modules/download/manifests/mirror.pp
M modules/download/manifests/primary.pp
M modules/download/manifests/wikimedia.pp
5 files changed, 9 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/78/95478/1

diff --git a/modules/download/manifests/cron-rsync-dumps.pp 
b/modules/download/manifests/cron-rsync-dumps.pp
index e58b6ba..edeb407 100644
--- a/modules/download/manifests/cron-rsync-dumps.pp
+++ b/modules/download/manifests/cron-rsync-dumps.pp
@@ -4,7 +4,7 @@
         owner  => root,
         group  => root,
         path   => '/usr/local/bin/rsync-dumps.sh',
-        source => 'puppet:///modules/download/files/rsync-dumps.sh';
+        source => 'puppet:///modules/download/rsync-dumps.sh';
     }
 
     cron { 'rsync-dumps':
diff --git a/modules/download/manifests/gluster.pp 
b/modules/download/manifests/gluster.pp
index a4bf959..8df0b55 100644
--- a/modules/download/manifests/gluster.pp
+++ b/modules/download/manifests/gluster.pp
@@ -15,13 +15,13 @@
     file { '/usr/local/bin/wmfdumpsmirror.py':
         ensure => present,
         mode   => '0755',
-        source => 'puppet:///modules/download/files/gluster/wmfdumpsmirror.py',
+        source => 'puppet:///modules/download/gluster/wmfdumpsmirror.py',
     }
 
     file{ '/usr/local/sbin/gluster-rsync-cron.sh':
         ensure => present,
         mode   => '0755',
-        source => 
'puppet:///modules/download/files/gluster/gluster-rsync-cron.sh',
+        source => 'puppet:///modules/download/gluster/gluster-rsync-cron.sh',
     }
 
     cron { 'dumps_gluster_rsync':
diff --git a/modules/download/manifests/mirror.pp 
b/modules/download/manifests/mirror.pp
index 828683e..98da4c4 100644
--- a/modules/download/manifests/mirror.pp
+++ b/modules/download/manifests/mirror.pp
@@ -7,7 +7,7 @@
         mode    => '0444',
         owner   => root,
         group   => root,
-        source  => 
'puppet:///modules/download/files/rsync/rsyncd.conf.downloadmirror',
+        source  => 
'puppet:///modules/download/rsync/rsyncd.conf.downloadmirror',
         require => Package['rsync'],
     }
 
@@ -15,7 +15,7 @@
         mode    => '0444',
         owner   => root,
         group   => root,
-        source  => 
'puppet:///modules/download/files/rsync/rsync.default.downloadmirror',
+        source  => 
'puppet:///modules/download/rsync/rsync.default.downloadmirror',
         require => Package['rsync'],
     }
 
diff --git a/modules/download/manifests/primary.pp 
b/modules/download/manifests/primary.pp
index a013b9d..6a87156 100644
--- a/modules/download/manifests/primary.pp
+++ b/modules/download/manifests/primary.pp
@@ -7,7 +7,7 @@
         mode    => '0444',
         owner   => root,
         group   => root,
-        source  => 
'puppet:///modules/download/files/rsync/rsyncd.conf.downloadprimary',
+        source  => 
'puppet:///modules/download/rsync/rsyncd.conf.downloadprimary',
         require => Package['rsync'],
     }
 
@@ -15,7 +15,7 @@
         mode    => '0444',
         owner   => root,
         group   => root,
-        source  
=>'puppet:///modules/download/files/rsync/rsync.default.downloadprimary',
+        source  
=>'puppet:///modules/download/rsync/rsync.default.downloadprimary',
         require => Package['rsync'],
     }
 
diff --git a/modules/download/manifests/wikimedia.pp 
b/modules/download/manifests/wikimedia.pp
index ed8bca6..35ba592 100644
--- a/modules/download/manifests/wikimedia.pp
+++ b/modules/download/manifests/wikimedia.pp
@@ -10,7 +10,7 @@
         owner  => root,
         group  => root,
         path   => '/etc/lighttpd/lighttpd.conf',
-        source => 'puppet:///modules/download/files/lighttpd.conf',
+        source => 'puppet:///modules/download/lighttpd.conf',
     }
 
     service { 'lighttpd':
@@ -25,7 +25,7 @@
         mode    => '0444',
         owner   => root,
         group   => root,
-        source  => 'puppet:///modules/download/files/exports',
+        source  => 'puppet:///modules/download/exports',
         require => package['nfs-kernel-server'],
     }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/95478
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1576588f9ab3761b8d0e86fe482e5620feb4fbdd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to