Andrew Bogott has submitted this change and it was merged.
Change subject: graphite: Remove auth requirement for labs
......................................................................
graphite: Remove auth requirement for labs
No sensitive data there (primarily SQL logs from prod, which
aren't really there in labs)
Change-Id: I49e18c2d1e234a45c5aeaa6b4ef8546344644cfc
---
M manifests/role/graphite.pp
1 file changed, 0 insertions(+), 21 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
Matanya: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
index 5422417..36f5926 100644
--- a/manifests/role/graphite.pp
+++ b/manifests/role/graphite.pp
@@ -146,31 +146,10 @@
include ::apache::mod::uwsgi
if ($::realm == 'labs') {
- include ::apache::mod::auth_basic
- include ::apache::mod::authn_file
- include ::apache::mod::authz_user
-
if ($::hostname =~ /^deployment-/) {
# Beta
$hostname = 'graphite-beta.wmflabs.org'
- $auth_realm = 'Graphite (see
[[office:User:BDavis_(WMF)/graphite]])'
- $auth_file = '/data/project/graphite/.htpasswd'
- } else {
- # Regular labs instance
- $hostname = $::graphite_hostname ? {
- undef => $::hostname,
- default => $::graphite_hostname,
- }
- $auth_realm = $::graphite_authrealm ? {
- undef => 'Graphite',
- default => $::graphite_authrealm,
- }
- $auth_file = $::graphite_authfile ? {
- undef => '/data/project/graphite/.htpasswd',
- default => $::graphite_authfile,
- }
}
- $apache_auth = template('graphite/apache-auth-local.erb')
} else {
# Production
include ::passwords::ldap::production
--
To view, visit https://gerrit.wikimedia.org/r/142494
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I49e18c2d1e234a45c5aeaa6b4ef8546344644cfc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Matanya <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
