Merge ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:rsync-global-config into ubuntu-mirror-charm:master

[Paul Collins]

move "max connections" and "timeout" to individual modules

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Alexandre Gomes (alejdg)]

+1

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 0d7f8dd803586a4035b8eb35c841dfe590d5259d

diff --git a/hooks/hooks.py b/hooks/hooks.py
index e01f266..ff99b06 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -62,6 +62,7 @@ required_pkgs = [
     'devscripts',   # provides annotate-output
     'logrotate',
     'procmail',     # provides lockfile
+    'rsync',
     'vsftpd',
     'xinetd',
 ]
diff --git a/templates/rsync-base-cfg.tmpl b/templates/rsync-base-cfg.tmpl
index 02f79b8..5e15e00 100644
--- a/templates/rsync-base-cfg.tmpl
+++ b/templates/rsync-base-cfg.tmpl
@@ -7,8 +7,7 @@ gid = nogroup
 pid file = /var/run/rsyncd.pid
 syslog facility = daemon
 socket options = SO_KEEPALIVE
-timeout = 1000
-max connections = ${max_connections}
+timeout = 7200
 motd file = ${motdfile}
 
 &include /etc/rsync-juju.d
diff --git a/templates/rsync-mirrors-cfg.tmpl b/templates/rsync-mirrors-cfg.tmpl
index b74fbc3..c829b99 100644
--- a/templates/rsync-mirrors-cfg.tmpl
+++ b/templates/rsync-mirrors-cfg.tmpl
@@ -13,4 +13,10 @@
   transfer logging = false
   #end if
 
+  # "max connections" is essentially global, due to a shared lock
+  # file, but it and "timeout" are here because a) they're module
+  # settings and b) rsyncd.conf can be clobbered, e.g. by cs:nrpe.
+  max connections = ${max_connections}
+  timeout = 1000
+
 #end for