projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use a regular pipe to transport apt's output
[mirror/dsa-puppet.git]
/
modules
/
nfs-server
/
manifests
/
init.pp
diff --git
a/modules/nfs-server/manifests/init.pp
b/modules/nfs-server/manifests/init.pp
index
b9ff888
..
a9e4758
100644
(file)
--- a/
modules/nfs-server/manifests/init.pp
+++ b/
modules/nfs-server/manifests/init.pp
@@
-4,18
+4,16
@@
class nfs-server {
'nfs-common',
'nfs-kernel-server'
]:
'nfs-common',
'nfs-kernel-server'
]:
-
ensure => installed
+ ensure => installed
}
service { 'nfs-common':
hasstatus => false,
status => '/bin/true',
}
service { 'nfs-common':
hasstatus => false,
status => '/bin/true',
- refreshonly => true,
}
service { 'nfs-kernel-server':
hasstatus => false,
status => '/bin/true',
}
service { 'nfs-kernel-server':
hasstatus => false,
status => '/bin/true',
- refreshonly => true,
}
@ferm::rule { 'dsa-portmap':
}
@ferm::rule { 'dsa-portmap':
@@
-46,15
+44,17
@@
class nfs-server {
file { '/etc/default/nfs-common':
source => 'puppet:///modules/nfs-server/nfs-common.default',
file { '/etc/default/nfs-common':
source => 'puppet:///modules/nfs-server/nfs-common.default',
-
require
=> Package['nfs-common'],
+
before
=> Package['nfs-common'],
notify => Service['nfs-common'],
}
file { '/etc/default/nfs-kernel-server':
source => 'puppet:///modules/nfs-server/nfs-kernel-server.default',
notify => Service['nfs-common'],
}
file { '/etc/default/nfs-kernel-server':
source => 'puppet:///modules/nfs-server/nfs-kernel-server.default',
-
require
=> Package['nfs-kernel-server'],
+
before
=> Package['nfs-kernel-server'],
notify => Service['nfs-kernel-server'],
}
file { '/etc/modprobe.d/lockd.local':
notify => Service['nfs-kernel-server'],
}
file { '/etc/modprobe.d/lockd.local':
- source => 'puppet:///modules/nfs-server/lockd.local.modprobe'
+ source => 'puppet:///modules/nfs-server/lockd.local.modprobe',
+ before => Package['nfs-common'],
+ notify => Service['nfs-common'],
}
}
}
}