X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=3cb7b30ba6951ce9e02669782c64bec049d69be8;hb=060f447f5fde318dd78e9f53b21fde9a123d476f;hp=9c714a5c3e0cdb23840ec384ba1e7322f959aaef;hpb=382b96856d6c214d79ae17d7f3b919ed7ae99bf8;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 9c714a5c3..3cb7b30ba 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,6 +1,5 @@
 Package {
-	require => File['/etc/apt/apt.conf.d/local-recommends'],
-	stage   => deploy_infra
+	require => File['/etc/apt/apt.conf.d/local-recommends']
 }
 
 File {
@@ -109,8 +108,4 @@ node default {
 	if $::spamd {
 		munin::check { 'spamassassin': }
 	}
-
-	if $::hostname in [chopin,franck,ravel] {
-		include vsftpd
-	}
 }