Andrew Bogott has submitted this change and it was merged.
Change subject: ferm: resource attributes quoting
......................................................................
ferm: resource attributes quoting
Bug: T91908
Change-Id: Ic9f2eacb394b93ffc9cf5632b87df44a7f693717
---
M modules/ferm/manifests/conf.pp
M modules/ferm/manifests/init.pp
M modules/ferm/manifests/rule.pp
M modules/ferm/manifests/service.pp
4 files changed, 23 insertions(+), 23 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ferm/manifests/conf.pp b/modules/ferm/manifests/conf.pp
index 05e6ef1..0940f89 100644
--- a/modules/ferm/manifests/conf.pp
+++ b/modules/ferm/manifests/conf.pp
@@ -1,8 +1,8 @@
define ferm::conf(
- $source=undef,
- $content=undef,
- $ensure='present',
- $prio='10',
+ $source = undef,
+ $content = undef,
+ $ensure = present,
+ $prio = '10',
) {
if $source == undef and $content == undef {
fail('Either source or content attribute needs to be given')
diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index fe8979f..c93f012 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -12,8 +12,8 @@
file { '/etc/ferm/ferm.conf':
ensure => present,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0400',
source => 'puppet:///modules/ferm/ferm.conf',
require => Package['ferm'],
@@ -22,8 +22,8 @@
file { '/etc/ferm/functions.conf' :
ensure => present,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0400',
source => 'puppet:///modules/ferm/functions.conf',
require => Package['ferm'],
@@ -32,8 +32,8 @@
file { '/etc/ferm/conf.d' :
ensure => directory,
- owner => root,
- group => adm,
+ owner => 'root',
+ group => 'adm',
mode => '0500',
recurse => true,
purge => true,
@@ -43,8 +43,8 @@
file { '/etc/default/ferm' :
ensure => present,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0400',
source => 'puppet:///modules/ferm/ferm.default',
require => Package['ferm'],
diff --git a/modules/ferm/manifests/rule.pp b/modules/ferm/manifests/rule.pp
index 023b834..eb5d88c 100644
--- a/modules/ferm/manifests/rule.pp
+++ b/modules/ferm/manifests/rule.pp
@@ -1,16 +1,16 @@
define ferm::rule(
$rule,
- $ensure='present',
- $domain='(ip ip6)',
- $table='filter',
- $chain='INPUT',
- $desc='',
- $prio='10',
+ $ensure = present,
+ $domain = '(ip ip6)',
+ $table = 'filter',
+ $chain = 'INPUT',
+ $desc = '',
+ $prio = '10',
) {
@file { "/etc/ferm/conf.d/${prio}_${name}":
ensure => $ensure,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0400',
content => template('ferm/rule.erb'),
require => File['/etc/ferm/conf.d'],
diff --git a/modules/ferm/manifests/service.pp
b/modules/ferm/manifests/service.pp
index fb7eee1..8f02345 100644
--- a/modules/ferm/manifests/service.pp
+++ b/modules/ferm/manifests/service.pp
@@ -8,15 +8,15 @@
define ferm::service(
$proto,
$port,
- $ensure = 'present',
+ $ensure = present,
$desc = '',
$prio = '10',
$srange = undef,
) {
@file { "/etc/ferm/conf.d/${prio}_${name}":
ensure => $ensure,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0400',
content => template('ferm/service.erb'),
require => File['/etc/ferm/conf.d'],
--
To view, visit https://gerrit.wikimedia.org/r/195858
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9f2eacb394b93ffc9cf5632b87df44a7f693717
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
