diff --git a/README.md b/README.md index a021735e7280c0a30d3df25d4f1ea1fdbb598e51..965c3f5a3de43e0bd5cc2052971d619b200ee3d0 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ rsync_server_chroot: true rsync_server_symlinks: false rsync_server_list: false rsync_server_exclude_compress: "*" -rsync_server_log_path: /var/log/rsyncd.log +rsync_server_log_path: "" # sends to syslog, to store locally specify path ex. /var/log/rsyncd.log rsync_server_log_transfer: true rsync_server_log_format: "%o %h [%a] %f %'l" rsync_server_pid_path: /var/run/rsyncd.pid diff --git a/defaults/main.yml b/defaults/main.yml index ffdc32a64be405a8b75c1f33e3a247ab21eb02f6..1414b15f3ae69c8ae7813ffc03d3c114bbff9590 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -6,7 +6,7 @@ rsync_server_chroot: true rsync_server_symlinks: false rsync_server_list: false rsync_server_exclude_compress: "*" -rsync_server_log_path: /var/log/rsyncd.log +rsync_server_log_path: "" # sends to syslog, to store locally specify path ex. /var/log/rsyncd.log rsync_server_log_transfer: true rsync_server_log_format: "%o %h [%a] %f %'l" rsync_server_pid_path: /var/run/rsyncd.pid diff --git a/templates/etc-rsyncd-conf.j2 b/templates/etc-rsyncd-conf.j2 index 7dd60eb45a189149653d938f8c0777c5da15a8a9..ad6868d5640a97afff3aad356f5a7b909a48c497 100644 --- a/templates/etc-rsyncd-conf.j2 +++ b/templates/etc-rsyncd-conf.j2 @@ -22,8 +22,11 @@ uid = {{ rsync_server_uid }} gid = {{ rsync_server_gid }} use chroot = {{ rsync_server_chroot }} -log file = {{ rsync_server_log_path }} +{% if rsync_server_log_path|length %} transfer logging = {{ rsync_server_log_transfer }} +{% endif %} +log file = {{ rsync_server_log_path }} + log format = {{ rsync_server_log_format }} pid file = {{ rsync_server_pid_path }} dont compress = {{ rsync_server_exclude_compress }}