X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fporterbox%2Fmanifests%2Finit.pp;h=801798578d09382b265f7a32c8d629ba3c1096e0;hb=696875f82762047b983d1f002ca9a88d458e64b5;hp=5f3383aee5a57c9072b2413ca60f9964b8b4539e;hpb=6ee2a09e76abc7d9676394954efbaa9ef276e986;p=mirror%2Fdsa-puppet.git

diff --git a/modules/porterbox/manifests/init.pp b/modules/porterbox/manifests/init.pp
index 5f3383aee..801798578 100644
--- a/modules/porterbox/manifests/init.pp
+++ b/modules/porterbox/manifests/init.pp
@@ -1,39 +1,6 @@
 class porterbox {
 	include schroot
-	# FIXME: Refactor this to a common class when something else needs it
-	package { 'moreutils':
-		ensure => installed
-	}
 
-	file { '/etc/schroot/dsa':
-		ensure => directory,
-		require => Package['schroot'],
-	}
-	file { '/etc/schroot/dsa/config':
-		source  => 'puppet:///modules/porterbox/schroot-dsa/config',
-	}
-	if ! ($::debarchitecture in ['kfreebsd-amd64', 'kfreebsd-i386']) {
-		file { '/etc/schroot/dsa/fstab':
-			source  => 'puppet:///modules/porterbox/schroot-dsa/fstab',
-		}
-	} else {
-		file { '/etc/schroot/dsa/fstab':
-			source  => 'puppet:///modules/porterbox/schroot-dsa/fstab-freebsd',
-		}
-	}
-	file { '/etc/schroot/dsa/default-mirror':
-		content => template('porterbox/default-mirror.erb'),
-	}
-	file { '/etc/schroot/setup.d/99porterbox-extra-apt-options':
-		mode    => '0555',
-		source  => 'puppet:///modules/porterbox/schroot-setup.d/99porterbox-extra-apt-options',
-		require => Package['schroot'],
-	}
-	file { '/etc/schroot/setup.d/99porterbox-extra-sources':
-		mode    => '0555',
-		source  => 'puppet:///modules/porterbox/schroot-setup.d/99porterbox-extra-sources',
-		require => Package['schroot'],
-	}
 	file { '/usr/local/bin/dd-schroot-cmd':
 		mode    => '0555',
 		source  => 'puppet:///modules/porterbox/dd-schroot-cmd',