finer grained states and prometheus nginx

base/packages/openhab/init.sls

@@ -6,6 +6,8 @@ include:
   #- haproxy
   - nginx
   - systemd.units
+  - .pkg
+  - .prometheus
   
 openhab2-pkgs:
   pkg.installed:
@@ -16,34 +18,7 @@ openhab2-pkgs:
      - libopenzwave1.5
      - gunicorn3
      - python3
-     - prometheus-haproxy-exporter
+     - prometheus-nginx-exporter
    - require:
      - pkgrepo: repo_openhab2
 
-repo_openhab2:
-  pkgrepo.managed:
-    #- name: deb https://dl.bintray.com/openhab/apt-repo2 stable main
-    - name: deb https://openhab.jfrog.io/openhab/openhab-linuxpkg testing main
-    - file: /etc/apt/sources.list.d/openhab2.list
-    - key_url: 'https://bintray.com/user/downloadSubjectPublicKey?username=openhab'
-    - clean_file: False
-
-openhab-prometheus-exporter:
-  file.managed:
-     - name: /usr/local/bin/openhab2-prometheus-exporter.py
-     - source: https://raw.githubusercontent.com/zoide/openhab2-prometheus-exporter/master/openhab2-exporter.py
-     - source_hash: b6d1114af7418aff2d047c0ffc127f5adf0e4122 
-     - user: openhab
-     - group: openhab
-     - mode: 0755
-
-etc-apt-apt.conf-noproxy:
-  file.managed:
-    - name: /etc/apt/apt.conf.d/99-openhab2-noproxy
-    - user: root
-    - group: root
-    - mode: 0755
-    - contents: |
-        #SALT managed
-        Acquire::http::proxy::dl.bintray.com "DIRECT";
-        Acquire::http::proxy::openhab.jfrog.io "DIRECT";