Dzahn has submitted this change and it was merged.
Change subject: turn bugzilla_report.php into template
......................................................................
turn bugzilla_report.php into template
Change-Id: I15a9b1bbf9b8b3af46bee2d85747033cb48930e0
---
M manifests/misc/bugzilla.pp
M manifests/passwords.pp
R templates/misc/bugzilla_report.php
3 files changed, 7 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/misc/bugzilla.pp b/manifests/misc/bugzilla.pp
index 54c2a43..cd2f30e 100644
--- a/manifests/misc/bugzilla.pp
+++ b/manifests/misc/bugzilla.pp
@@ -68,12 +68,14 @@
systemuser { bzreporter: name => 'reporter', home => '/home/reporter',
groups => [ 'reporter' ] }
+ require passwords::bugzilla
+
file { bugzilla_report:
path => "/home/reporter/bugzilla_report.php",
owner => reporter,
group => reporter,
mode => 0550,
- source => "puppet:///files/misc/bugzilla_report.php",
+ content => template('misc/bugzilla_report.php'),
ensure => present,
}
diff --git a/manifests/passwords.pp b/manifests/passwords.pp
index b68a18e..9333e32 100644
--- a/manifests/passwords.pp
+++ b/manifests/passwords.pp
@@ -18,4 +18,6 @@
class passwords::openstack::glance { }
class passwords::openstack::nova { }
class passwords::puppet::database { }
-class passwords::analytics { }
\ No newline at end of file
+class passwords::analytics { }
+class passwords::bugzilla { }
+
diff --git a/files/misc/bugzilla_report.php b/templates/misc/bugzilla_report.php
similarity index 97%
rename from files/misc/bugzilla_report.php
rename to templates/misc/bugzilla_report.php
index 7e5d088..6f9ea0f 100755
--- a/files/misc/bugzilla_report.php
+++ b/templates/misc/bugzilla_report.php
@@ -172,7 +172,7 @@
print "MediaWiki Bugzilla Report for " . date('F d, Y', $begin_date) . " - " .
date('F d, Y', $end_date) . "\n\n";
-$ok = mysql_connect("db9.pmtpa.wmnet", "bugs", "hiFs76;Nw");
+$ok = mysql_connect("db9.pmtpa.wmnet", "bugs", "<%=
scope.lookupvar('passwords::bugzilla::bugzilla_db_pass') %>");
if (!$ok)
reportFailure("DB connection failure");
--
To view, visit https://gerrit.wikimedia.org/r/51629
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I15a9b1bbf9b8b3af46bee2d85747033cb48930e0
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
