tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

apt: Syntax cleanup

Browse source
This commit is contained in:
Ossi Salmi 2013-10-29 19:28:15 +02:00
parent f8f5b373dc
commit 5c77e2fda6
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
apt/manifests/init.pp
View file

@ -3,8 +3,8 @@ class apt {
file { "/var/cache/apt/local-archives": file { "/var/cache/apt/local-archives":
ensure => directory, ensure => directory,
mode => "0755", mode => "0755",
owner => root, owner => "root",
group => root, group => "root",
} }
exec { "apt-get-update": exec { "apt-get-update":
@ -16,7 +16,7 @@ class apt {
} }
# Install common packages for using PPA's. # Install common packages for using PPAs.
# #
class apt::ppa::helper { class apt::ppa::helper {
@ -66,7 +66,7 @@ define apt::ppa($ensure = "present") {
} }
} }
default: { default: {
fail("test") fail("apt::ppa: Invalid value ${ensure} for ensure.")
} }
} }
@ -135,8 +135,8 @@ class apt::cacher {
source => [ "puppet:///files/apt/apt-cacher.conf", source => [ "puppet:///files/apt/apt-cacher.conf",
"puppet:///modules/apt/apt-cacher.conf", ], "puppet:///modules/apt/apt-cacher.conf", ],
mode => "0644", mode => "0644",
owner => root, owner => "root",
group => root, group => "root",
notify => Service["apt-cacher"], notify => Service["apt-cacher"],
} }
@ -148,6 +148,7 @@ class apt::cacher {
} }
# Mirroring tool for apt repositories # Mirroring tool for apt repositories
# #
# === Global variables # === Global variables
@ -189,8 +190,8 @@ class apt::mirror {
}, },
content => template("apt/mirror.list.erb"), content => template("apt/mirror.list.erb"),
mode => "0644", mode => "0644",
owner => root, owner => "root",
group => root, group => "root",
require => Package["apt-mirror"], require => Package["apt-mirror"],
} }
@ -228,8 +229,8 @@ define apt::package($ensure, $source) {
}, },
source => $source, source => $source,
mode => "0644", mode => "0644",
owner => root, owner => "root",
group => root, group => "root",
require => File["/var/cache/apt/local-archives"], require => File["/var/cache/apt/local-archives"],
} }
@ -316,8 +317,8 @@ define apt::repo($ensure, $source, $dist="", $components="main",
file { "/etc/apt/sources.list.d/${name}.list": file { "/etc/apt/sources.list.d/${name}.list":
ensure => $ensure, ensure => $ensure,
mode => "0644", mode => "0644",
owner => root, owner => "root",
group => root, group => "root",
content => $content, content => $content,
notify => Exec["apt-get-update"], notify => Exec["apt-get-update"],
} }
@ -349,8 +350,8 @@ define apt::repo($ensure, $source, $dist="", $components="main",
file { "/etc/apt/preferences.d/${name}.pref": file { "/etc/apt/preferences.d/${name}.pref":
ensure => $ensure, ensure => $ensure,
mode => "0644", mode => "0644",
owner => root, owner => "root",
group => root, group => "root",
content => $label ? { content => $label ? {
"" => "Package: *\nPin: origin ${origin}\nPin-Priority: ${priority}\n", "" => "Package: *\nPin: origin ${origin}\nPin-Priority: ${priority}\n",
default => "Package: *\nPin: release l=${label}\nPin-Priority: ${priority}\n", default => "Package: *\nPin: release l=${label}\nPin-Priority: ${priority}\n",