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

Merge branch 'master' into 'master'

Browse source 
Merge with cmaisonnneuve and immerda

See merge request !4
This commit is contained in:
intrigeri 2015-02-28 12:34:54 +00:00
commit 31f8661eea
11 changed files with 70 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
files/Debian/50unattended-upgrades
View file

@ -1,10 +1,8 @@
// this file is managed by puppet !
Unattended-Upgrade::Origins-Pattern {
// "o=Debian,n=${distro-codename}";
// "o=Debian,n=${distro-codename}-updates";
// "o=Debian,n=${distro_codename}-proposed-updates";
"o=Debian,n=${distro_codename},l=Debian-Security";
"o=Debian,a=oldstable,l=Debian-Security";
"o=Debian,a=stable,l=Debian-Security";
}
APT::Periodic::Update-Package-Lists "1";

4
files/Debian/50unattended-upgrades.squeeze
View file

@ -3,8 +3,8 @@
Unattended-Upgrade::Allowed-Origins {
// "${distro-id} oldstable";
// "${distro_id} ${distro_codename}-backports";
"${distro-id} ${distro-codename}-security";
"${distro-id} ${distro-codename}-lts";
"${distro_id} ${distro_codename}-security";
"${distro_id} ${distro_codename}-lts";
};
APT::Periodic::Update-Package-Lists "1";

9
manifests/dselect.pp
View file

