projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
73bc21a
)
Revert "Make it work with jessie, III"
author
Peter Palfrader
<peter@palfrader.org>
Fri, 7 Nov 2014 19:49:07 +0000
(20:49 +0100)
committer
Peter Palfrader
<peter@palfrader.org>
Fri, 7 Nov 2014 19:49:07 +0000
(20:49 +0100)
This reverts commit
41c40c4a9c30480d08813b55fded8e147718f44f
.
modules/bacula/manifests/client.pp
patch
|
blob
|
history
modules/debian-org/manifests/init.pp
patch
|
blob
|
history
modules/motd/manifests/init.pp
patch
|
blob
|
history
modules/munin/manifests/init.pp
patch
|
blob
|
history
diff --git
a/modules/bacula/manifests/client.pp
b/modules/bacula/manifests/client.pp
index
0a1d98d
..
4e75925
100644
(file)
--- a/
modules/bacula/manifests/client.pp
+++ b/
modules/bacula/manifests/client.pp
@@
-48,7
+48,7
@@
class bacula::client inherits bacula {
require => Package['bacula-fd'],
notify => Service['bacula-fd'],
}
require => Package['bacula-fd'],
notify => Service['bacula-fd'],
}
- if $::lsbmajdistrelease != "testing
/unstable
" and $::lsbmajdistrelease < 7 {
+ if $::lsbmajdistrelease != "testing" and $::lsbmajdistrelease < 7 {
file { '/etc/apt/preferences.d/dsa-bacula-client':
content => template('bacula/apt.preferences.bacula-client.erb'),
mode => '0444',
file { '/etc/apt/preferences.d/dsa-bacula-client':
content => template('bacula/apt.preferences.bacula-client.erb'),
mode => '0444',
diff --git
a/modules/debian-org/manifests/init.pp
b/modules/debian-org/manifests/init.pp
index
1ef3e50
..
bb965be
100644
(file)
--- a/
modules/debian-org/manifests/init.pp
+++ b/
modules/debian-org/manifests/init.pp
@@
-8,7
+8,7
@@
class debian-org {
} else {
$mirror = 'http://http.debian.net/debian/'
}
} else {
$mirror = 'http://http.debian.net/debian/'
}
- if $::lsbmajdistrelease != "testing
/unstable
" and $::lsbmajdistrelease < 7 {
+ if $::lsbmajdistrelease != "testing" and $::lsbmajdistrelease < 7 {
$mirror_backports = 'http://backports.debian.org/debian-backports/'
} else {
$mirror_backports = $mirror
$mirror_backports = 'http://backports.debian.org/debian-backports/'
} else {
$mirror_backports = $mirror
@@
-60,7
+60,7
@@
class debian-org {
ensure => installed,
}
ensure => installed,
}
- if $::lsbmajdistrelease == "testing
/unstable
" or $::lsbmajdistrelease >= 7 {
+ if $::lsbmajdistrelease == "testing" or $::lsbmajdistrelease >= 7 {
package { 'libfilesystem-ruby1.9.1':
ensure => installed,
}
package { 'libfilesystem-ruby1.9.1':
ensure => installed,
}
@@
-122,7
+122,7
@@
class debian-org {
suite => "${::lsbdistcodename}/updates",
components => ['main','contrib','non-free']
}
suite => "${::lsbdistcodename}/updates",
components => ['main','contrib','non-free']
}
- if $::lsbmajdistrelease != "testing
/unstable
" and $::lsbmajdistrelease < 7 {
+ if $::lsbmajdistrelease != "testing" and $::lsbmajdistrelease < 7 {
site::aptrepo { 'debian-lts':
url => $mirror,
suite => "${::lsbdistcodename}-lts",
site::aptrepo { 'debian-lts':
url => $mirror,
suite => "${::lsbdistcodename}-lts",
diff --git
a/modules/motd/manifests/init.pp
b/modules/motd/manifests/init.pp
index
b062790
..
5f017c9
100644
(file)
--- a/
modules/motd/manifests/init.pp
+++ b/
modules/motd/manifests/init.pp
@@
-7,7
+7,7
@@
# include motd
#
class motd {
# include motd
#
class motd {
- if $::lsbmajdistrelease == "testing
/unstable
" or $::lsbmajdistrelease >= 7 {
+ if $::lsbmajdistrelease == "testing" or $::lsbmajdistrelease >= 7 {
$fname = '/etc/update-motd.d/puppet-motd'
$notify = undef
$mode = '0555'
$fname = '/etc/update-motd.d/puppet-motd'
$notify = undef
$mode = '0555'
diff --git
a/modules/munin/manifests/init.pp
b/modules/munin/manifests/init.pp
index
fcf772a
..
2522138
100644
(file)
--- a/
modules/munin/manifests/init.pp
+++ b/
modules/munin/manifests/init.pp
@@
-79,8
+79,7
@@
class munin {
# ensure => 'absent',
# }
#}
# ensure => 'absent',
# }
#}
- warning("foo $::lsbmajdistrelease")
- if $::lsbmajdistrelease == "testing/unstable" or $::lsbmajdistrelease >= 7 {
+ if $::lsbmajdistrelease == "testing" or $::lsbmajdistrelease >= 7 {
package { 'munin-async':
ensure => installed
}
package { 'munin-async':
ensure => installed
}