opuppet/module-apt
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Support $apt_repos for Ubuntu as well.

Browse source
This commit is contained in:
intrigeri 2010-10-17 02:01:48 +02:00
parent bcfb35c969
commit b4d6f30fae
2 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
manifests/init.pp
View file

@ -44,9 +44,19 @@ class apt {
'' => 'http://volatile.debian.org/debian-volatile/',
default => "${apt_volatile_url}",
}
$repos = $apt_repos ? {
'' => 'main contrib non-free',
default => "${apt_repos}",
case $operatingsystem {
'debian': {
$repos = $apt_repos ? {
'' => 'main contrib non-free',
default => "${apt_repos}",
}
}
'ubuntu': {
$repos = $apt_repos ? {
'' => 'main restricted universe multiverse',
default => "${apt_repos}",
}
}
}
package { apt:

16
templates/Ubuntu/sources.list.erb
View file

@ -1,25 +1,25 @@
# This file is brought to you by puppet
# basic <%= lsbdistcodename %>
deb http://de.archive.ubuntu.com/ubuntu <%= lsbdistcodename %> main restricted universe multiverse
deb http://de.archive.ubuntu.com/ubuntu <%= lsbdistcodename %> <%= repos %>
<% if include_src then -%>
deb-src http://de.archive.ubuntu.com/ubuntu <%= lsbdistcodename %> main restricted universe multiverse
deb-src http://de.archive.ubuntu.com/ubuntu <%= lsbdistcodename %> <%= repos %>
<% end -%>
# updates
deb http://de.archive.ubuntu.com/ubuntu <%= lsbdistcodename %>-updates main restricted universe multiverse
deb http://de.archive.ubuntu.com/ubuntu <%= lsbdistcodename %>-updates <%= repos %>
<% if include_src then -%>
deb-src http://de.archive.ubuntu.com/ubuntu <%= lsbdistcodename %>-updates main restricted universe multiverse
deb-src http://de.archive.ubuntu.com/ubuntu <%= lsbdistcodename %>-updates <%= repos %>
<% end -%>
# security suppport
deb http://de.archive.ubuntu.com/ubuntu <%= lsbdistcodename %>-security main restricted universe multiverse
deb http://de.archive.ubuntu.com/ubuntu <%= lsbdistcodename %>-security <%= repos %>
<% if include_src then -%>
deb-src http://de.archive.ubuntu.com/ubuntu <%= lsbdistcodename %>-security main restricted universe multiverse
deb-src http://de.archive.ubuntu.com/ubuntu <%= lsbdistcodename %>-security <%= repos %>
<% end -%>
# backports
deb http://archive.ubuntu.com/ubuntu <%= lsbdistcodename %>-backports main universe multiverse restricted
deb http://archive.ubuntu.com/ubuntu <%= lsbdistcodename %>-backports main <%= repos %>
<% if include_src then -%>
deb-src http://archive.ubuntu.com/ubuntu <%= lsbdistcodename %>-backports main universe multiverse restricted
deb-src http://archive.ubuntu.com/ubuntu <%= lsbdistcodename %>-backports <%= repos >
<% end -%>