Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325146
Change subject: Quote "owner" and "group" attributes for file and git::clone
resources
......................................................................
Quote "owner" and "group" attributes for file and git::clone resources
Change-Id: Ic4ba4ae1ea2103b5172f87be8784d6239a1fd803
---
M modules/bacula/manifests/director.pp
M modules/bacula/manifests/director/catalog.pp
M modules/bacula/manifests/director/fileset.pp
M modules/bacula/manifests/director/pool.pp
M modules/bacula/manifests/director/schedule.pp
M modules/base/manifests/service_unit.pp
M modules/confd/manifests/init.pp
M modules/conftool/manifests/init.pp
M modules/conftool/manifests/master.pp
M modules/drac/manifests/init.pp
M modules/elasticsearch/manifests/ganglia.pp
M modules/etcd/manifests/client/globalconfig.pp
M modules/java/manifests/tools.pp
M modules/labstore/manifests/nfs_mount.pp
M modules/lshell/manifests/init.pp
M modules/lvs/manifests/balancer/runcommand.pp
M modules/miredo/manifests/init.pp
M modules/mongodb/manifests/init.pp
M modules/ntp/manifests/daemon.pp
M modules/openstack/manifests/ceilometer/compute.pp
M modules/openstack/manifests/ceilometer/controller.pp
M modules/openstack/manifests/designate/service.pp
M modules/openstack/manifests/glance/service.pp
M modules/openstack/manifests/keystone/service.pp
M modules/phabricator/manifests/mailrelay.pp
M modules/pivot/manifests/init.pp
M modules/role/manifests/cache/base.pp
M modules/role/manifests/zuul/server.pp
M modules/snapshot/manifests/cron/dumplists.pp
M modules/snapshot/manifests/cron/mediaperprojectlists.pp
M modules/snapshot/manifests/dumps/cron.pp
M modules/systemd/manifests/sidekick.pp
M modules/tlsproxy/manifests/instance.pp
M modules/yubiauth/manifests/yhsm_daemon.pp
M modules/yubiauth/manifests/yhsm_yubikey_ksm.pp
35 files changed, 100 insertions(+), 100 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/46/325146/1
diff --git a/modules/bacula/manifests/director.pp
b/modules/bacula/manifests/director.pp
index dfbbe76..b30c3b6 100644
--- a/modules/bacula/manifests/director.pp
+++ b/modules/bacula/manifests/director.pp
@@ -65,8 +65,8 @@
file { '/etc/bacula/bacula-dir.conf':
ensure => present,
- owner => root,
- group => bacula,
+ owner => 'root',
+ group => 'bacula',
mode => '0440',
notify => Service['bacula-director'],
content => template('bacula/bacula-dir.conf.erb'),
@@ -80,8 +80,8 @@
force => true,
purge => true,
mode => '0444',
- owner => root,
- group => bacula,
+ owner => 'root',
+ group => 'bacula',
require => Package["bacula-director-${sqlvariant}"],
}
@@ -92,8 +92,8 @@
force => true,
purge => true,
mode => '0444',
- owner => root,
- group => bacula,
+ owner => 'root',
+ group => 'bacula',
require => Package["bacula-director-${sqlvariant}"],
}
@@ -103,8 +103,8 @@
force => true,
purge => true,
mode => '0444',
- owner => root,
- group => bacula,
+ owner => 'root',
+ group => 'bacula',
require => Package["bacula-director-${sqlvariant}"],
}
@@ -112,8 +112,8 @@
file { '/etc/bacula/jobs.d/restore-migrate-jobs.conf':
ensure => file,
mode => '0444',
- owner => root,
- group => bacula,
+ owner => 'root',
+ group => 'bacula',
require => File['/etc/bacula/jobs.d'],
content => template('bacula/restore-migrate-jobs.conf.erb'),
}
@@ -125,8 +125,8 @@
force => true,
purge => true,
mode => '0444',
- owner => root,
- group => bacula,
+ owner => 'root',
+ group => 'bacula',
require => Package["bacula-director-${sqlvariant}"],
}
@@ -134,8 +134,8 @@
@@file { '/etc/bacula/bconsole.conf':
ensure => present,
mode => '0440',
- owner => root,
- group => bacula,
+ owner => 'root',
+ group => 'bacula',
content => template('bacula/bconsole.conf.erb'),
tag => "bacula-console-${::fqdn}",
}
diff --git a/modules/bacula/manifests/director/catalog.pp
b/modules/bacula/manifests/director/catalog.pp
index ce7724b..099ff6d 100644
--- a/modules/bacula/manifests/director/catalog.pp
+++ b/modules/bacula/manifests/director/catalog.pp
@@ -24,8 +24,8 @@
define bacula::director::catalog($dbname, $dbuser, $dbhost, $dbport,
$dbpassword) {
file { "/etc/bacula/conf.d/catalog-${name}.conf":
ensure => present,
- owner => root,
- group => bacula,
+ owner => 'root',
+ group => 'bacula',
mode => '0440',
content => template('bacula/bacula-dir-catalog.erb'),
notify => Service['bacula-director'],
diff --git a/modules/bacula/manifests/director/fileset.pp
b/modules/bacula/manifests/director/fileset.pp
index 4758dc0..9c041a6 100644
--- a/modules/bacula/manifests/director/fileset.pp
+++ b/modules/bacula/manifests/director/fileset.pp
@@ -29,8 +29,8 @@
) {
file { "/etc/bacula/conf.d/fileset-${name}.conf":
ensure => present,
- owner => root,
- group => bacula,
+ owner => 'root',
+ group => 'bacula',
mode => '0440',
content => template('bacula/bacula-dir-fileset.erb'),
notify => Service['bacula-director'],
diff --git a/modules/bacula/manifests/director/pool.pp
b/modules/bacula/manifests/director/pool.pp
index 1f03e58..0592dda 100644
--- a/modules/bacula/manifests/director/pool.pp
+++ b/modules/bacula/manifests/director/pool.pp
@@ -46,8 +46,8 @@
file { "/etc/bacula/conf.d/pool-${name}.conf":
ensure => present,
- owner => root,
- group => bacula,
+ owner => 'root',
+ group => 'bacula',
mode => '0440',
content => template('bacula/bacula-dir-pool.erb'),
notify => Service['bacula-director'],
diff --git a/modules/bacula/manifests/director/schedule.pp
b/modules/bacula/manifests/director/schedule.pp
index b09b6f3..5228aa2 100644
--- a/modules/bacula/manifests/director/schedule.pp
+++ b/modules/bacula/manifests/director/schedule.pp
@@ -22,8 +22,8 @@
define bacula::director::schedule($runs) {
file { "/etc/bacula/conf.d/schedule-${name}.conf":
ensure => present,
- owner => root,
- group => bacula,
+ owner => 'root',
+ group => 'bacula',
mode => '0440',
content => template('bacula/bacula-dir-schedule.erb'),
notify => Service['bacula-director'],
diff --git a/modules/base/manifests/service_unit.pp
b/modules/base/manifests/service_unit.pp
index e51e4b1..f44cdf4 100644
--- a/modules/base/manifests/service_unit.pp
+++ b/modules/base/manifests/service_unit.pp
@@ -127,8 +127,8 @@
ensure => $ensure,
content => template($template),
mode => $i_mode,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
}
if $declare_service {
diff --git a/modules/confd/manifests/init.pp b/modules/confd/manifests/init.pp
index cf2c2a3..d13b011 100644
--- a/modules/confd/manifests/init.pp
+++ b/modules/confd/manifests/init.pp
@@ -35,8 +35,8 @@
file { '/etc/confd':
ensure => directory,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0550',
}
@@ -44,8 +44,8 @@
ensure => directory,
recurse => true,
purge => true,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0550',
before => Service['confd'],
}
@@ -54,16 +54,16 @@
ensure => directory,
recurse => true,
purge => true,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0550',
before => Service['confd'],
}
file { '/usr/local/bin/confd-lint-wrap':
ensure => present,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0555',
source => 'puppet:///modules/confd/confd-lint-wrap.py',
}
diff --git a/modules/conftool/manifests/init.pp
b/modules/conftool/manifests/init.pp
index 279bbc9..8e745e6 100644
--- a/modules/conftool/manifests/init.pp
+++ b/modules/conftool/manifests/init.pp
@@ -22,15 +22,15 @@
file { '/etc/conftool':
ensure => directory,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0755',
}
file { '/etc/conftool/config.yaml':
ensure => present,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0444',
content => ordered_yaml({
hosts => $hosts,
diff --git a/modules/conftool/manifests/master.pp
b/modules/conftool/manifests/master.pp
index 67143b0..67ed8ee 100644
--- a/modules/conftool/manifests/master.pp
+++ b/modules/conftool/manifests/master.pp
@@ -17,8 +17,8 @@
file { '/usr/local/bin/conftool-merge':
ensure => present,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0500',
content => template('conftool/conftool-merge.erb')
}
diff --git a/modules/drac/manifests/init.pp b/modules/drac/manifests/init.pp
index 1733f0b..2139e7c 100644
--- a/modules/drac/manifests/init.pp
+++ b/modules/drac/manifests/init.pp
@@ -4,8 +4,8 @@
}
file {'/usr/local/sbin/drac':
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0555',
source => 'puppet:///modules/drac/drac.py',
require => Package['python-paramiko'],
diff --git a/modules/elasticsearch/manifests/ganglia.pp
b/modules/elasticsearch/manifests/ganglia.pp
index ad0ead1..a2a98ed 100644
--- a/modules/elasticsearch/manifests/ganglia.pp
+++ b/modules/elasticsearch/manifests/ganglia.pp
@@ -1,14 +1,14 @@
class elasticsearch::ganglia {
file { '/etc/ganglia/conf.d/elasticsearch.pyconf':
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0444',
source =>
'puppet:///modules/elasticsearch/ganglia/elasticsearch.pyconf',
notify => Service['ganglia-monitor'];
}
file { '/usr/lib/ganglia/python_modules/elasticsearch_monitoring.py':
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0444',
source =>
'puppet:///modules/elasticsearch/ganglia/elasticsearch_monitoring.py',
notify => Service['ganglia-monitor'];
diff --git a/modules/etcd/manifests/client/globalconfig.pp
b/modules/etcd/manifests/client/globalconfig.pp
index b4cc820..930119b 100644
--- a/modules/etcd/manifests/client/globalconfig.pp
+++ b/modules/etcd/manifests/client/globalconfig.pp
@@ -15,8 +15,8 @@
if $ssl_dir {
file { '/etc/etcd/ca.pem':
ensure => present,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0444',
source => "${ssl_dir}/certs/ca.pem",
}
diff --git a/modules/java/manifests/tools.pp b/modules/java/manifests/tools.pp
index 1df6008..6268bb7 100644
--- a/modules/java/manifests/tools.pp
+++ b/modules/java/manifests/tools.pp
@@ -8,8 +8,8 @@
# NOTE jmap is used, thus requiring a jdk to be installed
file { '/usr/local/bin/jheapdump':
ensure => file,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0555',
source => 'puppet:///modules/java/jheapdump',
}
diff --git a/modules/labstore/manifests/nfs_mount.pp
b/modules/labstore/manifests/nfs_mount.pp
index 05da537..7ef3b6b 100644
--- a/modules/labstore/manifests/nfs_mount.pp
+++ b/modules/labstore/manifests/nfs_mount.pp
@@ -99,7 +99,7 @@
if !defined(File['/usr/local/sbin/nfs-mount-manager']) {
file { '/usr/local/sbin/nfs-mount-manager':
ensure => present,
- owner => root,
+ owner => 'root',
mode => '0655',
source => 'puppet:///modules/labstore/nfs-mount-manager',
}
@@ -134,7 +134,7 @@
# This script will block until the NFS volume is available
file { '/usr/local/sbin/block-for-export':
ensure => present,
- owner => root,
+ owner => 'root',
mode => '0555',
source => 'puppet:///modules/labstore/block-for-export',
}
diff --git a/modules/lshell/manifests/init.pp b/modules/lshell/manifests/init.pp
index 5358541..66b863a 100644
--- a/modules/lshell/manifests/init.pp
+++ b/modules/lshell/manifests/init.pp
@@ -55,8 +55,8 @@
file { '/etc/lshell.conf':
content => template('lshell/lshell.conf.erb'),
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0444',
}
}
diff --git a/modules/lvs/manifests/balancer/runcommand.pp
b/modules/lvs/manifests/balancer/runcommand.pp
index 2836c46..fbf8a0d 100644
--- a/modules/lvs/manifests/balancer/runcommand.pp
+++ b/modules/lvs/manifests/balancer/runcommand.pp
@@ -7,17 +7,17 @@
file {
'/etc/pybal/runcommand':
ensure => directory,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0755';
'/etc/pybal/runcommand/check-apache':
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0555',
source => "puppet:///modules/${module_name}/pybal/check-apache";
'/root/.ssh/pybal-check':
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0600',
content => secret('pybal/pybal-check');
}
diff --git a/modules/miredo/manifests/init.pp b/modules/miredo/manifests/init.pp
index f48e65d..d4adbf6 100644
--- a/modules/miredo/manifests/init.pp
+++ b/modules/miredo/manifests/init.pp
@@ -8,8 +8,8 @@
}
file { '/etc/miredo.conf':
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0444',
require => Package['miredo'],
source => 'puppet:///modules/miredo/miredo.conf',
diff --git a/modules/mongodb/manifests/init.pp
b/modules/mongodb/manifests/init.pp
index 82d8702..2495735 100644
--- a/modules/mongodb/manifests/init.pp
+++ b/modules/mongodb/manifests/init.pp
@@ -48,8 +48,8 @@
file { '/etc/mongodb.conf':
content => template('mongodb/mongod.conf.erb'),
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0644',
require => Package['mongodb'],
}
diff --git a/modules/ntp/manifests/daemon.pp b/modules/ntp/manifests/daemon.pp
index ce8ec61..0ad671e 100644
--- a/modules/ntp/manifests/daemon.pp
+++ b/modules/ntp/manifests/daemon.pp
@@ -4,8 +4,8 @@
file { 'ntp.conf':
mode => '0644',
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
path => '/etc/ntp.conf',
content => template('ntp/ntp-conf.erb'),
}
diff --git a/modules/openstack/manifests/ceilometer/compute.pp
b/modules/openstack/manifests/ceilometer/compute.pp
index 7a39e93..56cac96 100644
--- a/modules/openstack/manifests/ceilometer/compute.pp
+++ b/modules/openstack/manifests/ceilometer/compute.pp
@@ -17,8 +17,8 @@
file {
'/etc/ceilometer/ceilometer.conf':
content =>
template("openstack/${openstack_version}/ceilometer/ceilometer.conf.erb"),
- owner => ceilometer,
- group => ceilometer,
+ owner => 'ceilometer',
+ group => 'ceilometer',
notify => Service['ceilometer-agent-compute'],
require => Package['ceilometer-agent-compute'],
mode => '0440';
diff --git a/modules/openstack/manifests/ceilometer/controller.pp
b/modules/openstack/manifests/ceilometer/controller.pp
index 17d645b..ac54c09 100644
--- a/modules/openstack/manifests/ceilometer/controller.pp
+++ b/modules/openstack/manifests/ceilometer/controller.pp
@@ -27,8 +27,8 @@
file {
'/etc/ceilometer/ceilometer.conf':
content =>
template("openstack/${openstack_version}/ceilometer/ceilometer.conf.erb"),
- owner => ceilometer,
- group => ceilometer,
+ owner => 'ceilometer',
+ group => 'ceilometer',
notify =>
Service['ceilometer-api','ceilometer-collector','ceilometer-agent-central'],
require => Package['ceilometer-api'],
mode => '0440';
diff --git a/modules/openstack/manifests/designate/service.pp
b/modules/openstack/manifests/designate/service.pp
index 9e8301b..6125838 100644
--- a/modules/openstack/manifests/designate/service.pp
+++ b/modules/openstack/manifests/designate/service.pp
@@ -63,8 +63,8 @@
file {
'/etc/designate/designate.conf':
content =>
template("openstack/${openstack_version}/designate/designate.conf.erb"),
- owner => designate,
- group => designate,
+ owner => 'designate',
+ group => 'designate',
notify =>
Service['designate-api','designate-sink','designate-central','designate-mdns','designate-pool-manager'],
require => Package['designate-common'],
mode => '0440';
diff --git a/modules/openstack/manifests/glance/service.pp
b/modules/openstack/manifests/glance/service.pp
index 491e325..aa638d5 100644
--- a/modules/openstack/manifests/glance/service.pp
+++ b/modules/openstack/manifests/glance/service.pp
@@ -57,14 +57,14 @@
'/etc/glance/glance-api.conf':
content =>
template("openstack/${openstack_version}/glance/glance-api.conf.erb"),
owner => 'glance',
- group => nogroup,
+ group => 'nogroup',
notify => Service['glance-api'],
require => Package['glance'],
mode => '0440';
'/etc/glance/glance-registry.conf':
content =>
template("openstack/${openstack_version}/glance/glance-registry.conf.erb"),
owner => 'glance',
- group => nogroup,
+ group => 'nogroup',
notify => Service['glance-registry'],
require => Package['glance'],
mode => '0440';
diff --git a/modules/openstack/manifests/keystone/service.pp
b/modules/openstack/manifests/keystone/service.pp
index b7ed76c..cbf9d70 100644
--- a/modules/openstack/manifests/keystone/service.pp
+++ b/modules/openstack/manifests/keystone/service.pp
@@ -28,8 +28,8 @@
file {
'/etc/keystone/keystone.conf':
content =>
template("openstack/${openstack_version}/keystone/keystone.conf.erb"),
- owner => keystone,
- group => keystone,
+ owner => 'keystone',
+ group => 'keystone',
notify => Service['keystone'],
require => Package['keystone'],
mode => '0440';
diff --git a/modules/phabricator/manifests/mailrelay.pp
b/modules/phabricator/manifests/mailrelay.pp
index cc412d0..696d1bd 100644
--- a/modules/phabricator/manifests/mailrelay.pp
+++ b/modules/phabricator/manifests/mailrelay.pp
@@ -41,13 +41,13 @@
ensure => file,
source => 'puppet:///modules/phabricator/phab_epipe.py',
mode => '0555',
- owner => mail,
- group => mail,
+ owner => 'mail',
+ group => 'mail',
}
file { '/etc/phab_epipe.conf':
ensure => file,
content => template('phabricator/phab_epipe.conf.erb'),
- owner => mail,
+ owner => 'mail',
}
}
diff --git a/modules/pivot/manifests/init.pp b/modules/pivot/manifests/init.pp
index 70b2b2b..38aefbe 100644
--- a/modules/pivot/manifests/init.pp
+++ b/modules/pivot/manifests/init.pp
@@ -94,8 +94,8 @@
file { '/etc/pivot':
ensure => directory,
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
mode => '0755',
}
diff --git a/modules/role/manifests/cache/base.pp
b/modules/role/manifests/cache/base.pp
index 8274056..ed4809b 100644
--- a/modules/role/manifests/cache/base.pp
+++ b/modules/role/manifests/cache/base.pp
@@ -105,15 +105,15 @@
ensure => present,
source => 'puppet:///modules/role/cache/traffic-pool.service',
mode => '0444',
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
}
file { $varlib_path:
ensure => directory,
mode => '0755',
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
}
exec { 'systemd reload+enable for traffic-pool':
diff --git a/modules/role/manifests/zuul/server.pp
b/modules/role/manifests/zuul/server.pp
index 80de5a8..1440651 100644
--- a/modules/role/manifests/zuul/server.pp
+++ b/modules/role/manifests/zuul/server.pp
@@ -32,8 +32,8 @@
# Conf file is hosted in integration/config git repo
git::clone { 'integration/config':
directory => '/etc/zuul/wikimedia',
- owner => zuul,
- group => zuul,
+ owner => 'zuul',
+ group => 'zuul',
mode => '0775',
umask => '002',
origin => 'https://gerrit.wikimedia.org/r/p/integration/config.git',
diff --git a/modules/snapshot/manifests/cron/dumplists.pp
b/modules/snapshot/manifests/cron/dumplists.pp
index 293e226..9b716f2 100644
--- a/modules/snapshot/manifests/cron/dumplists.pp
+++ b/modules/snapshot/manifests/cron/dumplists.pp
@@ -8,7 +8,7 @@
path => '/usr/local/bin/list-last-good-dumps.sh',
mode => '0755',
owner => $user,
- group => root,
+ group => 'root',
content => template('snapshot/cron/list-last-good-dumps.sh.erb'),
}
file { '/usr/local/bin/list-last-n-good-dumps.py':
@@ -16,7 +16,7 @@
path => '/usr/local/bin/list-last-n-good-dumps.py',
mode => '0755',
owner => $user,
- group => root,
+ group => 'root',
source => 'puppet:///modules/snapshot/cron/list-last-n-good-dumps.py',
}
diff --git a/modules/snapshot/manifests/cron/mediaperprojectlists.pp
b/modules/snapshot/manifests/cron/mediaperprojectlists.pp
index fa0bcbb..b6bdccd 100644
--- a/modules/snapshot/manifests/cron/mediaperprojectlists.pp
+++ b/modules/snapshot/manifests/cron/mediaperprojectlists.pp
@@ -8,7 +8,7 @@
path => '/usr/local/bin/create-media-per-project-lists.sh',
mode => '0755',
owner => $user,
- group => root,
+ group => 'root',
content =>
template('snapshot/cron/create-media-per-project-lists.sh.erb'),
}
diff --git a/modules/snapshot/manifests/dumps/cron.pp
b/modules/snapshot/manifests/dumps/cron.pp
index 44bd2a3..f94352d 100644
--- a/modules/snapshot/manifests/dumps/cron.pp
+++ b/modules/snapshot/manifests/dumps/cron.pp
@@ -16,8 +16,8 @@
ensure => 'present',
path => '/usr/local/bin/fulldumps.sh',
mode => '0755',
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
content => template('snapshot/dumps/fulldumps.sh.erb'),
}
diff --git a/modules/systemd/manifests/sidekick.pp
b/modules/systemd/manifests/sidekick.pp
index 56c8b2e..ecfbc5c 100644
--- a/modules/systemd/manifests/sidekick.pp
+++ b/modules/systemd/manifests/sidekick.pp
@@ -52,8 +52,8 @@
ensure => $ensure,
content => template('systemd/sidekick_service.erb'),
mode => '0444',
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
}
exec { "systemd reload for ${servname}":
diff --git a/modules/tlsproxy/manifests/instance.pp
b/modules/tlsproxy/manifests/instance.pp
index 2fd61bd..d4270b6 100644
--- a/modules/tlsproxy/manifests/instance.pp
+++ b/modules/tlsproxy/manifests/instance.pp
@@ -42,15 +42,15 @@
file { $sysd_sec_dir:
ensure => directory,
mode => '0555',
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
}
file { $sysd_sec_conf:
ensure => present,
mode => '0444',
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
source => 'puppet:///modules/tlsproxy/nginx-security.conf',
before => Class['nginx'],
require => File[$sysd_sec_dir],
diff --git a/modules/yubiauth/manifests/yhsm_daemon.pp
b/modules/yubiauth/manifests/yhsm_daemon.pp
index a444e19..5a55bcb 100644
--- a/modules/yubiauth/manifests/yhsm_daemon.pp
+++ b/modules/yubiauth/manifests/yhsm_daemon.pp
@@ -7,8 +7,8 @@
file { 'yhsm-daemon-default':
mode => '0440',
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
path => '/etc/default/yhsm-daemon',
content => template('yubiauth/yhsm-daemon-default.erb'),
}
diff --git a/modules/yubiauth/manifests/yhsm_yubikey_ksm.pp
b/modules/yubiauth/manifests/yhsm_yubikey_ksm.pp
index 4d3ba62..88348a1 100644
--- a/modules/yubiauth/manifests/yhsm_yubikey_ksm.pp
+++ b/modules/yubiauth/manifests/yhsm_yubikey_ksm.pp
@@ -7,8 +7,8 @@
file { 'yhsm-yubikey-ksm-default':
mode => '0440',
- owner => root,
- group => root,
+ owner => 'root',
+ group => 'root',
path => '/etc/default/yhsm-yubikey-ksm',
content => template('yubiauth/yhsm-yubikey-ksm-default.erb'),
}
--
To view, visit https://gerrit.wikimedia.org/r/325146
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4ba4ae1ea2103b5172f87be8784d6239a1fd803
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
