} else {
$mirror = 'http://http.debian.net/debian/'
}
- if $::lsbmajdistrelease < 7 {
+ if $::lsbmajdistrelease != "testing/unstable" and $::lsbmajdistrelease < 7 {
$mirror_backports = 'http://backports.debian.org/debian-backports/'
} else {
$mirror_backports = $mirror
'klogd',
'sysklogd',
'rsyslog',
+ 'os-prober',
+ 'apt-listchanges',
]:
ensure => purged,
}
ensure => installed,
tag => extra_repo,
}
+ file { '/etc/ssh/ssh_known_hosts':
+ ensure => present,
+ replace => false,
+ mode => '0644',
+ source => 'puppet:///modules/debian-org/basic-ssh_known_hosts'
+ }
package { [
'apt-utils',
ensure => installed,
}
- if $::lsbmajdistrelease >= 7 {
+ if $::lsbmajdistrelease == "testing/unstable" or $::lsbmajdistrelease >= 7 {
package { 'libfilesystem-ruby1.9.1':
ensure => installed,
}
file { '/etc/apt/trusted-keys.d':
ensure => absent,
+ force => true,
}
file { '/etc/apt/trusted.gpg':
suite => "${::lsbdistcodename}/updates",
components => ['main','contrib','non-free']
}
+ if $::lsbmajdistrelease != "testing/unstable" and $::lsbmajdistrelease < 7 {
+ site::aptrepo { 'debian-lts':
+ url => $mirror,
+ suite => "${::lsbdistcodename}-lts",
+ components => ['main','contrib','non-free']
+ }
+ } else {
+ site::aptrepo { 'debian-lts':
+ ensure => absent,
+ }
+ }
site::aptrepo { 'backports.debian.org':
url => $mirror_backports,
components => ['main','contrib','non-free']
}
- if $::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, rem] {
+ #if ($::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, pettersson]) or
+ # ($::hoster and ($::hoster in [bytemark, man-da, brown])) {
+ # site::aptrepo { 'proposed-updates':
+ # url => $mirror,
+ # suite => "${::lsbdistcodename}-proposed-updates",
+ # components => ['main','contrib','non-free']
+ # }
+ #} else {
site::aptrepo { 'proposed-updates':
- url => $mirror,
- suite => "${::lsbdistcodename}-proposed-updates",
- components => ['main','contrib','non-free']
+ ensure => absent,
}
- }
+ #}
site::aptrepo { 'debian.org':
ensure => absent,
site::aptrepo { 'db.debian.org':
url => 'http://db.debian.org/debian-admin',
- suite => 'lenny',
+ suite => 'debian-all',
components => 'main',
key => 'puppet:///modules/debian-org/db.debian.org.gpg',
}
+ site::aptrepo { 'db.debian.org-suite':
+ url => 'http://db.debian.org/debian-admin',
+ suite => $::lsbdistcodename,
+ components => 'main',
+ }
augeas { 'inittab_replicate':
context => '/files/etc/inittab',
file { '/etc/rc.local':
mode => '0755',
source => 'puppet:///modules/debian-org/rc.local',
- notify => Exec['rc.local start'],
+ notify => Exec['service rc.local start'],
}
file { '/etc/dsa':
ensure => directory,
path => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
refreshonly => true
}
- exec { 'rc.local start':
- path => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
+ exec { 'service rc.local start':
refreshonly => true
}
exec { 'init q':
matches => [ 'paths', 'contents' ],
schedule => weekly
}
+
+ file { '/root/.bashrc':
+ source => 'puppet:///modules/debian-org/root-dotfiles/bashrc',
+ }
+ file { '/root/.profile':
+ source => 'puppet:///modules/debian-org/root-dotfiles/profile',
+ }
+ file { '/root/.screenrc':
+ source => 'puppet:///modules/debian-org/root-dotfiles/screenrc',
+ }
+ file { '/root/.vimrc':
+ source => 'puppet:///modules/debian-org/root-dotfiles/vimrc',
+ }
}