From 14872fa632f4ae73b75464706e100967c9c9035f Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Sun, 2 Jul 2017 01:44:38 -0400
Subject: Rename "stable" preferences file to "current_codename"

The file that we call "stable" can make apt actually pin testing or sid
if one of these is the running codename, which is nothing stable.

In order to make this file's name more relevant it should be named
current_codename.
---
 manifests/preferences.pp              | 14 ++++++++++----
 templates/Debian/current_codename.erb |  7 +++++++
 templates/Debian/stable.erb           |  7 -------
 3 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 templates/Debian/current_codename.erb
 delete mode 100644 templates/Debian/stable.erb

diff --git a/manifests/preferences.pp b/manifests/preferences.pp
index ce28d37..d2f6ab4 100644
--- a/manifests/preferences.pp
+++ b/manifests/preferences.pp
@@ -4,6 +4,12 @@ class apt::preferences {
       ensure => absent;
   }
 
+  # Remove the file that we were previously deploying. It's now been renamed to
+  # current_codename
+  file { '/etc/apt/preferences.d/stable':
+    ensure => absent,
+  }
+
   if ($apt::manage_preferences == true) and ($apt::custom_preferences != undef) {
 
     file {
@@ -14,7 +20,7 @@ class apt::preferences {
         require => File['/etc/apt/sources.list'],
         owner   => root, group => 0, mode => '0644';
 
-      '/etc/apt/preferences.d/stable':
+      '/etc/apt/preferences.d/current_codename':
         ensure => absent;
 
       '/etc/apt/preferences.d/volatile':
@@ -33,10 +39,10 @@ class apt::preferences {
     if $::operatingsystem == "Debian" {
 
       file {
-        '/etc/apt/preferences.d/stable':
+        '/etc/apt/preferences.d/current_codename':
           ensure  => present,
           alias   => 'apt_config',
-          content => template('apt/Debian/stable.erb'),
+          content => template('apt/Debian/current_codename.erb'),
           require => File['/etc/apt/sources.list'],
           owner   => root, group => 0, mode => '0644';
 
@@ -94,7 +100,7 @@ class apt::preferences {
       '/etc/apt/preferences.d/custom':
         ensure => absent;
 
-      '/etc/apt/preferences.d/stable':
+      '/etc/apt/preferences.d/current_codename':
         ensure => absent;
 
       '/etc/apt/preferences.d/volatile':
diff --git a/templates/Debian/current_codename.erb b/templates/Debian/current_codename.erb
new file mode 100644
index 0000000..be05e51
--- /dev/null
+++ b/templates/Debian/current_codename.erb
@@ -0,0 +1,7 @@
+# This file is managed by puppet
+# all local modifications will be overwritten
+
+Explanation: Debian <%= @debian_codename %>
+Package: *
+Pin: release o=Debian,n=<%= @debian_codename %>
+Pin-Priority: 990
diff --git a/templates/Debian/stable.erb b/templates/Debian/stable.erb
deleted file mode 100644
index be05e51..0000000
--- a/templates/Debian/stable.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file is managed by puppet
-# all local modifications will be overwritten
-
-Explanation: Debian <%= @debian_codename %>
-Package: *
-Pin: release o=Debian,n=<%= @debian_codename %>
-Pin-Priority: 990
-- 
cgit v1.2.3