summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/config.pp91
-rw-r--r--manifests/init.pp109
-rw-r--r--manifests/install.pp11
3 files changed, 108 insertions, 103 deletions
diff --git a/manifests/config.pp b/manifests/config.pp
new file mode 100644
index 0000000..3db84d7
--- /dev/null
+++ b/manifests/config.pp
@@ -0,0 +1,91 @@
+class apt::config inherits apt {
+
+ $sources_content = $custom_sources_list ? {
+ '' => template( "apt/${::operatingsystem}/sources.list.erb"),
+ default => $custom_sources_list
+ }
+ file {
+ # include main and security
+ # additional sources should be included via the apt::sources_list define
+ '/etc/apt/sources.list':
+ content => $sources_content,
+ notify => Exec['apt_updated'],
+ owner => root,
+ group => 0,
+ mode => '0644';
+ }
+
+ # workaround for preseeded_package component
+ file {
+ [ '/var/cache',
+ '/var/cache/local',
+ '/var/cache/local/preseeding' ]:
+ ensure => directory;
+ }
+
+ ::apt::apt_conf { '02show_upgraded':
+ source => [ "puppet:///modules/site_apt/${::fqdn}/02show_upgraded",
+ 'puppet:///modules/site_apt/02show_upgraded',
+ 'puppet:///modules/apt/02show_upgraded' ]
+ }
+
+ if ( $::virtual == 'vserver' ) {
+ ::apt::apt_conf { '03clean_vserver':
+ source => [ "puppet:///modules/site_apt/${::fqdn}/03clean_vserver",
+ 'puppet:///modules/site_apt/03clean_vserver',
+ 'puppet:///modules/apt/03clean_vserver' ],
+ alias => '03clean';
+ }
+ }
+ else {
+ ::apt::apt_conf { '03clean':
+ source => [ "puppet:///modules/site_apt/${::fqdn}/03clean",
+ 'puppet:///modules/site_apt/03clean',
+ 'puppet:///modules/apt/03clean' ]
+ }
+ }
+
+ if ($use_backports and !($::debian_release in ['testing', 'unstable', 'experimental'])) {
+ apt::sources_list {
+ 'backports':
+ content => "deb ${debian_url} ${::debian_codename}-backports ${apt::repos}",
+ }
+ if $include_src {
+ apt::sources_list {
+ 'backports-src':
+ content => "deb-src ${debian_url} ${::debian_codename}-backports ${apt::repos}",
+ }
+ }
+ }
+
+ if $custom_key_dir {
+ file { "${apt_base_dir}/keys.d":
+ source => $custom_key_dir,
+ recurse => true,
+ owner => root,
+ group => root,
+ mode => '0755',
+ }
+ exec { 'custom_keys':
+ command => "find ${apt_base_dir}/keys.d -type f -exec apt-key add '{}' \\;",
+ subscribe => File["${apt_base_dir}/keys.d"],
+ refreshonly => true,
+ notify => Exec[refresh_apt]
+ }
+ if $custom_preferences != false {
+ Exec['custom_keys'] {
+ before => File['apt_config']
+ }
+ }
+ }
+
+ exec { 'update_apt':
+ command => '/usr/bin/apt-get update',
+ require => [ File['/etc/apt/apt.conf.d',
+ '/etc/apt/preferences',
+ '/etc/apt/sources.list'] ],
+ refreshonly => true,
+ # Another Semaphor for all packages to reference
+ alias => [ 'apt_updated', 'refresh_apt']
+ }
+}
diff --git a/manifests/init.pp b/manifests/init.pp
index 196c0c7..26afaeb 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -20,47 +20,13 @@ class apt (
$custom_key_dir = $apt::params::custom_key_dir,
) inherits apt::params {
- package { 'apt':
- ensure => installed,
- require => undef,
- }
-
- $sources_content = $custom_sources_list ? {
- '' => template( "apt/${::operatingsystem}/sources.list.erb"),
- default => $custom_sources_list
- }
- file {
- # include main and security
- # additional sources should be included via the apt::sources_list define
- '/etc/apt/sources.list':
- content => $sources_content,
- notify => Exec['apt_updated'],
- owner => root,
- group => 0,
- mode => '0644';
- }
-
- ::apt::apt_conf { '02show_upgraded':
- source => [ "puppet:///modules/site_apt/${::fqdn}/02show_upgraded",
- 'puppet:///modules/site_apt/02show_upgraded',
- 'puppet:///modules/apt/02show_upgraded' ]
- }
+ include apt::dot_d_directories
+ include apt::config
+ include apt::install
- if ( $::virtual == 'vserver' ) {
- ::apt::apt_conf { '03clean_vserver':
- source => [ "puppet:///modules/site_apt/${::fqdn}/03clean_vserver",
- 'puppet:///modules/site_apt/03clean_vserver',
- 'puppet:///modules/apt/03clean_vserver' ],
- alias => '03clean';
- }
- }
- else {
- ::apt::apt_conf { '03clean':
- source => [ "puppet:///modules/site_apt/${::fqdn}/03clean",
- 'puppet:///modules/site_apt/03clean',
- 'puppet:///modules/apt/03clean' ]
- }
- }
+ include common::moduledir
+ common::module_dir { 'apt': }
+ $apt_base_dir = "${common::moduledir::module_dir_path}/apt"
case $custom_preferences {
false: {
@@ -70,67 +36,4 @@ class apt (
include apt::preferences
}
}
-
- include apt::dot_d_directories
-
- ## This package should really always be current
- package { 'debian-archive-keyring':
- ensure => latest
- }
-
- if ($use_backports and !($::debian_release in ['testing', 'unstable', 'experimental'])) {
- apt::sources_list {
- 'backports':
- content => "deb ${debian_url} ${::debian_codename}-backports ${apt::repos}",
- }
- if $include_src {
- apt::sources_list {
- 'backports-src':
- content => "deb-src ${debian_url} ${::debian_codename}-backports ${apt::repos}",
- }
- }
- }
-
- include common::moduledir
- common::module_dir { 'apt': }
- $apt_base_dir = "${common::moduledir::module_dir_path}/apt"
-
- if $custom_key_dir {
- file { "${apt_base_dir}/keys.d":
- source => $custom_key_dir,
- recurse => true,
- owner => root,
- group => root,
- mode => '0755',
- }
- exec { 'custom_keys':
- command => "find ${apt_base_dir}/keys.d -type f -exec apt-key add '{}' \\;",
- subscribe => File["${apt_base_dir}/keys.d"],
- refreshonly => true,
- notify => Exec[refresh_apt]
- }
- if $custom_preferences != false {
- Exec['custom_keys'] {
- before => File['apt_config']
- }
- }
- }
-
- # workaround for preseeded_package component
- file {
- [ '/var/cache',
- '/var/cache/local',
- '/var/cache/local/preseeding' ]:
- ensure => directory;
- }
-
- exec { 'update_apt':
- command => '/usr/bin/apt-get update',
- require => [ File['/etc/apt/apt.conf.d',
- '/etc/apt/preferences',
- '/etc/apt/sources.list'] ],
- refreshonly => true,
- # Another Semaphor for all packages to reference
- alias => [ 'apt_updated', 'refresh_apt']
- }
}
diff --git a/manifests/install.pp b/manifests/install.pp
new file mode 100644
index 0000000..5f33d11
--- /dev/null
+++ b/manifests/install.pp
@@ -0,0 +1,11 @@
+class apt::install {
+
+ package { 'apt':
+ ensure => present,
+ }
+
+ # This package should really always be current
+ package { 'debian-archive-keyring':
+ ensure => latest;
+ }
+}