Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/135500
Change subject: Tools: Fix pastebinit configuration
......................................................................
Tools: Fix pastebinit configuration
This change fixes the Puppet setup of pastebinit and also
clarifies that the configuration does not make pastes go to
the Tools paste tool by default, but just adds it as an
option for the user to choose.
Change-Id: I666b0a4715319d614fc5d0bc5d43dcdc068da8f3
---
M modules/toollabs/manifests/dev_environ.pp
1 file changed, 14 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/00/135500/1
diff --git a/modules/toollabs/manifests/dev_environ.pp
b/modules/toollabs/manifests/dev_environ.pp
index 27503b8..fb91b43 100644
--- a/modules/toollabs/manifests/dev_environ.pp
+++ b/modules/toollabs/manifests/dev_environ.pp
@@ -72,14 +72,21 @@
ensure => latest,
}
- # pastebinit config to point to tools paste, since pastes
- # might contain PII and sending them by default out of tools
- # might not be the best of ideas
-
+ # pastebinit configuration for http://tools.wmflabs.org/paste/.
+ file { '/etc/pastebin.d':
+ require => Package['pastebinit'],
+ ensure => 'directory',
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ }
file { '/etc/pastebin.d/tools.conf':
- ensure => 'file',
- source => 'puppet:///modules/tools/pastebinit.conf',
- mode => '0644'
+ require => File['/etc/pastebin.d'],
+ ensure => 'file',
+ source => 'puppet:///modules/toollabs/pastebinit.conf',
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
}
# TODO: deploy scripts
--
To view, visit https://gerrit.wikimedia.org/r/135500
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I666b0a4715319d614fc5d0bc5d43dcdc068da8f3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
