From 253febe25cd5c69d6dcefbc4bc9f9cc12ab31329 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Wed, 19 Apr 2017 09:31:32 +0200 Subject: [PATCH] Drop max connections from rsyncd configs We have an indepdendent connection limit in systemd. So drop the ones from rsyncd configs. --- modules/roles/files/bugs_mirror/rsyncd.conf | 1 - modules/roles/files/dakmaster/rsyncd.conf | 1 - modules/roles/files/historical_mirror/rsyncd.conf | 1 - modules/roles/files/keyring/rsyncd.conf | 1 - modules/roles/files/ports_master/rsyncd.conf | 1 - modules/roles/files/security_master/rsyncd.conf | 1 - modules/roles/files/security_mirror/rsyncd.conf | 1 - modules/roles/files/wiki/rsyncd.conf | 1 - modules/roles/templates/snapshot/rsyncd.conf.erb | 1 - modules/roles/templates/syncproxy/rsyncd.conf.erb | 1 - 10 files changed, 10 deletions(-) diff --git a/modules/roles/files/bugs_mirror/rsyncd.conf b/modules/roles/files/bugs_mirror/rsyncd.conf index 008e1b12f..da19e5aaf 100644 --- a/modules/roles/files/bugs_mirror/rsyncd.conf +++ b/modules/roles/files/bugs_mirror/rsyncd.conf @@ -1,6 +1,5 @@ uid = nobody gid = nogroup -max connections = 20 syslog facility = daemon socket options = SO_KEEPALIVE timeout = 7200 diff --git a/modules/roles/files/dakmaster/rsyncd.conf b/modules/roles/files/dakmaster/rsyncd.conf index 46d4f60ae..fc658ac82 100644 --- a/modules/roles/files/dakmaster/rsyncd.conf +++ b/modules/roles/files/dakmaster/rsyncd.conf @@ -1,6 +1,5 @@ uid = nobody gid = nogroup -max connections = 25 syslog facility = daemon socket options = SO_KEEPALIVE timeout = 7200 diff --git a/modules/roles/files/historical_mirror/rsyncd.conf b/modules/roles/files/historical_mirror/rsyncd.conf index 976bb13c3..eb7ad9e2a 100644 --- a/modules/roles/files/historical_mirror/rsyncd.conf +++ b/modules/roles/files/historical_mirror/rsyncd.conf @@ -1,6 +1,5 @@ uid = nobody gid = nogroup -max connections = 25 syslog facility = daemon socket options = SO_KEEPALIVE timeout = 7200 diff --git a/modules/roles/files/keyring/rsyncd.conf b/modules/roles/files/keyring/rsyncd.conf index 782329249..1cf061e0c 100644 --- a/modules/roles/files/keyring/rsyncd.conf +++ b/modules/roles/files/keyring/rsyncd.conf @@ -1,6 +1,5 @@ uid = nobody gid = nogroup -max connections = 25 syslog facility = daemon log file = /var/log/rsyncd/rsyncd.log socket options = SO_KEEPALIVE diff --git a/modules/roles/files/ports_master/rsyncd.conf b/modules/roles/files/ports_master/rsyncd.conf index 292250f2e..b9a5ef7d0 100644 --- a/modules/roles/files/ports_master/rsyncd.conf +++ b/modules/roles/files/ports_master/rsyncd.conf @@ -1,6 +1,5 @@ uid = nobody gid = nogroup -max connections = 25 syslog facility = daemon socket options = SO_KEEPALIVE reverse lookup = false diff --git a/modules/roles/files/security_master/rsyncd.conf b/modules/roles/files/security_master/rsyncd.conf index c944fd185..1de64eb24 100644 --- a/modules/roles/files/security_master/rsyncd.conf +++ b/modules/roles/files/security_master/rsyncd.conf @@ -1,6 +1,5 @@ uid = nobody gid = nogroup -max connections = 20 syslog facility = daemon socket options = SO_KEEPALIVE timeout = 7200 diff --git a/modules/roles/files/security_mirror/rsyncd.conf b/modules/roles/files/security_mirror/rsyncd.conf index 47f1f1c11..851e6aae8 100644 --- a/modules/roles/files/security_mirror/rsyncd.conf +++ b/modules/roles/files/security_mirror/rsyncd.conf @@ -1,6 +1,5 @@ uid = nobody gid = nogroup -max connections = 20 syslog facility = daemon socket options = SO_KEEPALIVE timeout = 1200 diff --git a/modules/roles/files/wiki/rsyncd.conf b/modules/roles/files/wiki/rsyncd.conf index 8b65a7165..c33c3a830 100644 --- a/modules/roles/files/wiki/rsyncd.conf +++ b/modules/roles/files/wiki/rsyncd.conf @@ -1,6 +1,5 @@ uid = nobody gid = nogroup -max connections = 25 syslog facility = daemon log file = /var/log/rsyncd/rsyncd.log socket options = SO_KEEPALIVE diff --git a/modules/roles/templates/snapshot/rsyncd.conf.erb b/modules/roles/templates/snapshot/rsyncd.conf.erb index 4f809f6ec..277db96a0 100644 --- a/modules/roles/templates/snapshot/rsyncd.conf.erb +++ b/modules/roles/templates/snapshot/rsyncd.conf.erb @@ -1,6 +1,5 @@ uid = nobody gid = nogroup -max connections = 20 syslog facility = daemon socket options = SO_KEEPALIVE timeout = 7200 diff --git a/modules/roles/templates/syncproxy/rsyncd.conf.erb b/modules/roles/templates/syncproxy/rsyncd.conf.erb index a04eeae7a..c3628ad40 100644 --- a/modules/roles/templates/syncproxy/rsyncd.conf.erb +++ b/modules/roles/templates/syncproxy/rsyncd.conf.erb @@ -1,6 +1,5 @@ uid = nobody gid = nogroup -max connections = 30 syslog facility = daemon socket options = SO_KEEPALIVE timeout = 7200 -- 2.20.1