icinga2: Move configuration into zones.d/master to make Icinga happy

Signed-off-by: Maximilian Wilhelm <max@sdn.clinic>

icinga2/icinga2.conf.H_icinga2.in.ffho.net

@@ -56,6 +56,3 @@ include_recursive "conf.d"
 
 # Include command defintions
 include_recursive "commands.d"
-
-# Include FFHO server configuration
-include_recursive "ffho-conf.d"

icinga2/init.sls

@@ -166,6 +166,15 @@ ffho-plugins:
 ################################################################################
 {% if 'icinga2server' in roles %}
 
+# Link ffho-conf.d as master zone
+/etc/icinga2/zones.d/master:
+  file.symlink:
+    - target: "/etc/icinga2/ffho-conf.d/"
+    - require:
+      - pkg: icinga2
+    - watch_in:
+      - service: icinga2
+
 # Users and Notifications
 /etc/icinga2/ffho-conf.d/users.conf:
   file.managed: