From b59a981e1a80531451dae5ff15899e1121030797 Mon Sep 17 00:00:00 2001
From: do <do@maketank.net>
Date: Fri, 13 Nov 2020 21:26:54 +0100
Subject: [PATCH]  openhab3 now

---
 packages/openhab2.sls | 89 -------------------------------------------
 top.sls               | 14 ++++---
 2 files changed, 8 insertions(+), 95 deletions(-)
 delete mode 100644 packages/openhab2.sls

diff --git a/packages/openhab2.sls b/packages/openhab2.sls
deleted file mode 100644
index 6b2e066..0000000
--- a/packages/openhab2.sls
+++ /dev/null
@@ -1,89 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
----
-
-haproxy:
-  enabled: True
-  overwrite: True
-  global:
-    stats:
-      enable: True
-      socketpath: /var/lib/haproxy/stats
-      mode: 660
-      level: admin
-      # Optional extra bind parameter, for example to set the owner/group on the socket file
-      extra: user haproxy group haproxy
-    ssl-default-bind-ciphers: "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384"
-    ssl-default-bind-options: "no-sslv3 no-tlsv10 no-tlsv11"
-    user: haproxy
-    group: haproxy
-    chroot:
-      enable: True
-      path: /var/lib/haproxy
-    daemon: True
-  defaults:
-    stats:
-      - enable
-      - uri: '/admin?stats'
-      - realm: 'Haproxy\ Statistics'
-      - auth: 'admin1:AdMiN123'
-    errorfiles:
-      400: /etc/haproxy/errors/400.http
-      403: /etc/haproxy/errors/403.http
-      408: /etc/haproxy/errors/408.http
-      500: /etc/haproxy/errors/500.http
-      502: /etc/haproxy/errors/502.http
-      503: /etc/haproxy/errors/503.http
-      504: /etc/haproxy/errors/504.http
-  resolvers:
-    local_dns:
-      options:
-        - nameserver resolvconf 192.168.10.1:53
-        - resolve_retries 3
-        - timeout retry 1s
-        - hold valid 10s
-  listens:
-    stats:
-      bind:
-        - "0.0.0.0:8998"
-      mode: http
-      stats:
-        enable: True
-        uri: "/admin?stats"
-        refresh: "20s"
-  frontends:
-    frontend1:
-      name: openhab 
-      bind: "*:80"
-      default_backend: openhab-back 
-      acls: 
-        - host_openhab  hdr_beg(host) -i auto.
-      use_backends: 
-        - openhab-back if host_openhab
-  backends:
-    backend1:
-      name: openhab-back 
-      balance: roundrobin
-      servers:
-        server1:
-          name: auto01.chaos 
-          host: 127.0.0.1
-          port: 8080
-          check: check
-          
-systemd:
-  service:
-   openhab2-prometheus-exporter:
-      Unit:
-        Description: OpenHAB2 Prometheus exporter
-        Wants: openhab2.service
-      Service:
-        WorkingDirectory: /usr/local/bin
-        ExecStart: /usr/bin/gunicorn3 -w 2 -b 0.0.0.0:9999 openhab2-prometheus-exporter:app
-        Restart: on-failure
-        User: openhab
-        Group: openhab
-      Install:
-         WantedBy: multi-user.target
-         Alias: openhab2-prometheus
-        
diff --git a/top.sls b/top.sls
index 50107c3..54894d5 100644
--- a/top.sls
+++ b/top.sls
@@ -8,11 +8,6 @@ base:
     - saltmine
     - prometheus.node_exporter
       #- ceph
-  'riot01*':
-    - haproxy
-    - grafana
-    - prometheus.prometheus
-    - base.log.rsyslog.client 
   'G@osarch:arm64 or G@osarch:armel':
     - match: compound 
     - base.log.rsyslog.client 
@@ -24,8 +19,15 @@ base:
   'kubeadm*':
     - k8s
   'auto*':
-    - packages.openhab2
+    - packages.openhab
 
+#old
+  'riot01*':
+    - haproxy
+    - grafana
+    - prometheus.prometheus
+    - base.log.rsyslog.client 
+ 
 
 #'pine03*':
   #  - prometheus.prometheus