Tim Landscheidt has uploaded a new change for review.

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

Change subject: Move ve files to role module
......................................................................

Move ve files to role module

Change-Id: I4986612f0c33c63304beeee84d77ca9648ab10ed
---
R modules/role/files/ve/devwiki.conf
R modules/role/files/ve/vb
M modules/role/manifests/ve.pp
3 files changed, 2 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/01/325701/1

diff --git a/files/ve/devwiki.conf b/modules/role/files/ve/devwiki.conf
similarity index 100%
rename from files/ve/devwiki.conf
rename to modules/role/files/ve/devwiki.conf
diff --git a/files/ve/vb b/modules/role/files/ve/vb
similarity index 100%
rename from files/ve/vb
rename to modules/role/files/ve/vb
diff --git a/modules/role/manifests/ve.pp b/modules/role/manifests/ve.pp
index d2e1ca4..dc88fbd 100644
--- a/modules/role/manifests/ve.pp
+++ b/modules/role/manifests/ve.pp
@@ -10,18 +10,15 @@
     include ::mediawiki::web::sites
     include ::mediawiki::web::prod_sites
 
-    # move files to module?
-    # lint:ignore:puppet_url_without_modules
     file { '/usr/local/bin/vb':
-        source => 'puppet:///files/ve/vb',
+        source => 'puppet:///modules/role/ve/vb',
         owner  => 'root',
         group  => 'root',
         mode   => '0555',
     }
 
     apache::site { 'devwiki':
-        source   => 'puppet:///files/ve/devwiki.conf',
+        source   => 'puppet:///modules/role/ve/devwiki.conf',
         priority => 4,
     }
-    # lint:endignore
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4986612f0c33c63304beeee84d77ca9648ab10ed
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <[email protected]>

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

Reply via email to