Alexandros Kosiaris has submitted this change and it was merged.
Change subject: fix "read_only" setting in rsyncd setups
......................................................................
fix "read_only" setting in rsyncd setups
in all those places "true"/"false" are being used
also see I4d42f81cc3 where i wanted to remove
the quotes, but actually the rsync module says:
$read_only - yes||no, defaults to yes
so i think where it says "true" it just happens
to work and where it says "false" it is still read-only?
either this, or the other way around, should the rsync
module start to use true/false (but then as actual booleans)?
Change-Id: Ic91eb4f7c6817189b0a466a018c5544d65f8c02d
---
M manifests/misc/deployment.pp
M manifests/misc/udp2log.pp
M manifests/nfs.pp
M manifests/role/analytics/kafkatee.pp
M manifests/site.pp
M manifests/swift.pp
6 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index 8ba9226..08bc835 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -381,7 +381,7 @@
rsync::server::module { 'common':
path => '/a/common',
- read_only => 'true',
+ read_only => 'yes',
hosts_allow => $::network::constants::mw_appserver_networks;
}
}
diff --git a/manifests/misc/udp2log.pp b/manifests/misc/udp2log.pp
index db31cc0..81e9999 100644
--- a/manifests/misc/udp2log.pp
+++ b/manifests/misc/udp2log.pp
@@ -62,7 +62,7 @@
'udp2log':
comment => 'udp2log log files',
path => $path,
- read_only => 'true',
+ read_only => 'yes',
hosts_allow => $hosts_allow;
}
}
diff --git a/manifests/nfs.pp b/manifests/nfs.pp
index 3a4e94c..4881c15 100644
--- a/manifests/nfs.pp
+++ b/manifests/nfs.pp
@@ -323,7 +323,7 @@
rsync::server::module { 'httpdconf':
path => '/home/wikipedia/conf/httpd',
- read_only => 'true',
+ read_only => 'yes',
hosts_allow => $::network::constants::mw_appserver_networks,
}
}
diff --git a/manifests/role/analytics/kafkatee.pp
b/manifests/role/analytics/kafkatee.pp
index bd09229..8b7be0c 100644
--- a/manifests/role/analytics/kafkatee.pp
+++ b/manifests/role/analytics/kafkatee.pp
@@ -72,7 +72,7 @@
rsync::server::module { 'webrequest':
comment => 'kafkatee generated webrequest log files',
path => $webrequest_log_directory,
- read_only => 'true',
+ read_only => 'yes',
hosts_allow => $hosts_allow,
}
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 4ca73e7..11a54ad 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1439,7 +1439,7 @@
rsync::server::module {
'pagecounts':
path => '/srv/dumps/pagecounts',
- read_only => 'false',
+ read_only => 'no',
hosts_allow => ['208.80.154.11', '208.80.152.185'];
}
diff --git a/manifests/swift.pp b/manifests/swift.pp
index 1350e48..52388ec 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -194,21 +194,21 @@
gid => 'swift',
max_connections => '5',
path => '/srv/swift-storage/',
- read_only => 'false',
+ read_only => 'no',
lock_file => '/var/lock/account.lock';
'container':
uid => 'swift',
gid => 'swift',
max_connections => '5',
path => '/srv/swift-storage/',
- read_only => 'false',
+ read_only => 'no',
lock_file => '/var/lock/container.lock';
'object':
uid => 'swift',
gid => 'swift',
max_connections => '10',
path => '/srv/swift-storage/',
- read_only => 'false',
+ read_only => 'no',
lock_file => '/var/lock/object.lock';
}
--
To view, visit https://gerrit.wikimedia.org/r/133647
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic91eb4f7c6817189b0a466a018c5544d65f8c02d
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Tim Starling <tstarl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
