Andrew Bogott has submitted this change and it was merged.
Change subject: Rearranged RT apache includes:
......................................................................
Rearranged RT apache includes:
Move apache out of the generic rt class and into
the labs role class so that it doesn't conflict with
existing includes in production.
Change-Id: I68fe5285b880b6a5ebfc47a047a4630bb6c5b0b8
---
M manifests/misc/rt-server-apache.pp
M manifests/role/request-tracker.pp
2 files changed, 1 insertion(+), 2 deletions(-)
Approvals:
Andrew Bogott: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/rt-server-apache.pp
b/manifests/misc/rt-server-apache.pp
index 8d2cec1..85b4a23 100644
--- a/manifests/misc/rt-server-apache.pp
+++ b/manifests/misc/rt-server-apache.pp
@@ -14,8 +14,6 @@
ensure => latest;
}
- include apache
-
$rtconf = '# This file is for the command-line client,
/usr/bin/rt.\n\nserver http://localhost/rt\n'
file {
diff --git a/manifests/role/request-tracker.pp
b/manifests/role/request-tracker.pp
index 54a9e0e..b10726b 100644
--- a/manifests/role/request-tracker.pp
+++ b/manifests/role/request-tracker.pp
@@ -21,6 +21,7 @@
#
class role::request-tracker-apache::labs {
include passwords::misc::rt
+ include apache
class { "misc::rt-apache::server":
dbuser => $passwords::misc::rt::rt_mysql_user,
--
To view, visit https://gerrit.wikimedia.org/r/63880
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I68fe5285b880b6a5ebfc47a047a4630bb6c5b0b8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
