reformatted whitespace to match recommended style

of 2 space indentation.
This commit is contained in:
Dan Bode 2011-05-30 10:24:06 -07:00
parent 27ebdfc57f
commit 77d2b0dd05
8 changed files with 108 additions and 107 deletions

View file

@ -29,19 +29,19 @@ class apt(
package { "python-software-properties": } package { "python-software-properties": }
file { "sources.list": file { "sources.list":
name => "${apt::params::root}/sources.list",
ensure => present, ensure => present,
owner => root, owner => root,
group => root, group => root,
mode => 644, mode => 644,
} }
name => "${apt::params::root}/sources.list",
file { "sources.list.d": file { "sources.list.d":
name => "${apt::params::root}/sources.list.d",
ensure => directory, ensure => directory,
owner => root, owner => root,
group => root, group => root,
} }
name => "${apt::params::root}/sources.list.d",
exec { "apt_update": exec { "apt_update":
command => "${apt::params::provider} update", command => "${apt::params::provider} update",

View file

@ -6,14 +6,14 @@ define apt::pin(
$priority = 0 $priority = 0
) { ) {
include apt::params
file { "${name}.pref": file { "${name}.pref":
name => "${apt::params::root}/preferences.d/${name}",
ensure => file, ensure => file,
owner => root, owner => root,
group => root, group => root,
mode => 644, mode => 644,
content => "# ${name}\nPackage: ${packages}\nPin: release a=${name}\nPin-Priority: ${priority}", content => "# ${name}\nPackage: ${packages}\nPin: release a=${name}\nPin-Priority: ${priority}",
} }
include apt::params
name => "${apt::params::root}/preferences.d/${name}",
} }

View file

@ -4,12 +4,12 @@ class apt::release (
$release_id $release_id
) { ) {
owner => root,
group => root,
mode => 644,
}
include apt::params include apt::params
file { "${apt::params::root}/apt.conf.d/01release": file { "${apt::params::root}/apt.conf.d/01release":
owner => root,
group => root,
mode => 644,
content => "APT::Default-Release \"${release_id}\";" content => "APT::Default-Release \"${release_id}\";"
} }
}

View file

@ -12,7 +12,11 @@ define apt::source(
$pin = false $pin = false
) { ) {
include apt::params
file { "${name}.list": file { "${name}.list":
name => "${apt::params::root}/sources.list.d/${name}.list",
ensure => file, ensure => file,
owner => root, owner => root,
group => root, group => root,
@ -25,11 +29,13 @@ define apt::source(
} }
exec { "${name} apt update": exec { "${name} apt update":
command => "${apt::params::provider} update",
subscribe => File["${name}.list"], subscribe => File["${name}.list"],
refreshonly => true, refreshonly => true,
} }
if $required_packages != false { if $required_packages != false {
exec { "${apt::params::provider} -y install ${required_packages}":
subscribe => File["${name}.list"], subscribe => File["${name}.list"],
refreshonly => true, refreshonly => true,
} }
@ -41,9 +47,4 @@ define apt::source(
before => File["${name}.list"], before => File["${name}.list"],
} }
} }
include apt::params
name => "${apt::params::root}/sources.list.d/${name}.list",
command => "${apt::params::provider} update",
exec { "${apt::params::provider} -y install ${required_packages}":
} }