@ -1,9 +1,10 @@
# manage dselect, like
# suppressing the annoying help texts
class apt::dselect {
# suppress annoying help texts of dselect
line { 'dselect_expert':
file => '/etc/dpkg/dselect.cfg',
line => 'expert',
file_line { 'dselect_expert':
path => '/etc/dpkg/dselect.cfg',
line => 'expert',
}
package { 'dselect': ensure => installed }

3
manifests/init.pp
View file

@ -113,9 +113,8 @@ class apt(
# backports uses the normal archive key now
package { 'debian-backports-keyring': ensure => absent }
include common::moduledir
common::module_dir { 'apt': }
$apt_base_dir = "${common::moduledir::module_dir_path}/apt"
modules_dir { 'apt': }
if $custom_key_dir {
file { "${apt_base_dir}/keys.d":

2
templates/20proxy.erb
View file

@ -1,5 +1,5 @@
// This file is managed by Puppet
// all local modifications will be overwritten
Acquire::http { Proxy "<%= proxy %>:<%= port %>"; };
Acquire::http { Proxy "<%= @proxy %>:<%= @port %>"; };
Acquire::HTTP::Proxy::bugs.debian.org "DIRECT";

18
templates/Debian/apticron_lenny.erb
View file

@ -24,9 +24,9 @@ LISTCHANGES_PROFILE="<%= scope.lookupvar('apt::apticron::listchanges_profile') %
# of "hostname -f" for the system name in the mails it generates
#
# SYSTEM="foobar.example.com"
<%- unless scope.lookupvar('apt::apticron::system').to_s == "false" -%>
<%= "SYSTEM=\"#{scope.lookupvar('apt::apticron::system')}\"" %>
<%- end -%>
<% unless (v=scope.lookupvar('apt::apticron::system')).to_s == "false" -%>
SYSTEM="<%= v %>"
<% end -%>
#
# Set IPADDRESSNUM if you would like to configure the maximal number of IP
@ -34,9 +34,9 @@ LISTCHANGES_PROFILE="<%= scope.lookupvar('apt::apticron::listchanges_profile') %
# family type (inet, inet6), if available.
#
# IPADDRESSNUM="1"
<%- unless scope.lookupvar('apt::apticron::ipaddressnum').to_s == "false" -%>
<%= "IPADDRESSNUM=\"#{scope.lookupvar('apt::apticron::ipaddressnum')}\"" %>
<%- end -%>
<% unless (v=scope.lookupvar('apt::apticron::ipaddressnum')).to_s == "false" -%>
IPADDRESSNUM="<%= v %>"
<% end -%>
#
# Set IPADDRESSES to a whitespace seperated list of reachable addresses for
@ -44,7 +44,7 @@ LISTCHANGES_PROFILE="<%= scope.lookupvar('apt::apticron::listchanges_profile') %
# "ip" command
#
# IPADDRESSES="192.0.2.1 2001:db8:1:2:3::1"
<%- unless scope.lookupvar('apt::apticron::ipaddresses').to_s == "false" -%>
<%= "IPADDRESSES=\"#{scope.lookupvar('apt::apticron::ipaddresses')}\"" %>
<%- end -%>
<% unless (v=scope.lookupvar('apt::apticron::ipaddresses')).to_s == "false" -%>
IPADDRESSES="<%= v %>"
<% end -%>

18
templates/Debian/apticron_squeeze.erb
View file

@ -26,9 +26,9 @@ LISTCHANGES_PROFILE="<%= scope.lookupvar('apt::apticron::listchanges_profile') %
# of "hostname -f" for the system name in the mails it generates
#
# SYSTEM="foobar.example.com"
<%- unless scope.lookupvar('apt::apticron::system').to_s == "false" -%>
<%= "SYSTEM=\"#{scope.lookupvar('apt::apticron::system')}\"" %>
<%- end -%>
<% unless (v=scope.lookupvar('apt::apticron::system')).to_s == "false" -%>
SYSTEM="<%= v %>"
<% end -%>
#
@ -37,9 +37,9 @@ LISTCHANGES_PROFILE="<%= scope.lookupvar('apt::apticron::listchanges_profile') %
# family type (inet, inet6), if available.
#
# IPADDRESSNUM="1"
<%- unless scope.lookupvar('apt::apticron::ipaddressnum').to_s == "false" -%>
<%= "IPADDRESSNUM=\"#{scope.lookupvar('apt::apticron::ipaddressnum')}\"" %>
<%- end -%>
<% unless (v=scope.lookupvar('apt::apticron::ipaddressnum')).to_s == "false" -%>
IPADDRESSNUM="<%= v %>"
<% end -%>
#
@ -48,9 +48,9 @@ LISTCHANGES_PROFILE="<%= scope.lookupvar('apt::apticron::listchanges_profile') %
# "ip" command
#
# IPADDRESSES="192.0.2.1 2001:db8:1:2:3::1"
<%- unless scope.lookupvar('apt::apticron::ipaddresses').to_s == "false" -%>
<%= "IPADDRESSES=\"#{scope.lookupvar('apt::apticron::ipaddresses')}\"" %>
<%- end -%>
<% unless (v=scope.lookupvar('apt::apticron::ipaddresses')).to_s == "false" -%>
IPADDRESSES="<%= v %>"
<% end -%>
#

18
templates/Debian/apticron_wheezy.erb
View file

@ -25,9 +25,9 @@ LISTCHANGES_PROFILE="<%= scope.lookupvar('apt::apticron::listchanges_profile') %
# of "hostname -f" for the system name in the mails it generates
#
# SYSTEM="foobar.example.com"
<%- unless scope.lookupvar('apt::apticron::system').to_s == "false" -%>
<%= "SYSTEM=\"#{scope.lookupvar('apt::apticron::system')}\"" %>
<%- end -%>
<% unless (v=scope.lookupvar('apt::apticron::system')).to_s == "false" -%>
SYSTEM="<%= v %>"
<% end -%>
#
# Set IPADDRESSNUM if you would like to configure the maximal number of IP
@ -35,9 +35,9 @@ LISTCHANGES_PROFILE="<%= scope.lookupvar('apt::apticron::listchanges_profile') %
# family type (inet, inet6), if available.
#
# IPADDRESSNUM="1"
<%- unless scope.lookupvar('apt::apticron::ipaddressnum').to_s == "false" -%>
<%= "IPADDRESSNUM=\"#{scope.lookupvar('apt::apticron::ipaddressnum')}\"" %>
<%- end -%>
<% unless (v=scope.lookupvar('apt::apticron::ipaddressnum')).to_s == "false" -%>
IPADDRESSNUM="<%= v %>"
<% end -%>
#
# Set IPADDRESSES to a whitespace separated list of reachable addresses for
@ -45,9 +45,9 @@ LISTCHANGES_PROFILE="<%= scope.lookupvar('apt::apticron::listchanges_profile') %
# "ip" command
#
# IPADDRESSES="192.0.2.1 2001:db8:1:2:3::1"
<%- unless scope.lookupvar('apt::apticron::ipaddresses').to_s == "false" -%>
<%= "IPADDRESSES=\"#{scope.lookupvar('apt::apticron::ipaddresses')}\"" %>
<%- end -%>
<% unless (v=scope.lookupvar('apt::apticron::ipaddresses')).to_s == "false" -%>
IPADDRESSES=<%= v %>"
<% end -%>
#
# Set NOTIFY_HOLDS="0" if you don't want to be notified about new versions of

52
templates/Debian/sources.list.erb
View file

@ -5,14 +5,14 @@
# basic
deb <%= debian_url=scope.lookupvar('apt::debian_url') %> <%= codename %> <%= lrepos=scope.lookupvar('apt::real_repos') %>
<% if scope.lookupvar('apt::include_src') -%>
<% if include_src=scope.lookupvar('apt::include_src') -%>
deb-src <%= debian_url %> <%= codename %> <%= lrepos %>
<% end -%>
# security
<% if ((release=scope.lookupvar('apt::release')) == "stable" || release == "oldstable") -%>
deb <%= security_url=scope.lookupvar('apt::security_url') %> <%= codename %>/updates <%= lrepos %>
<% if include_src -%>
<% if include_src -%>
deb-src <%= security_url %> <%= codename %>/updates <%= lrepos %>
<% end -%>
<% else -%>
@ -24,22 +24,22 @@ deb-src <%= security_url %> <%= codename %>/updates <%= lrepos %>
# There is no backports archive for <%= release %>
<% else -%>
deb <%= backports_url=scope.lookupvar('apt::backports_url') %> <%= codename %>-backports <%= lrepos %>
<% if include_src -%>
<% if include_src -%>
deb-src <%= backports_url %> <%= codename %>-backports <%= lrepos %>
<% end -%>
<% end -%>
<% end
end -%>
<% if use_volatile=scope.lookupvar('apt::use_volatile') -%>
# volatile
<% if (release == "testing" || release == "unstable" || release == "experimental") -%>
<% if (release == "testing" || release == "unstable" || release == "experimental") -%>
# There is no volatile archive for <%= release %>
<% else -%>
<% else -%>
deb <%= debian_url %> <%= codename %>-updates <%= lrepos %>
<% if include_src -%>
<% if include_src -%>
deb-src <%= debian_url %> <%= codename %>-updates <%= lrepos %>
<% end -%>
<% end -%>
<% end -%>
<% end
end
end -%>
<% if use_lts=scope.lookupvar('apt::use_lts') -%>
# LTS
@ -58,29 +58,29 @@ deb-src <%= debian_url %> <%= codename %>-lts <%= lrepos %>
# basic
deb <%= debian_url %> <%= next_codename %> <%= lrepos %>
<% if include_src then -%>
<% if include_src -%>
deb-src <%= debian_url %> <%= next_codename %> <%= lrepos %>
<% end -%>
<% end -%>
# security
<% if (next_release == "unstable" || next_release == "experimental") -%>
<% if (next_release == "unstable" || next_release == "experimental") -%>
# There is no security support for <%= next_release %>
<% else -%>
<% else -%>
deb <%= security_url %> <%= next_codename %>/updates <%= lrepos %>
<% if include_src then -%>
<% if include_src then -%>
deb-src <%= security_url %> <%= next_codename %>/updates <%= lrepos %>
<% end -%>
<% end -%>
<% end
end -%>
<% if use_volatile -%>
<% if use_volatile -%>
# volatile
<% if (next_release == "testing" || next_release == "unstable" || next_release == "experimental") -%>
<% if (next_release == "testing" || next_release == "unstable" || next_release == "experimental") -%>
# There is no volatile archive for <%= next_release %>
<% else -%>
<% else -%>
deb <%= debian_url %> <%= next_codename %>-updates <%= lrepos %>
<% if include_src then -%>
<% if include_src -%>
deb-src <%= debian_url %> <%= next_codename %>-updates <%= lrepos %>
<% end -%>
<% end -%>
<% end -%>
<% end -%>
<% end
end
end
end -%>

6
templates/preferences_snippet.erb
View file

@ -1,4 +1,4 @@
Package: <%= real_package %>
Pin: <%= pin %>
Pin-Priority: <%= priority %>
Package: <%= @real_package %>
Pin: <%= @pin %>
Pin-Priority: <%= @priority %>

6
templates/preferences_snippet_release.erb
View file

@ -1,4 +1,4 @@
Package: <%= real_package %>
Pin: release a=<%= release %>
Pin-Priority: <%= priority %>
Package: <%= @real_package %>
Pin: release a=<%= @release %>
Pin-Priority: <%= @priority %>