Adding schroot::instance

diff --git a/manifests/subsystems/schroot.pp b/manifests/subsystems/schroot.pp
index d6c4c13b8b814dff98bd3028166147a106a391d0..acc0361e0592658355030a49217148b94a1542bc 100644 (file)
--- a/manifests/subsystems/schroot.pp
+++ b/manifests/subsystems/schroot.pp
@@ -3,11 +3,13 @@ class schroot {
     ensure => installed,
   }
 
-  file { '/etc/schroot/schroot.conf':
-    ensure  => present,
-    owner   => root,
-    mode    => 0644,
-    require => Package['schroot'],
-    source  => "puppet:///modules/site-nodo/schroot/$fqdn/schroot.conf",
+  define instance($type = 'plain', description, $directory, $users, $groups, $aliases, $ensure = 'present') {
+    file { '/etc/schroot/schroot/chroot.d':
+      ensure  => $ensure,
+      owner   => root,
+      mode    => 0644,
+      require => Package['schroot'],
+      content => template('nodo/schroot/schroot.conf.erb'),
+    }
   }
 }

diff --git a/templates/schroot/schroot.conf.erb b/templates/schroot/schroot.conf.erb
new file mode 100644 (file)
index 0000000..c9a524f
--- /dev/null
+++ b/templates/schroot/schroot.conf.erb
@@ -0,0 +1,10 @@
+#
+# Managed by puppet
+#
+[<%= name %>]
+type=<%= type %>
+description=<%= description %>
+directory=<%= directory %>
+users=<%= users %>
+groups=<%= groups %>
+aliases=<%= aliases %>