RobH has submitted this change and it was merged.
Change subject: Revert "hooper no long racktables host, removing old racktables
stuff"
......................................................................
Revert "hooper no long racktables host, removing old racktables stuff"
This reverts commit 33a5adea60d5a2b8496508cea9785ab36fb03b1d
Change-Id: I34bc6fd5f76244610d5d63d6f4d03d76872d2316
---
M manifests/misc/racktables.pp
M manifests/site.pp
2 files changed, 40 insertions(+), 2 deletions(-)
Approvals:
RobH: Verified; Looks good to me, approved
diff --git a/manifests/misc/racktables.pp b/manifests/misc/racktables.pp
index f6cb481..9b95234 100644
--- a/manifests/misc/racktables.pp
+++ b/manifests/misc/racktables.pp
@@ -18,4 +18,41 @@
content => template('racktables/racktables.config.erb');
}
-}
\ No newline at end of file
+}
+
+
+class misc::racktables-old {
+ # When this class is chosen, ensure that apache, php5-common,
php5-mysql are
+ # installed on the host via another package set.
+
+ system_role { "misc::racktables": description => "Racktables" }
+
+ if $realm == "labs" {
+ $racktables_host = "$instancename.${domain}"
+ $racktables_ssl_cert = "/etc/ssl/certs/star.wmflabs.pem"
+ $racktables_ssl_key = "/etc/ssl/private/star.wmflabs.key"
+ } else {
+ $racktables_host = "racktables.wikimedia.org"
+ $racktables_ssl_cert = "/etc/ssl/certs/star.wikimedia.org.pem"
+ $racktables_ssl_key = "/etc/ssl/private/star.wikimedia.org.key"
+ }
+
+ class {'webserver::php5': ssl => 'true'; }
+
+ include generic::mysql::packages::client,
+ webserver::php5-gd
+
+ file {
+ "/etc/apache2/sites-available/racktables.wikimedia.org":
+ mode => 0444,
+ owner => root,
+ group => root,
+ notify => Service["apache2"],
+ content =>
template('apache/sites/racktables.wikimedia.org.erb'),
+ ensure => present;
+ }
+
+ apache_site { racktables: name => "racktables.wikimedia.org" }
+ apache_confd { namevirtualhost: install => "true", name =>
"namevirtualhost" }
+ apache_module { rewrite: name => "rewrite" }
+}
diff --git a/manifests/site.pp b/manifests/site.pp
index 6e3905b..ce3bbce 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1083,7 +1083,8 @@
include standard,
admins::roots,
svn::client,
- misc::etherpad
+ misc::etherpad,
+ misc::racktables-old
install_certificate{ "star.wikimedia.org": }
}
--
To view, visit https://gerrit.wikimedia.org/r/62984
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I34bc6fd5f76244610d5d63d6f4d03d76872d2316
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH <[email protected]>
Gerrit-Reviewer: RobH <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
