--- /dev/null
+[submodule "spec/fixtures/modules/stdlib"]
+ path = spec/fixtures/modules/stdlib
+ url = https://github.com/puppetlabs/puppetlabs-stdlib.git
require 'rake'
+require 'puppet-lint/tasks/puppet-lint'
task :default => [:spec]
Class['apt'] -> Apt::Builddep[$name]
exec { "apt-update-${name}":
- command => "/usr/bin/apt-get update",
+ command => '/usr/bin/apt-get update',
refreshonly => true,
}
# debian-keyring
# debian-archive-keyring
- apt::source { "debian_testing":
- location => "http://debian.mirror.iweb.ca/debian/",
- release => "testing",
- repos => "main contrib non-free",
- required_packages => "debian-keyring debian-archive-keyring",
- key => "55BE302B",
- key_server => "subkeys.pgp.net",
- pin => "-10"
+ apt::source { 'debian_testing':
+ location => 'http://debian.mirror.iweb.ca/debian/',
+ release => 'testing',
+ repos => 'main contrib non-free',
+ required_packages => 'debian-keyring debian-archive-keyring',
+ key => '55BE302B',
+ key_server => 'subkeys.pgp.net',
+ pin => '-10',
}
}
class apt::debian::unstable {
- # deb http://debian.mirror.iweb.ca/debian/ unstable main contrib non-free
- # deb-src http://debian.mirror.iweb.ca/debian/ unstable main contrib non-free
- # Key: 55BE302B Server: subkeys.pgp.net
- # debian-keyring
- # debian-archive-keyring
+ # deb http://debian.mirror.iweb.ca/debian/ unstable main contrib non-free
+ # deb-src http://debian.mirror.iweb.ca/debian/ unstable main contrib non-free
+ # Key: 55BE302B Server: subkeys.pgp.net
+ # debian-keyring
+ # debian-archive-keyring
- apt::source { "debian_unstable":
- location => "http://debian.mirror.iweb.ca/debian/",
- release => "unstable",
- repos => "main contrib non-free",
- required_packages => "debian-keyring debian-archive-keyring",
- key => "55BE302B",
- key_server => "subkeys.pgp.net",
- pin => "-10"
- }
+ apt::source { 'debian_unstable':
+ location => 'http://debian.mirror.iweb.ca/debian/',
+ release => 'unstable',
+ repos => 'main contrib non-free',
+ required_packages => 'debian-keyring debian-archive-keyring',
+ key => '55BE302B',
+ key_server => 'subkeys.pgp.net',
+ pin => '-10',
+ }
}
) {
$version_string = $version ? {
- false => undef,
+ false => undef,
default => "=${version}",
}
+ $install_check = $version ? {
+ false => "/usr/bin/dpkg -s ${name} | grep -q 'Status: install'",
+ default => "/usr/bin/dpkg -s ${name} | grep -q 'Version: ${version}'",
+ }
exec { "/usr/bin/aptitude -y -t ${release} install ${name}${version_string}":
- unless => $version ? {
- false => "/usr/bin/dpkg -s ${name} | grep -q 'Status: install'",
- default => "/usr/bin/dpkg -s ${name} | grep -q 'Version: ${version}'"
- }
+ unless => $install_check,
}
}
validate_bool($purge_sources_list, $purge_sources_list_d)
$refresh_only_apt_update = $always_apt_update? {
- true => false,
- false => true
+ true => false,
+ false => true,
}
- if ! defined(Package["python-software-properties"]) {
- package { "python-software-properties": }
+ if ! defined(Package['python-software-properties']) {
+ package { 'python-software-properties': }
}
- file { "sources.list":
- path => "${apt::params::root}/sources.list",
- ensure => present,
- owner => root,
- group => root,
- mode => 644,
- content => $purge_sources_list ? {
- false => undef,
- true => "# Repos managed by puppet.\n",
- },
+ $sources_list_content = $purge_sources_list ? {
+ false => undef,
+ true => "# Repos managed by puppet.\n",
+ }
+ file { 'sources.list':
+ ensure => present,
+ path => "${apt::params::root}/sources.list",
+ owner => root,
+ group => root,
+ mode => '0644',
+ content => $sources_list_content,
}
- file { "sources.list.d":
- path => "${apt::params::root}/sources.list.d",
- ensure => directory,
- owner => root,
- group => root,
- purge => $purge_sources_list_d,
+ file { 'sources.list.d':
+ ensure => directory,
+ path => "${apt::params::root}/sources.list.d",
+ owner => root,
+ group => root,
+ purge => $purge_sources_list_d,
recurse => $purge_sources_list_d,
}
- exec { "apt_update":
- command => "${apt::params::provider} update",
- subscribe => [ File["sources.list"], File["sources.list.d"] ],
+ exec { 'apt_update':
+ command => "${apt::params::provider} update",
+ subscribe => [ File['sources.list'], File['sources.list.d'] ],
refreshonly => $refresh_only_apt_update,
}
case $disable_keys {
true: {
- file { "99unauth":
- content => "APT::Get::AllowUnauthenticated 1;\n",
+ file { '99unauth':
ensure => present,
- path => "/etc/apt/apt.conf.d/99unauth",
+ content => "APT::Get::AllowUnauthenticated 1;\n",
+ path => '/etc/apt/apt.conf.d/99unauth',
}
}
false: {
- file { "99unauth":
+ file { '99unauth':
ensure => absent,
- path => "/etc/apt/apt.conf.d/99unauth",
+ path => '/etc/apt/apt.conf.d/99unauth',
}
}
undef: { } # do nothing
- default: { fail("Valid values for disable_keys are true or false") }
+ default: { fail('Valid values for disable_keys are true or false') }
}
if($proxy_host) {
$ensure = present,
$key_content = false,
$key_source = false,
- $key_server = "keyserver.ubuntu.com"
+ $key_server = 'keyserver.ubuntu.com'
) {
include apt::params
$upkey = upcase($key)
if $key_content {
- $method = "content"
+ $method = 'content'
} elsif $key_source {
- $method = "source"
+ $method = 'source'
} elsif $key_server {
- $method = "server"
+ $method = 'server'
}
# This is a hash of the parts of the key definition that we care about.
case $ensure {
present: {
- anchor { "apt::key/$title":; }
+ anchor { "apt::key/${title}":; }
- if defined(Exec["apt::key $upkey absent"]) {
- fail ("Cannot ensure Apt::Key[$upkey] present; $upkey already ensured absent")
+ if defined(Exec["apt::key ${upkey} absent"]) {
+ fail("Cannot ensure Apt::Key[${upkey}] present; ${upkey} already ensured absent")
}
- if !defined(Anchor["apt::key $upkey present"]) {
- anchor { "apt::key $upkey present":; }
+ if !defined(Anchor["apt::key ${upkey} present"]) {
+ anchor { "apt::key ${upkey} present":; }
}
if !defined(Exec[$digest]) {
+ $digest_command = $method ? {
+ 'content' => "echo '${key_content}' | /usr/bin/apt-key add -",
+ 'source' => "wget -q '${key_source}' -O- | apt-key add -",
+ 'server' => "apt-key adv --keyserver '${key_server}' --recv-keys '${upkey}'",
+ }
exec { $digest:
- path => "/bin:/usr/bin",
+ path => '/bin:/usr/bin',
unless => "/usr/bin/apt-key list | /bin/grep '${upkey}'",
- before => Anchor["apt::key $upkey present"],
- command => $method ? {
- "content" => "echo '${key_content}' | /usr/bin/apt-key add -",
- "source" => "wget -q '${key_source}' -O- | apt-key add -",
- "server" => "apt-key adv --keyserver '${key_server}' --recv-keys '${upkey}'",
- };
+ before => Anchor["apt::key ${upkey} present"],
+ command => $digest_command,
}
}
}
absent: {
- if defined(Anchor["apt::key $upkey present"]) {
- fail ("Cannot ensure Apt::Key[$upkey] absent; $upkey already ensured present")
+ if defined(Anchor["apt::key ${upkey} present"]) {
+ fail("Cannot ensure Apt::Key[${upkey}] absent; ${upkey} already ensured present")
}
- exec { "apt::key $upkey absent":
- path => "/bin:/usr/bin",
- onlyif => "apt-key list | grep '$upkey'",
- command => "apt-key del '$upkey'",
- user => "root",
- group => "root",
+ exec { "apt::key ${upkey} absent":
+ path => '/bin:/usr/bin',
+ onlyif => "apt-key list | grep '${upkey}'",
+ command => "apt-key del '${upkey}'",
+ user => 'root',
+ group => 'root',
}
}
default: {
- fail "Invalid 'ensure' value '$ensure' for aptkey"
+ fail "Invalid 'ensure' value '${ensure}' for aptkey"
}
}
}
include apt::params
file { "${name}.pref":
- path => "${apt::params::root}/preferences.d/${name}",
- ensure => file,
- owner => root,
- group => root,
- mode => 644,
+ ensure => file,
+ path => "${apt::params::root}/preferences.d/${name}",
+ owner => root,
+ group => root,
+ mode => '0644',
content => "# ${name}\nPackage: ${packages}\nPin: release a=${name}\nPin-Priority: ${priority}",
}
}
include apt::params
if ! $release {
- fail("lsbdistcodename fact not available: release parameter required")
+ fail('lsbdistcodename fact not available: release parameter required')
}
exec { "apt-update-${name}":
- command => "/usr/bin/aptitude update",
+ command => '/usr/bin/aptitude update',
refreshonly => true,
}
$filename_without_slashes = regsubst($name,'/','-','G')
- $filename_without_ppa = regsubst($filename_without_slashes, '^ppa:','','G')
- $sources_list_d_filename = "${filename_without_ppa}-${release}.list"
+ $filename_without_ppa = regsubst($filename_without_slashes, '^ppa:','','G')
+ $sources_list_d_filename = "${filename_without_ppa}-${release}.list"
exec { "add-apt-repository-${name}":
command => "/usr/bin/add-apt-repository ${name}",
include apt::params
file { "${apt::params::root}/apt.conf.d/01release":
- owner => root,
- group => root,
- mode => 644,
+ owner => root,
+ group => root,
+ mode => '0644',
content => "APT::Default-Release \"${release_id}\";"
}
}
include apt::params
if $release == undef {
- fail("lsbdistcodename fact not available: release parameter required")
+ fail('lsbdistcodename fact not available: release parameter required')
}
file { "${name}.list":
- path => "${apt::params::root}/sources.list.d/${name}.list",
- ensure => file,
- owner => root,
- group => root,
- mode => 644,
- content => template("apt/source.list.erb"),
+ ensure => file,
+ path => "${apt::params::root}/sources.list.d/${name}.list",
+ owner => root,
+ group => root,
+ mode => '0644',
+ content => template("${module_name}/source.list.erb"),
}
if $pin != false {
- apt::pin { "${release}": priority => "${pin}" } -> File["${name}.list"]
+ apt::pin { $release: priority => $pin } -> File["${name}.list"]
}
exec { "${name} apt update":
- command => "${apt::params::provider} update",
- subscribe => File["${name}.list"],
+ command => "${apt::params::provider} update",
+ subscribe => File["${name}.list"],
refreshonly => true,
}
if $key != false {
apt::key { "Add key: ${key} from Apt::Source ${title}":
- key => $key,
ensure => present,
+ key => $key,
key_server => $key_server,
key_content => $key_content,
key_source => $key_source,
'ensure' => "present",
'owner' => "root",
'group' => "root",
- 'mode' => 644,
+ 'mode' => "0644",
"content" => "# Repos managed by puppet.\n"
})
else
'ensure' => "present",
'owner' => "root",
'group' => "root",
- 'mode' => 644,
+ 'mode' => "0644",
'content' => nil
})
end
it {
should contain_file("/etc/apt/apt.conf.d/01release").with({
+ "mode" => "0644",
"owner" => "root",
"group" => "root",
- "mode" => 644,
"content" => "APT::Default-Release \"#{param_set[:release_id]}\";"
})
}
it { should include_class("apt::params") }
it { should contain_file("#{title}.pref").with({
+ 'ensure' => 'file',
'path' => "/etc/apt/preferences.d/#{title}",
- 'ensure' => "file",
- 'owner' => "root",
- 'group' => "root",
- 'mode' => "644",
- 'content' => "# #{title}\nPackage: #{param_hash[:packages]}\nPin: release a=#{title}\nPin-Priority: #{param_hash[:priority]}"
+ 'owner' => 'root',
+ 'group' => 'root',
+ 'mode' => '0644',
+ 'content' => "# #{title}\nPackage: #{param_hash[:packages]}\nPin: release a=#{title}\nPin-Priority: #{param_hash[:priority]}",
})
}
end
it { should contain_apt__params }
it { should contain_file("#{title}.list").with({
+ 'ensure' => 'file',
'path' => filename,
- 'ensure' => "file",
- 'owner' => "root",
- 'group' => "root",
- 'mode' => 644,
- 'content' => content
+ 'owner' => 'root',
+ 'group' => 'root',
+ 'mode' => '0644',
+ 'content' => content,
})
}
--- /dev/null
+../../../
\ No newline at end of file
--- /dev/null
+Subproject commit a70b09d5de035de5254ebe6ad6e1519a6d7cf588
-require 'puppet'
require 'rubygems'
+require 'puppet'
require 'rspec-puppet'
def param_value(subject, type, title, param)
subject.resource(type, title).send(:parameters)[param.to_sym]
end
+fixture_path = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures'))
+
RSpec.configure do |c|
- c.module_path = File.join(File.dirname(__FILE__), '../../')
+ c.module_path = File.join(fixture_path, 'modules')
+ c.manifest_dir = File.join(fixture_path, 'manifests')
end
class { 'apt': }
apt::source { 'foo':
- location => '',
- release => 'karmic',
- repos => 'main',
- include_src => true,
+ location => '',
+ release => 'karmic',
+ repos => 'main',
+ include_src => true,
required_packages => false,
- key => false,
- key_server => 'keyserver.ubuntu.com',
- pin => '600'
+ key => false,
+ key_server => 'keyserver.ubuntu.com',
+ pin => '600',
}
# test two sources with the same key
-apt::source { "debian_testing":
- location => "http://debian.mirror.iweb.ca/debian/",
- release => "testing",
- repos => "main contrib non-free",
- key => "55BE302B",
- key_server => "subkeys.pgp.net",
- pin => "-10"
+apt::source { 'debian_testing':
+ location => 'http://debian.mirror.iweb.ca/debian/',
+ release => 'testing',
+ repos => 'main contrib non-free',
+ key => '55BE302B',
+ key_server => 'subkeys.pgp.net',
+ pin => '-10',
}
-apt::source { "debian_unstable":
- location => "http://debian.mirror.iweb.ca/debian/",
- release => "unstable",
- repos => "main contrib non-free",
- key => "55BE302B",
- key_server => "subkeys.pgp.net",
- pin => "-10"
+apt::source { 'debian_unstable':
+ location => 'http://debian.mirror.iweb.ca/debian/',
+ release => 'unstable',
+ repos => 'main contrib non-free',
+ key => '55BE302B',
+ key_server => 'subkeys.pgp.net',
+ pin => '-10',
}
Code Review / puppet-modules / puppetlabs-apt.git / commitdiff