Faidon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/78396
Change subject: ferm: don't automatically add semicolons
......................................................................
ferm: don't automatically add semicolons
Don't automatically add semicolon to rules, as they may contain braces
and ferm will grok on a "{ ... };". Push the semicolon on the call site
instead.
Plus, a template path was wrong (oh jenkins how I wish you were smarter).
Change-Id: I8fc4bbe89c8d6055f4f37b95933637facfa80459
---
M manifests/base.pp
M modules/ferm/manifests/rule.pp
M modules/ferm/templates/rule.erb
3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/96/78396/1
diff --git a/manifests/base.pp b/manifests/base.pp
index 5e048c6..f639d91 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -745,7 +745,7 @@
ferm::rule { 'bastion-ssh':
ensure => present,
- rule => 'proto tcp dport ssh saddr $BASTION ACCEPT',
+ rule => 'proto tcp dport ssh saddr $BASTION ACCEPT;',
}
}
diff --git a/modules/ferm/manifests/rule.pp b/modules/ferm/manifests/rule.pp
index d5265d0..023b834 100644
--- a/modules/ferm/manifests/rule.pp
+++ b/modules/ferm/manifests/rule.pp
@@ -12,7 +12,7 @@
owner => root,
group => root,
mode => '0400',
- content => template('ferm/custom.erb'),
+ content => template('ferm/rule.erb'),
require => File['/etc/ferm/conf.d'],
notify => Service['ferm'],
tag => 'ferm',
diff --git a/modules/ferm/templates/rule.erb b/modules/ferm/templates/rule.erb
index a5fa7cb..89ac02a 100644
--- a/modules/ferm/templates/rule.erb
+++ b/modules/ferm/templates/rule.erb
@@ -5,7 +5,7 @@
domain <%= domain %> {
table <%= table %> {
chain <%= chain %> {
- <%= rule %>;
+ <%= rule %>
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/78396
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8fc4bbe89c8d6055f4f37b95933637facfa80459
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
