From 5bbc86ff4f4a601a3924805a13fc1c5154670289 Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Sun, 2 Jul 2017 01:39:34 -0400
Subject: remove template for main preferences config

this file is not used anymore. we've moved all of this to preferences.d
so the template is useless now, but we forgot to remove it.
---
 templates/Debian/preferences.erb | 33 ---------------------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 templates/Debian/preferences.erb

(limited to 'templates')

diff --git a/templates/Debian/preferences.erb b/templates/Debian/preferences.erb
deleted file mode 100644
index 37cf80d..0000000
--- a/templates/Debian/preferences.erb
+++ /dev/null
@@ -1,33 +0,0 @@
-# This file is managed by puppet
-# all local modifications will be overwritten
-
-Explanation: Debian <%= codename=scope.lookupvar('::debian_codename') %>
-Package: *
-Pin: release o=Debian,n=<%= codename %>
-Pin-Priority: 990
-
-<% if use_volatile=scope.lookupvar('apt::use_volatile') -%>
-Explanation: Debian <%= codename %>-updates
-Package: *
-Pin: release o=Debian,n=<%= codename %>-updates
-Pin-Priority: 990
-<%- end -%>
-
-<% if (use_lts=scope.lookupvar('apt::use_lts')) && (scope.lookupvar('::debian_lts') == "true") -%>
-Explanation: Debian <%= codename %>-lts
-Package: *
-Pin: release o=Debian,n=<%= codename %>-lts
-Pin-Priority: 990
-<%- end -%>
-
-<% if (next_codename=scope.lookupvar('::debian_nextcodename')) && (next_codename != "experimental") -%>
-Explanation: Debian <%= next_codename %>
-Package: *
-Pin: release o=Debian,n=<%= next_codename %>
-Pin-Priority: 2
-<%- end -%>
-
-Explanation: Debian fallback
-Package: *
-Pin: release o=Debian
-Pin-Priority: -10
-- 
cgit v1.2.3


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.
---
 templates/Debian/current_codename.erb | 7 +++++++
 templates/Debian/stable.erb           | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 templates/Debian/current_codename.erb
 delete mode 100644 templates/Debian/stable.erb

(limited to 'templates')

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


From 994934798031c0f91e8628edee7b848d0444c57e Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Sun, 2 Jul 2017 01:58:34 -0400
Subject: Deploy forgotten fallback for debian to avoid upgrade mishaps

During the change from the monolithic preferences file to the series of
snippets in preferences.d, one part was left out possibly as an
oversight, which prevents installing packages by mistake that belong to
a release that hasn't been explicitely pinned.
---
 templates/Debian/fallback.erb | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 templates/Debian/fallback.erb

(limited to 'templates')

diff --git a/templates/Debian/fallback.erb b/templates/Debian/fallback.erb
deleted file mode 100644
index 1c75e83..0000000
--- a/templates/Debian/fallback.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file is managed by puppet
-# all local modifications will be overwritten
-
-Explanation: Debian fallback
-Package: *
-Pin: release o=Debian
-Pin-Priority: -10
-- 
cgit v1.2.3