Merge branch 'master' into 'master'

Move old monolithic preferences files to mutiple preferences.d files (Fix #14)

Closes #14

See merge request !61

1 files changed, 104 insertions, 13 deletions

diff --git a/manifests/preferences.pp b/manifests/preferences.pp
index d3eb780..ce28d37 100644
--- a/manifests/preferences.pp
+++ b/manifests/preferences.pp
@@ -1,19 +1,110 @@
 class apt::preferences {
 
-  $pref_contents = $apt::custom_preferences ? {
-    ''      => $::operatingsystem ? {
-      'debian' => template("apt/${::operatingsystem}/preferences.erb"),
-      'ubuntu' => template("apt/${::operatingsystem}/preferences_${apt::codename}.erb"),
-    },
-    default => $apt::custom_preferences
+  file { '/etc/apt/preferences':
+      ensure => absent;
   }
 
-  file { '/etc/apt/preferences':
-    ensure  => present,
-    alias   => 'apt_config',
-    # only update together
-    content => $pref_contents,
-    require => File['/etc/apt/sources.list'],
-    owner   => root, group => 0, mode => '0644';
+  if ($apt::manage_preferences == true) and ($apt::custom_preferences != undef) {
+
+    file {
+      '/etc/apt/preferences.d/custom':
+        ensure  => present,
+        alias   => 'apt_config',
+        content => template($apt::custom_preferences),
+        require => File['/etc/apt/sources.list'],
+        owner   => root, group => 0, mode => '0644';
+
+      '/etc/apt/preferences.d/stable':
+        ensure => absent;
+
+      '/etc/apt/preferences.d/volatile':
+        ensure => absent;
+
+      '/etc/apt/preferences.d/lts':
+        ensure => absent;
+
+      '/etc/apt/preferences.d/nextcodename':
+        ensure => absent;
+    }
+  }
+
+  elsif $apt::manage_preferences == true {
+
+    if $::operatingsystem == "Debian" {
+
+      file {
+        '/etc/apt/preferences.d/stable':
+          ensure  => present,
+          alias   => 'apt_config',
+          content => template('apt/Debian/stable.erb'),
+          require => File['/etc/apt/sources.list'],
+          owner   => root, group => 0, mode => '0644';
+
+        '/etc/apt/preferences.d/custom':
+          ensure => absent;
+      }
+
+      if $apt::use_volatile {
+
+        file { '/etc/apt/preferences.d/volatile':
+          ensure  => present,
+          content => template('apt/Debian/volatile.erb'),
+          require => File['/etc/apt/sources.list'],
+          owner   => root, group => 0, mode => '0644';
+        }
+      }
+
+      if $apt::use_lts {
+
+        file { '/etc/apt/preferences.d/lts':
+          ensure  => present,
+          content => template('apt/Debian/lts.erb'),
+          require => File['/etc/apt/sources.list'],
+          owner   => root, group => 0, mode => '0644';
+        }
+      }
+
+      if ($::debian_nextcodename) and ($::debian_nextcodename != "experimental") {
+
+        file { '/etc/apt/preferences.d/nextcodename':
+          ensure  => present,
+          content => template('apt/Debian/nextcodename.erb'),
+          require => File['/etc/apt/sources.list'],
+          owner   => root, group => 0, mode => '0644';
+        }
+      }
+    }
+
+    elsif $::operatingsystem == "Ubuntu" {
+
+      file { '/etc/apt/preferences':
+       ensure  => present,
+       alias   => 'apt_config',
+       # only update together
+       content => template("apt/Ubuntu/preferences_${apt::codename}.erb"),
+       require => File['/etc/apt/sources.list'],
+       owner   => root, group => 0, mode => '0644';
+      }
+    }
+  }
+
+  elsif $apt::manage_preferences == false {
+
+    file {
+      '/etc/apt/preferences.d/custom':
+        ensure => absent;
+
+      '/etc/apt/preferences.d/stable':
+        ensure => absent;
+
+      '/etc/apt/preferences.d/volatile':
+        ensure => absent;
+
+      '/etc/apt/preferences.d/lts':
+        ensure => absent;
+
+      '/etc/apt/preferences.d/nextcodename':
+        ensure => absent;
+    }
   }
 }