diff options
| author | intrigeri <intrigeri@boum.org> | 2010-10-17 04:45:09 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-10-17 04:45:09 +0200 |
| commit | f79bf97ec82e8adcf002ca6834b0df66f28e61f2 (patch) | |
| tree | 3b8258b0736051e1c641a58c06b96d716e0d4889 /manifests/debian.pp | |
| parent | f9c1086afb6c343fe65e989413acb80cb7d5cb86 (diff) | |
| parent | c49625a4cd14a53d91b7d12aea88201a211a26a2 (diff) | |
| download | puppet-shorewall-f79bf97ec82e8adcf002ca6834b0df66f28e61f2.tar.gz puppet-shorewall-f79bf97ec82e8adcf002ca6834b0df66f28e61f2.tar.bz2 | |
Merge remote branch 'riseup/master'
Conflicts:
files/debian/default
manifests/init.pp
templates/debian/default
templates/debian_default.erb
Diffstat (limited to 'manifests/debian.pp')
| -rw-r--r-- | manifests/debian.pp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/manifests/debian.pp b/manifests/debian.pp index eab54a2..da3a398 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -3,7 +3,6 @@ class shorewall::debian inherits shorewall::base { '': { $shorewall_startup = "1" } } file{'/etc/default/shorewall': - #source => "puppet:///modules/shorewall/debian/default", content => template("shorewall/debian_default.erb"), require => Package['shorewall'], notify => Service['shorewall'], |