Tim Starling has submitted this change and it was merged.
Change subject: Remove search::apple-dictionary-bridge from ekrem
......................................................................
Remove search::apple-dictionary-bridge from ekrem
Also delete the class as unused
Change-Id: Ia9dbe4b038b5286033e16ce705a6a7c5d800ca65
---
M manifests/search.pp
M manifests/site.pp
2 files changed, 0 insertions(+), 33 deletions(-)
Approvals:
Tim Starling: Verified; Looks good to me, approved
diff --git a/manifests/search.pp b/manifests/search.pp
index f989722..6f281c1 100644
--- a/manifests/search.pp
+++ b/manifests/search.pp
@@ -234,35 +234,3 @@
mode => 0774;
}
}
-
-class search::apple-dictionary-bridge {
- system_role { "search::apple-dictionary-bridge": description => "Apple
Dictionary to API OpenSearch bridge" }
-
- require webserver::php5
-
- file {
- "/etc/apache2/sites-available/search.wikimedia.org":
- path =>
"/etc/apache2/sites-available/search.wikimedia.org",
- mode => 0444,
- owner => root,
- group => root,
- source =>
"puppet:///files/apache/sites/search.wikimedia.org";
- "/srv/search.wikimedia.org/":
- mode => 0755,
- owner => root,
- group => root,
- ensure => directory;
- }
-
- apache_site { search:
- name => "search.wikimedia.org",
- require => File["/srv/search.wikimedia.org/"];
- }
-
- # Monitoring
- monitor_service { apple-dictionary-bridge:
- check_command =>
"check_http_url!search.wikimedia.org!/?site=wikipedia&lang=en&search=wikip&limit=10",
- description => "Apple Dictionary bridge"
- }
-}
-
diff --git a/manifests/site.pp b/manifests/site.pp
index 60d9aea..44cebdd 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -605,7 +605,6 @@
node "ekrem.wikimedia.org" {
include standard,
- search::apple-dictionary-bridge,
misc::irc-server,
misc::mediawiki-irc-relay
}
--
To view, visit https://gerrit.wikimedia.org/r/52742
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9dbe4b038b5286033e16ce705a6a7c5d800ca65
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Pyoungmeister <[email protected]>
Gerrit-Reviewer: Ryan Lane <[email protected]>
Gerrit-Reviewer: Tim Starling <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
