diff options
| author | varac <varacanero@zeromail.org> | 2015-02-10 10:17:20 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-02-10 10:17:20 +0100 |
| commit | 607627c9cf1f64b87637a8cc3ca22b5a4d34b30a (patch) | |
| tree | f5c94f95da1da0e065af14d143154c5a0e283dbe /provisioning/modules/pixelated | |
| parent | e8a0a7e0c7fcbc4d6a0fb0f846888121a246de71 (diff) | |
moved wheezy-backports sources to dedicated file, see #278
Diffstat (limited to 'provisioning/modules/pixelated')
3 files changed, 13 insertions, 6 deletions
diff --git a/provisioning/modules/pixelated/files/apt/pixelated.list b/provisioning/modules/pixelated/files/apt/pixelated.list index 1db316c2..e5aa0aee 100644 --- a/provisioning/modules/pixelated/files/apt/pixelated.list +++ b/provisioning/modules/pixelated/files/apt/pixelated.list @@ -1,5 +1,3 @@ deb http://packages.pixelated-project.org/debian wheezy-snapshots main deb http://packages.pixelated-project.org/debian wheezy-backports main deb http://packages.pixelated-project.org/debian wheezy main -deb http://http.us.debian.org/debian wheezy-backports main -deb-src http://http.us.debian.org/debian wheezy-backports main diff --git a/provisioning/modules/pixelated/files/apt/wheezy-backports.list b/provisioning/modules/pixelated/files/apt/wheezy-backports.list new file mode 100644 index 00000000..ee422fae --- /dev/null +++ b/provisioning/modules/pixelated/files/apt/wheezy-backports.list @@ -0,0 +1,2 @@ +deb http://http.debian.net/debian wheezy-backports main +deb-src http://http.debian.net/debian wheezy-backports main diff --git a/provisioning/modules/pixelated/manifests/apt.pp b/provisioning/modules/pixelated/manifests/apt.pp index 4519fb21..793518fd 100644 --- a/provisioning/modules/pixelated/manifests/apt.pp +++ b/provisioning/modules/pixelated/manifests/apt.pp @@ -1,9 +1,16 @@ # add the pixelated sources needed to install everything class pixelated::apt { + # wheezy backports + file { '/etc/apt/sources.list.d/wheezy-backports.list': + source => 'puppet:///modules/pixelated/apt/wheezy-backports.list', + owner => 'root', + notify => Exec['apt_get_update'], + } + # pixelated repo file { '/etc/apt/sources.list.d/pixelated.list': - source => 'puppet:///modules/pixelated/apt/pixelated.list', + source => 'puppet:///modules/pixelated/apt/pixelated.list', owner => 'root', require => Exec['add_pixelated_key'], notify => Exec['apt_get_update'], @@ -12,7 +19,7 @@ class pixelated::apt { file { '/etc/apt/preferences.d/pixelated': source => 'puppet:///modules/pixelated/apt/pixelated-preferences', owner => 'root', - notify => Exec['apt_get_update'], + notify => Exec['apt_get_update'], } file { '/tmp/0x287A1542472DC0E3_packages@pixelated-project.org.asc': @@ -29,7 +36,7 @@ class pixelated::apt { # leap repo file { '/etc/apt/sources.list.d/leap.list': - content => "deb http://deb.leap.se/0.6 wheezy main", + content => 'deb http://deb.leap.se/0.6 wheezy main', owner => 'root', require => Exec['add_leap_key'], notify => Exec['apt_get_update'], @@ -50,7 +57,7 @@ class pixelated::apt { require => Exec['apt_get_update'] } - exec { "apt_get_update": + exec { 'apt_get_update': command => '/usr/bin/apt-get -y update', refreshonly => true, } |