diff --git a/conf/rsyncd.conf b/conf/rsyncd.conf
index c592ae9..9aec015 100644
--- a/conf/rsyncd.conf
+++ b/conf/rsyncd.conf
@@ -1,83 +1,16 @@
-uid = <your-user-name>
-gid = <your-user-name>
+{% from "rsync/map.jinja" import server with context %}
+
+uid = {{ server.user }}
+gid = {{ server.group }}
 log file = /var/log/rsyncd.log
 pid file = /var/run/rsyncd.pid
-address = 127.0.0.1
+address = {{ server.bind.address }}
 
-
-{%- for server in servers %}
-[{{ server.name}}]
-max connections = {{ server.max_connections }}
-path = /srv/1/node/ {{ server.device }}
-read only = {{ server.read_only }}
-lock file = /var/lock/{{ server.name }}.lock
+{%- for module in server.modules %}
+[{{ module.name}}]
+max connections = {{ module.max_connections }}
+path = /srv/1/node/ {{ module.device }}
+read only = {{ module.read_only }}
+lock file = /var/lock/rsync_{{ module.name }}.lock
 
 {%- endfor %}
-
-{#
-[account6022]
-max connections = 25
-path = /srv/2/node/
-read only = false
-lock file = /var/lock/account6022.lock
-
-[account6032]
-max connections = 25
-path = /srv/3/node/
-read only = false
-lock file = /var/lock/account6032.lock
-
-[account6042]
-max connections = 25
-path = /srv/4/node/
-read only = false
-lock file = /var/lock/account6042.lock
-
-[container6011]
-max connections = 25
-path = /srv/1/node/
-read only = false
-lock file = /var/lock/container6011.lock
-
-[container6021]
-max connections = 25
-path = /srv/2/node/
-read only = false
-lock file = /var/lock/container6021.lock
-
-[container6031]
-max connections = 25
-path = /srv/3/node/
-read only = false
-lock file = /var/lock/container6031.lock
-
-[container6041]
-max connections = 25
-path = /srv/4/node/
-read only = false
-lock file = /var/lock/container6041.lock
-
-[object6010]
-max connections = 25
-path = /srv/1/node/
-read only = false
-lock file = /var/lock/object6010.lock
-
-[object6020]
-max connections = 25
-path = /srv/2/node/
-read only = false
-lock file = /var/lock/object6020.lock
-
-[object6030]
-max connections = 25
-path = /srv/3/node/
-read only = false
-lock file = /var/lock/object6030.lock
-
-[object6040]
-max connections = 25
-path = /srv/4/node/
-read only = false
-lock file = /var/lock/object6040.lock
-#}
\ No newline at end of file