Fix network backend.
diff --git a/collectd/_service.sls b/collectd/_service.sls
index ff915e4..c17e26a 100644
--- a/collectd/_service.sls
+++ b/collectd/_service.sls
@@ -131,7 +131,7 @@
- group: root
- mode: 660
- defaults:
- backend: {{ backend|yaml }}
+ network_backend: {{ network_backend|yaml }}
- require:
- file: {{ client.service }}_client_conf_dir
- require_in:
diff --git a/collectd/files/backend/network.conf b/collectd/files/backend/network.conf
index e97c530..e3673a4 100644
--- a/collectd/files/backend/network.conf
+++ b/collectd/files/backend/network.conf
@@ -2,34 +2,14 @@
Globals false
</LoadPlugin>
-{%- for _, backend in client.backend.iteritems() %}
+{%- for _, backend in network_backend.iteritems() %}
<Plugin network>
- {%- if backend.mode == 'client' %}
- Server "{{ backend.host }}" "{{ backend.port }}"
-# <Server "{{ backend.host }}" "{{ backend.port }}">
-# SecurityLevel Encrypt
-# Username "{{ backend.user }}"
-# Password "{{ backend.password }}"
-# </Server>
- TimeToLive 128
- {%- endif %}
- {%- if backend.mode == 'server' %}
- Listen "{{ backend.host }}" "{{ backend.port }}"
-# <Listen "{{ backend.host }}" "{{ backend.port }}">
-# SecurityLevel Sign
-# AuthFile "/etc/collectd/passwd"
-# Interface "{{ backend.interface }}"
-# </Listen>
- MaxPacketSize 1024
- {%- endif %}
-
-# # proxy setup (client and server as above):
-# Forward true
-#
-# # statistics about the network backend itself
-# ReportStats false
-#
-# # "garbage collection"
-# CacheFlush 1800
+ {%- if backend.get('mode', 'client') == 'client' %}
+ Server "{{ backend.host }}" "{{ backend.port }}"
+ {%- endif %}
+ {%- if backend.get('mode', 'client') == 'server' %}
+ Listen "{{ backend.host }}" "{{ backend.port }}"
+ MaxPacketSize 1024
+ {%- endif %}
</Plugin>
{%- endfor %}