Provide checkmk vendor files in formula

checkmk/debian.sls

@@ -2,15 +2,25 @@ hsh_checkmk_install_xinetd:
   pkg.installed:
     - name: xinetd
 
-# TODO: This may be improved since the deb file is really small until now!
 hsh_checkmk_fetch_package:
+  file.managed:
+    - name: /tmp/checkmk.deb
+    - source: salt://checkmk/checkmk-files/check-mk-agent_1.5.0p20-1_all.deb
+    - user: root
+    - group: wheel
+    - mode: 755
+    - require:
+      - file: hsh_checkmk_plugin_dir
+
+hsh_checkmk_install_package:
   cmd.run:
-    - name: wget http://salt.it.hs-hannover.de/check-mk-agent_1.5.0p20-1_all.deb -O check_mk.deb; dpkg -i check_mk.deb
+    - name: dpkg -i /tmp/checkmk.deb
     - user: root
     - group: root
     - cwd: /tmp
     - require:
       - pkg: hsh_checkmk_install_xinetd
+      - file: hsh_checkmk_fetch_package
 
 hsh_checkmk_set_config:
   file.managed:

checkmk/freebsd.sls

@@ -26,7 +26,7 @@ hsh_checkmk_configure_inetd:
 hsh_checkmk_install_agent:
   file.managed:
     - name: /usr/local/bin/checkmk_agent
-    - source: salt://checkmk/freebsd/checkmk_agent.freebsd
+    - source: salt://checkmk/checkmk-files/checkmk_agent.freebsd
     - user: root
     - group: wheel
     - mode: 755
@@ -77,7 +77,7 @@ hsh_checkmk_plugin_dir:
 hsh_checkmk_install_haproxy_plugin:
   file.managed:
     - name: /usr/lib/checkmk_agent/plugins/mk_haproxy
-    - source: salt://checkmk/freebsd/mk_haproxy.freebsd
+    - source: salt://checkmk/checkmk-files/mk_haproxy.freebsd
     - user: root
     - group: wheel
     - mode: 755