} else {
$mirror = 'http://http.debian.net/debian/'
}
- if $::lsbmajdistrelease != "testing" and $::lsbmajdistrelease < 7 {
+ if $::lsbmajdistrelease < 7 {
$mirror_backports = 'http://backports.debian.org/debian-backports/'
} else {
$mirror_backports = $mirror
ensure => installed,
}
- if $::lsbmajdistrelease == "testing" or $::lsbmajdistrelease >= 7 {
+ if $::lsbmajdistrelease >= 7 {
package { 'libfilesystem-ruby1.9.1':
ensure => installed,
}
suite => "${::lsbdistcodename}/updates",
components => ['main','contrib','non-free']
}
- if $::lsbmajdistrelease != "testing" and $::lsbmajdistrelease < 7 {
+ if $::lsbmajdistrelease < 7 {
site::aptrepo { 'debian-lts':
url => $mirror,
suite => "${::lsbdistcodename}-lts",
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 => '/usr/bin:/usr/sbin:/bin:/sbin',
refreshonly => true
}
- exec { 'puppetmaster restart':
- path => '/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin',
+ exec { 'service puppetmaster restart':
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':