From: Paul Wise Date: Mon, 1 Jun 2015 13:29:38 +0000 (+0800) Subject: Revert snapshot memory increase, dropped git http smart stuff instead. X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=8ac239fcf702f53c3efab758e136e3d60349fb94;p=mirror%2Fdsa-puppet.git Revert snapshot memory increase, dropped git http smart stuff instead. --- diff --git a/hieradata/common.yaml b/hieradata/common.yaml index f6840f683..eceb27936 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -135,5 +135,3 @@ roles: - lw03.debian.org gobby_debian_org: - gombert.debian.org - snapshot_master: - - sibelius.debian.org diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp index ee631fe16..60538d4d8 100644 --- a/modules/apache2/manifests/init.pp +++ b/modules/apache2/manifests/init.pp @@ -51,8 +51,6 @@ class apache2 { $memlimit = 512 * 1024 * 1024 } elsif has_role('qamaster') { $memlimit = 300 * 1024 * 1024 - } elsif has_role('snapshot_master') { - $memlimit = 1536 * 1024 * 1024 } else { $memlimit = 192 * 1024 * 1024 }