opuppet/module-apt
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'merge_debian_preferences_templates'

Browse source 
Conflicts:
	manifests/preferences.pp
	templates/Debian/preferences_jessie.erb
	templates/Debian/preferences_squeeze.erb
	templates/Debian/preferences_wheezy.erb
This commit is contained in:
Jérôme Charaoui 2016-06-29 16:35:17 +02:00
commit 53c49fe2ae
5 changed files with 15 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
manifests/preferences.pp
View file

@ -2,8 +2,11 @@ class apt::preferences {
$pref_contents = $apt::custom_preferences ? { $pref_contents = $apt::custom_preferences ? {
'' => $::operatingsystem ? { '' => $::operatingsystem ? {
'debian' => template("apt/${::operatingsystem}/preferences_${::debian_codename}.erb"), 'debian' => $::debian_codename ? {
'ubuntu' => template("apt/${::operatingsystem}/preferences_${::ubuntu_codename}.erb"), 'lenny' => template("apt/${::operatingsystem}/preferences_lenny.erb"),
default => template("apt/${::operatingsystem}/preferences.erb"),
},
'ubuntu' => template("apt/${::operatingsystem}/preferences_${apt::codename}.erb"),
}, },
default => $apt::custom_preferences default => $apt::custom_preferences
} }

17
templates/Debian/preferences_squeeze.erb → templates/Debian/preferences.erb
View file

@ -1,30 +1,33 @@
# This file is managed by puppet
# all local modifications will be overwritten
Explanation: Debian <%= codename=scope.lookupvar('::debian_codename') %> Explanation: Debian <%= codename=scope.lookupvar('::debian_codename') %>
Package: * Package: *
Pin: release o=Debian,n=<%= codename %> Pin: release o=Debian,n=<%= codename %>
Pin-Priority: 990 Pin-Priority: 990
<% if use_volatile=scope.lookupvar('apt::use_volatile') -%>
Explanation: Debian <%= codename %>-updates Explanation: Debian <%= codename %>-updates
Package: * Package: *
Pin: release o=Debian,n=<%= codename %>-updates Pin: release o=Debian,n=<%= codename %>-updates
Pin-Priority: 990 Pin-Priority: 990
<%- end -%>
<% if (use_lts=scope.lookupvar('apt::use_lts')) && (scope.lookupvar('::debian_lts') == "true") -%>
Explanation: Debian <%= codename %>-lts Explanation: Debian <%= codename %>-lts
Package: * Package: *
Pin: release o=Debian,n=<%= codename %>-lts Pin: release o=Debian,n=<%= codename %>-lts
Pin-Priority: 990 Pin-Priority: 990
<%- end -%>
Explanation: Debian <%= next_codename=scope.lookupvar('::debian_nextcodename') %> <% if (next_codename=scope.lookupvar('::debian_nextcodename')) && (next_codename != "experimental") -%>
Explanation: Debian <%= next_codename %>
Package: * Package: *
Pin: release o=Debian,n=<%= next_codename %> Pin: release o=Debian,n=<%= next_codename %>
Pin-Priority: 2 Pin-Priority: 2
<%- end -%>
Explanation: Debian sid
Package: *
Pin: release o=Debian,n=sid
Pin-Priority: 1
Explanation: Debian fallback Explanation: Debian fallback
Package: * Package: *
Pin: release o=Debian Pin: release o=Debian
Pin-Priority: -10 Pin-Priority: -10

14
templates/Debian/preferences_jessie.erb
View file

@ -1,14 +0,0 @@
Explanation: Debian <%= codename=scope.lookupvar('::debian_codename') %>
Package: *
Pin: release o=Debian,n=<%= codename %>
Pin-Priority: 990
Explanation: Debian sid
Package: *
Pin: release o=Debian,n=sid
Pin-Priority: 1
Explanation: Debian fallback
Package: *
Pin: release o=Debian
Pin-Priority: -10

10
templates/Debian/preferences_sid.erb
View file

@ -1,10 +0,0 @@
Explanation: Debian sid
Package: *
Pin: release o=Debian,n=sid
Pin-Priority: 990
Explanation: Debian fallback
Package: *
Pin: release o=Debian
Pin-Priority: -10

20
templates/Debian/preferences_wheezy.erb
View file

@ -1,20 +0,0 @@
Explanation: Debian <%= codename=scope.lookupvar('::debian_codename') %>
Package: *
Pin: release o=Debian,n=<%= codename %>
Pin-Priority: 990
Explanation: Debian <%= codename %>-updates
Package: *
Pin: release o=Debian,n=<%= codename %>-updates
Pin-Priority: 990
Explanation: Debian sid
Package: *
Pin: release o=Debian,n=sid
Pin-Priority: 1
Explanation: Debian fallback
Package: *
Pin: release o=Debian
Pin-Priority: -10