From c5e660a55fca2dea5359be4884693ccf2d0746cc Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 5 Dec 2014 18:59:10 +0100
Subject: [PATCH] Move setup-* from porterbox to schroot module

---
 modules/porterbox/manifests/init.pp                     | 8 --------
 modules/{porterbox => schroot}/files/setup-all-dchroots | 0
 modules/{porterbox => schroot}/files/setup-dchroot      | 0
 modules/schroot/manifests/init.pp                       | 9 +++++++++
 4 files changed, 9 insertions(+), 8 deletions(-)
 rename modules/{porterbox => schroot}/files/setup-all-dchroots (100%)
 rename modules/{porterbox => schroot}/files/setup-dchroot (100%)

diff --git a/modules/porterbox/manifests/init.pp b/modules/porterbox/manifests/init.pp
index d1248310c..99e769ca0 100644
--- a/modules/porterbox/manifests/init.pp
+++ b/modules/porterbox/manifests/init.pp
@@ -9,14 +9,6 @@ class porterbox {
 		mode    => '0555',
 		source  => 'puppet:///modules/porterbox/schroot-list-sessions',
 	}
-	file { '/usr/local/sbin/setup-dchroot':
-		mode    => '0555',
-		source  => 'puppet:///modules/porterbox/setup-dchroot',
-	}
-	file { '/usr/local/sbin/setup-all-dchroots':
-		mode    => '0555',
-		source  => 'puppet:///modules/porterbox/setup-all-dchroots',
-	}
 	file { '/etc/cron.d/puppet-update-dchroots':
 		content  => "0 15 * * 0 root PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin setup-all-dchroots\n",
 	}
diff --git a/modules/porterbox/files/setup-all-dchroots b/modules/schroot/files/setup-all-dchroots
similarity index 100%
rename from modules/porterbox/files/setup-all-dchroots
rename to modules/schroot/files/setup-all-dchroots
diff --git a/modules/porterbox/files/setup-dchroot b/modules/schroot/files/setup-dchroot
similarity index 100%
rename from modules/porterbox/files/setup-dchroot
rename to modules/schroot/files/setup-dchroot
diff --git a/modules/schroot/manifests/init.pp b/modules/schroot/manifests/init.pp
index 5c0f36016..d9ca26141 100644
--- a/modules/schroot/manifests/init.pp
+++ b/modules/schroot/manifests/init.pp
@@ -34,6 +34,15 @@ class schroot {
 		require => Package['schroot'],
 	}
 
+	file { '/usr/local/sbin/setup-dchroot':
+		mode    => '0555',
+		source  => 'puppet:///modules/schroot/setup-dchroot',
+	}
+	file { '/usr/local/sbin/setup-all-dchroots':
+		mode    => '0555',
+		source  => 'puppet:///modules/schroot/setup-all-dchroots',
+	}
+
 	file { '/etc/schroot/dsa':
 		ensure => directory,
 		require => Package['schroot'],
-- 
2.20.1