RobH has submitted this change and it was merged.
Change subject: hooper no long racktables host, removing old racktables stuff
......................................................................
hooper no long racktables host, removing old racktables stuff
Change-Id: I37bf572e3abcb745fa38565c497daef4141dc4aa
---
M manifests/misc/racktables.pp
M manifests/site.pp
2 files changed, 2 insertions(+), 40 deletions(-)
Approvals:
RobH: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/racktables.pp b/manifests/misc/racktables.pp
index 9b95234..f6cb481 100644
--- a/manifests/misc/racktables.pp
+++ b/manifests/misc/racktables.pp
@@ -18,41 +18,4 @@
content => template('racktables/racktables.config.erb');
}
-}
-
-
-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" }
-}
+}
\ No newline at end of file
diff --git a/manifests/site.pp b/manifests/site.pp
index ce3bbce..6e3905b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1083,8 +1083,7 @@
include standard,
admins::roots,
svn::client,
- misc::etherpad,
- misc::racktables-old
+ misc::etherpad
install_certificate{ "star.wikimedia.org": }
}
--
To view, visit https://gerrit.wikimedia.org/r/62983
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I37bf572e3abcb745fa38565c497daef4141dc4aa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH <[email protected]>
Gerrit-Reviewer: RobH <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
