Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/68634
Change subject: Remove resources for the obsoleted Perl HTCP purger daemon
......................................................................
Remove resources for the obsoleted Perl HTCP purger daemon
Change-Id: I354a0e261f690ed4cd4db5c4c49868a2fd612892
---
M manifests/varnish.pp
1 file changed, 0 insertions(+), 41 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/34/68634/1
diff --git a/manifests/varnish.pp b/manifests/varnish.pp
index d4d91ba..7c20349 100644
--- a/manifests/varnish.pp
+++ b/manifests/varnish.pp
@@ -5,9 +5,6 @@
package { [ 'varnish', 'libvarnishapi1', 'varnish-dbg' ]:
ensure => $version;
}
- package { libworking-daemon-perl:
- ensure => present;
- }
}
class common {
@@ -207,44 +204,6 @@
class htcppurger($varnish_instances=["localhost:80"]) {
Class[varnish::packages] -> Class[varnish::htcppurger]
-
- # start legacy varnishhtcpd stuff
-
- systemuser { "varnishhtcpd": name => "varnishhtcpd",
default_group => "varnishhtcpd", home => "/var/lib/varnishhtcpd" }
-
- $packages = ["liburi-perl", "liblwp-useragent-determined-perl"]
-
- package { $packages: ensure => latest; }
-
- file {
- "/usr/local/bin/varnishhtcpd":
- source =>
"puppet:///files/varnish/varnishhtcpd",
- owner => root,
- group => root,
- mode => 0555,
- notify => Service[varnishhtcpd];
- "/etc/default/varnishhtcpd":
- owner => root,
- group => root,
- mode => 0444,
- content =>
inline_template('DAEMON_OPTS="--user=varnishhtcpd --group=varnishhtcpd
--mcast_address=239.128.0.112<% varnish_instances.each do |inst| -%>
--cache=<%= inst %><% end -%>"');
- }
-
- upstart_job { "varnishhtcpd": install => "true" }
-
- service { varnishhtcpd:
- require => [ File[["/usr/local/bin/varnishhtcpd",
"/etc/default/varnishhtcpd"]], Package[$packages], Systemuser[varnishhtcpd],
Upstart_job[varnishhtcpd] ],
- provider => upstart,
- ensure => stopped; # conflicts with vhtcpd below, set
to "running" if we revert...
- }
-
- nrpe::monitor_service { "varnishhtcpd":
- description => "Varnish HTCP old daemon",
- # was "-c 1:1" when service was set to "running"
state...
- nrpe_command => "/usr/lib/nagios/plugins/check_procs -c
0:0 -u varnishhtcpd -a 'varnishhtcpd worker'"
- }
-
- # end legacy varnishhtcpd stuff
package { "vhtcpd":
ensure => latest,
--
To view, visit https://gerrit.wikimedia.org/r/68634
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I354a0e261f690ed4cd4db5c4c49868a2fd612892
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
