projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
[mirror/dsa-puppet.git]
/
manifests
/
site.pp
diff --git
a/manifests/site.pp
b/manifests/site.pp
index
c863b56
..
d119402
100644
(file)
--- a/
manifests/site.pp
+++ b/
manifests/site.pp
@@
-79,9
+79,6
@@
node default {
case $kernel {
Linux: {
include ferm
- @ferm::rule { "dsa-hook-nf_conntrack_ftp":
- rule => "@hook pre 'modprobe nf_conntrack_ftp || true'",
- description => "let's load nf_conntrack_ftp" ; }
}
}
}