Faidon has submitted this change and it was merged. Change subject: Kill media-storage thumbs server ......................................................................
Kill media-storage thumbs server They haven't been used in production for a while and there's no point in leaving this cruft behind, especially now that we have a modularization effort. If we ever need this again, there's always the git history :) Change-Id: I350d97782dde750c8f87dfe52a81460cff2c444f --- D files/logrotate/htcp-purger D files/upstart/htcp-purger.conf D manifests/media-storage.pp M manifests/site.pp 4 files changed, 3 insertions(+), 123 deletions(-) Approvals: Faidon: Looks good to me, approved jenkins-bot: Verified diff --git a/files/logrotate/htcp-purger b/files/logrotate/htcp-purger deleted file mode 100644 index 0eaa243..0000000 --- a/files/logrotate/htcp-purger +++ /dev/null @@ -1,11 +0,0 @@ -# This file is managed by Puppet! -# - -/var/log/HTCPpurger.log { - daily - compress - delaycompress - rotate 7 - missingok - copytruncate -} diff --git a/files/upstart/htcp-purger.conf b/files/upstart/htcp-purger.conf deleted file mode 100644 index 3fc7c48..0000000 --- a/files/upstart/htcp-purger.conf +++ /dev/null @@ -1,17 +0,0 @@ -# This file is managed by Puppet! -# -# htcp-purger - -description "HTCP CLR purger" - -start on filesystem -stop on runlevel S - -respawn -respawn limit 10 5 - -umask 022 - -console output - -exec su -c "/export/thumbs/scripts/HTCPpurger/HTCPpurger 239.128.0.112 4827 http://upload.wikimedia.org/ /export/thumbs/" www-data > /var/log/HTCPpurger.log diff --git a/manifests/media-storage.pp b/manifests/media-storage.pp deleted file mode 100644 index 4ad47c8..0000000 --- a/manifests/media-storage.pp +++ /dev/null @@ -1,79 +0,0 @@ -# media-storage.pp - -import "generic-definitions.pp" - -class media-storage::thumbs-server { - $nginx_worker_connections = 16384 - - if ! $thumbs_proxy_source { - $thumbs_proxy_source = "http://208.80.152.156" - } - - if ! $thumbs_proxying { - $thumbs_proxying = "false" - } - - if ! $thumbs_server_name { - $thumbs_server_name = 'upload.wikimedia.org' - } - - include generic::sysctl::high-http-performance - - system_role { "media-storage::thumbs-server": description => "Thumbnail server" } - - package { "nginx": - ensure => "present"; - } - - file { - "/etc/nginx/nginx.conf": - require => Package[nginx], - mode => 0444, - content => template("nginx/nginx.conf.erb"); - "/etc/nginx/sites-enabled/default": - ensure => absent; - } - - nginx_site { "thumbs": install => "template" } - - service { - nginx: - require => [ Package[nginx], Nginx_site[thumbs] ], - subscribe => [ File["/etc/nginx/nginx.conf"], Nginx_site[thumbs] ], - ensure => running; - } - - # monitoring - monitor_service { "nginx http": - description => "nginx HTTP", - check_command => "check_http_url!upload.wikimedia.org!/pybaltestfile.txt" - } -} - -class media-storage::thumbs-handler { - system_role { "media-storage::thumbs-handler": description => "Thumbnail 404 handler" } - - package { [ "php5-cgi", "php5-curl", "spawn-fcgi" ]: - ensure => latest; - } - - upstart_job { "fcgi-thumb-handler": install => "true" } - - service { fcgi-thumb-handler: - require => [ Package[php5-cgi], Package[php5-curl], Package[spawn-fcgi], Upstart_job["fcgi-thumb-handler"] ], - subscribe => Upstart_job["fcgi-thumb-handler"], - ensure => running; - } -} - -class media-storage::htcp-purger { - system_role { "media-storage::htcp-purger": description => "HTCP thumbs purger" } - - upstart_job { "htcp-purger": install => "true" } - - service { "htcp-purger": ensure => running } - - file { "/etc/logrotate.d/htcp-purger": - source => "puppet:///files/logrotate/htcp-purger"; - } -} diff --git a/manifests/site.pp b/manifests/site.pp index 5d3b587..cb67620 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -17,7 +17,6 @@ import "iptables.pp" import "lvs.pp" import "mail.pp" -import "media-storage.pp" import "memcached.pp" import "misc/*.pp" import "mobile.pp" @@ -1839,20 +1838,13 @@ } node "ms5.pmtpa.wmnet" { - include standard, - media-storage::thumbs-server, - media-storage::thumbs-handler + include standard } node "ms6.esams.wikimedia.org" { - $thumbs_proxying = "true" - $thumbs_proxy_source = "http://208.80.152.211" - interface_aggregate { "bond0": orig_interface => "eth0", members => [ "eth0", "eth1", "eth2", "eth3" ] } - include standard, - media-storage::thumbs-server, - media-storage::htcp-purger + include standard } node /^ms(10|1001)\.wikimedia\.org$/ { @@ -1868,12 +1860,7 @@ $cluster = "misc" $ganglia_aggregator = true - $thumbs_proxying = "true" - $thumbs_proxy_source = "http://10.0.0.252" - - include standard, - media-storage::thumbs-server, - media-storage::htcp-purger + include standard } node /^ms-fe[1-4]\.pmtpa\.wmnet$/ { -- To view, visit https://gerrit.wikimedia.org/r/71583 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I350d97782dde750c8f87dfe52a81460cff2c444f Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Faidon <fai...@wikimedia.org> Gerrit-Reviewer: Faidon <fai...@wikimedia.org> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits