[MediaWiki-commits] [Gerrit] operations/puppet[production]: Move wikimedia-logo.svg to role module

2016-12-13 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/325729 )

Change subject: Move wikimedia-logo.svg to role module
..


Move wikimedia-logo.svg to role module

Change-Id: I5c03b9a179841b5dd2f834f95266b9c4b10078df
---
R modules/role/files/grafana/wikimedia-logo.svg
M modules/role/manifests/grafana/base.pp
2 files changed, 1 insertion(+), 4 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/files/misc/wikimedia-logo.svg 
b/modules/role/files/grafana/wikimedia-logo.svg
similarity index 100%
rename from files/misc/wikimedia-logo.svg
rename to modules/role/files/grafana/wikimedia-logo.svg
diff --git a/modules/role/manifests/grafana/base.pp 
b/modules/role/manifests/grafana/base.pp
index d4f2e58..746f969 100644
--- a/modules/role/manifests/grafana/base.pp
+++ b/modules/role/manifests/grafana/base.pp
@@ -123,16 +123,13 @@
 notify  => Service['grafana-server'],
 }
 
-# move file to module?
-# lint:ignore:puppet_url_without_modules
 file { '/usr/share/grafana/public/img/grafana_icon.svg':
-source  => 'puppet:///files/misc/wikimedia-logo.svg',
+source  => 'puppet:///modules/role/grafana/wikimedia-logo.svg',
 owner   => 'root',
 group   => 'root',
 mode=> '0444',
 require => Package['grafana'],
 }
-# lint:endignore
 
 # We disable account creation, because accounts are created
 # automagically based on the X-WEBAUTH-USER, which is either set

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5c03b9a179841b5dd2f834f95266b9c4b10078df
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Move wikimedia-logo.svg to role module

2016-12-06 Thread Tim Landscheidt (Code Review) 
Tim Landscheidt has uploaded a new change for review.

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

Change subject: Move wikimedia-logo.svg to role module
..

Move wikimedia-logo.svg to role module

Change-Id: I5c03b9a179841b5dd2f834f95266b9c4b10078df
---
R modules/role/files/grafana/wikimedia-logo.svg
M modules/role/manifests/grafana/base.pp
2 files changed, 1 insertion(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/29/325729/1

diff --git a/files/misc/wikimedia-logo.svg 
b/modules/role/files/grafana/wikimedia-logo.svg
similarity index 100%
rename from files/misc/wikimedia-logo.svg
rename to modules/role/files/grafana/wikimedia-logo.svg
diff --git a/modules/role/manifests/grafana/base.pp 
b/modules/role/manifests/grafana/base.pp
index d4f2e58..746f969 100644
--- a/modules/role/manifests/grafana/base.pp
+++ b/modules/role/manifests/grafana/base.pp
@@ -123,16 +123,13 @@
 notify  => Service['grafana-server'],
 }
 
-# move file to module?
-# lint:ignore:puppet_url_without_modules
 file { '/usr/share/grafana/public/img/grafana_icon.svg':
-source  => 'puppet:///files/misc/wikimedia-logo.svg',
+source  => 'puppet:///modules/role/grafana/wikimedia-logo.svg',
 owner   => 'root',
 group   => 'root',
 mode=> '0444',
 require => Package['grafana'],
 }
-# lint:endignore
 
 # We disable account creation, because accounts are created
 # automagically based on the X-WEBAUTH-USER, which is either set

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c03b9a179841b5dd2f834f95266b9c4b10078df
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits