+# == Class: debian-org
+#
+# Stuff common to all debian.org servers
+#
class debian-org {
if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
$mirror = getfromhash($site::nodeinfo, 'hoster', 'mirror-debian')
require => Package['molly-guard'],
}
+ file { '/etc/apt/trusted-keys.d':
+ ensure => absent,
+ force => true,
+ }
+
+ file { '/etc/apt/trusted.gpg':
+ mode => '0600',
+ content => "",
+ }
+
site::aptrepo { 'security':
url => 'http://security.debian.org/',
suite => "${::lsbdistcodename}/updates",
components => ['main','contrib','non-free']
}
+ if $::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,
suite => "${::lsbdistcodename}-backports",
components => ['main','contrib','non-free']
}
- site::aptrepo { 'backports.org':
- ensure => absent,
- keyid => '16BA136C',
- key => 'puppet:///modules/debian-org/backports.org.asc',
- }
site::aptrepo { 'volatile':
url => $mirror,
components => ['main','contrib','non-free']
}
- if $::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, rem] {
+ if $::hostname in [ball, corelli, eysler, lucatelli, mayer, mayr, rem, pettersson] {
site::aptrepo { 'proposed-updates':
url => $mirror,
suite => "${::lsbdistcodename}-proposed-updates",
url => 'http://db.debian.org/debian-admin',
suite => 'lenny',
components => 'main',
- key => 'puppet:///modules/debian-org/db.debian.org.asc',
+ key => 'puppet:///modules/debian-org/db.debian.org.gpg',
}
augeas { 'inittab_replicate':
changes => [
'set ud/runlevels 2345',
'set ud/action respawn',
- "set mo/process /usr/bin/ud-replicated",
+ 'set ud/process "/usr/bin/ud-replicated -d"',
],
- notify => Exec['init q'],
+ notify => Exec['init q'],
}
if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
file { '/etc/apt/preferences':
source => 'puppet:///modules/debian-org/apt.preferences',
}
- file { '/etc/apt/trusted-keys.d/':
- ensure => directory,
- purge => true,
- }
file { '/etc/apt/apt.conf.d/local-compression':
source => 'puppet:///modules/debian-org/apt.conf.d/local-compression',
}
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',
+ }
}