Merge remote-tracking branch 'lelutin-gitlab/package' (Closes: #5)

2 files changed, 49 insertions, 20 deletions

diff --git a/manifests/package.pp b/manifests/package.pp
new file mode 100644
index 0000000..e83ac68
--- /dev/null
+++ b/manifests/package.pp
@@ -0,0 +1,43 @@
+# Install a package with a preseed file to automatically answer some questions.
+define apt::package (
+  $ensure  = 'present',
+  $use_seed = false,
+  $seedfile_template = "site_apt/${::debian_codename}/${name}.seeds",
+  $seedfile_content = '',
+  $pin = '',
+  $pin_priority = 1000
+) {
+
+  package { $name:
+    ensure       => $ensure,
+    responsefile => $seedfile,
+  }
+
+  if $use_seed {
+    $seedfile = "/var/cache/local/preseeding/${name}.seeds"
+    $real_seedfile_content = $seedfile_content ? {
+      ''      => template ( $seedfile_template ),
+      default => $seedfile_content,
+    }
+
+    file { $seedfile:
+      content => $real_seedfile_content,
+      mode    => '0600',
+      owner   => 'root',
+      group   => 0,
+    }
+
+    File[$seedfile] -> Package[$name]
+  }
+
+  if $pin {
+    apt::preferences_snippet { $name:
+      ensure   => $ensure,
+      priority => $pin_priority,
+      pin      => $pin,
+    }
+
+    Apt::Preferences_snippet[$name] -> Package[$name]
+  }
+
+}
diff --git a/manifests/preseeded_package.pp b/manifests/preseeded_package.pp
index 29a981e..e6fcab1 100644
--- a/manifests/preseeded_package.pp
+++ b/manifests/preseeded_package.pp
@@ -1,26 +1,12 @@
-# Install a package with a preseed file to automatically answer some questions.
-
+# This is a wrapper that will be removed after a while
 define apt::preseeded_package (
   $ensure  = 'present',
   $content = '',
 ) {
-
-  $seedfile = "/var/cache/local/preseeding/${name}.seeds"
-  $real_content = $content ? {
-    ''      => template ( "site_apt/${::debian_codename}/${name}.seeds" ),
-    default => $content,
-  }
-
-  file { $seedfile:
-    content => $real_content,
-    mode    => '0600',
-    owner   => 'root',
-    group   => 0,
-  }
-
-  package { $name:
-    ensure       => $ensure,
-    responsefile => $seedfile,
-    require      => File[$seedfile],
+  warning('apt::preseeded_package is deprecated! you should now use apt::package with parameter use_seed set to true instead.')
+  apt::package { $name:
+    ensure           => $ensure,
+    use_seed         => true,
+    seedfile_content => $content,
   }
 }