Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/70846
Change subject: Convert swift's rsyncd from generic::rsyncd to the new rsync
module.
......................................................................
Convert swift's rsyncd from generic::rsyncd to the new rsync module.
Change-Id: I1b7d4ce3b85c4a98f0d2b2083d821f79c5960f06
---
D files/rsync/rsyncd.conf.swift
M manifests/swift.pp
2 files changed, 24 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/46/70846/1
diff --git a/files/rsync/rsyncd.conf.swift b/files/rsync/rsyncd.conf.swift
deleted file mode 100644
index 97b9878..0000000
--- a/files/rsync/rsyncd.conf.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-uid = swift
-gid = swift
-log file = /var/log/rsyncd.log
-pid file = /var/run/rsyncd.pid
-
-[account]
-max connections = 2
-path = /srv/swift-storage/
-read only = false
-lock file = /var/lock/account.lock
-
-[container]
-max connections = 2
-path = /srv/swift-storage/
-read only = false
-lock file = /var/lock/container.lock
-
-[object]
-max connections = 3
-path = /srv/swift-storage/
-read only = false
-lock file = /var/lock/object.lock
diff --git a/manifests/swift.pp b/manifests/swift.pp
index 1424fce..5afd7da 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -330,7 +330,30 @@
class config {
require swift::storage::packages
- class { "generic::rsyncd": config => "swift" }
+ include rsync::server
+ rsync::server::module {
+ "account":
+ uid => 'swift',
+ gid => 'swift',
+ max_connections => '2',
+ path => '/srv/swift-storage/',
+ read_only => 'false',
+ lock_file => '/var/lock/account.lock';
+ "container":
+ uid => 'swift',
+ gid => 'swift',
+ max_connections => '2',
+ path => '/srv/swift-storage/',
+ read_only => 'false',
+ lock_file => '/var/lock/container.lock';
+ "object":
+ uid => 'swift',
+ gid => 'swift',
+ max_connections => '3',
+ path => '/srv/swift-storage/',
+ read_only => 'false',
+ lock_file => '/var/lock/object.lock';
+ }
# set up swift specific configs
File { owner => swift, group => swift, mode => 0440 }
--
To view, visit https://gerrit.wikimedia.org/r/70846
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b7d4ce3b85c4a98f0d2b2083d821f79c5960f06
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
