removed obsolete openhab stuff

2023-03-06 19:30:58 +01:00
parent 55f76a93c8
commit 67952bf6be
9 changed files with 542 additions and 333 deletions
--- a/base/packages/FreeCAD.sls
+++ b/base/packages/FreeCAD.sls
@@ -43,7 +43,6 @@ pkg_FreeCAD:
      - libqt5xmlpatterns5-dev
      - libshiboken2-dev
      - libspnav-dev
-      - libvtk7-dev
      - libx11-dev
      - libxerces-c-dev
      - libzipios++-dev
@@ -68,7 +67,7 @@ pkg_FreeCAD:
      - qttools5-dev
      - swig
      - libmetis-dev
-      - python3-pyside2.qtscriptools
+      - python3-pyside2.qtscripttools
      - python3-pyside2.qtuitools
      - pyside2-tools
      - libshiboken2-dev
--- a/base/packages/openhab/files/socat.init
+++ b/base/packages/openhab/files/socat.init
@@ -1,95 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          ser2net-client 
-# Required-Start:    $local_fs $time $network $named
-# Required-Stop:     $local_fs $time $network $named
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Start/stop (socat a multipurpose relay)
-#
-# Description: The socat init script will start/stop socat as specified in /etc/default/socat 
-#              Then log (FATAL,ERROR,WARN,INFO and Notic) in /var/log/socat.log
-### END INIT INFO
-
-NAME=ser2net-client
-DAEMON=/usr/bin/socat
-# -d -d -d for more logging
-SOCAT_DEFAULTS='-lf /var/log/ser2net-client.log'
-
-. /lib/lsb/init-functions
-. /etc/default/${NAME}
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-[ -x $DAEMON ] || exit 0
-
-start_socat() {
-        start-stop-daemon --oknodo --quiet --start \
-                --pidfile /run/ser2net-client.pid \
-                --background --make-pidfile \
-                --exec $DAEMON -- $SOCAT_DEFAULTS $OPTIONS < /dev/null
-}
-
-stop_socat() {
-        start-stop-daemon --oknodo --stop --quiet --pidfile /run/ser2net-client.pid --exec $DAEMON
-        rm -f /run/ser2net-client.pid
-}
-
-start () {
-        start_socat
-        return $?
-}
-
-stop () {
-        for PIDFILE in `ls /run/ser2net-client.pid 2> /dev/null`; do
-                NAME=`echo $PIDFILE | cut -c16-`
-                NAME=${NAME%%.pid}
-                stop_socat
-        done
-}
-
-case "$1" in
-    start)
-	    log_daemon_msg "Starting multipurpose relay" "ser2net-client" 
-	    if start ; then
-		    log_end_msg $?
-	    else
-		    log_end_msg $?
-	    fi
-	    ;;
-    stop)
-	    log_daemon_msg "Stopping multipurpose relay" "ser2net-client"
-            if stop ; then
-                   log_end_msg $?
-	   else
-		   log_end_msg $?
-	   fi
-	   ;;
-    restart)
-	    log_daemon_msg "Restarting multipurpose relay" "ser2net-client"
-            stop
-            if start ; then
-		    log_end_msg $?
-	    else
-		    log_end_msg $?
-	    fi
-	    ;;
-    reload|force-reload)
-	    log_daemon_msg "Reloading multipurpose relay" "ser2net-client"
-	    stop
-	    if start ; then
-		    log_end_msg $?
-	    else
-		    log_end_msg $?
-	    fi
-	    ;;
-    status)
-            status_of_proc -p /run/ser2net-client.pid /usr/bin/socat socat && exit 0 || exit $?
-	    ;;
-    *)
-        echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload|force-reload|status}"
-        exit 3
-        ;;
-esac
-
-exit 0
--- a/base/packages/openhab/init.sls
+++ b/base/packages/openhab/init.sls
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
---
-
-include:
-  #- haproxy
-  - nginx
-  - systemd.units
-  - .pkg
-  - .prometheus
-  
-openhab2-pkgs:
-  pkg.installed:
-   - pkgs:
-     - openhab
-     - openhab-addons
-     - default-jre-headless
-     - libopenzwave1.5
-     - gunicorn3
-     - python3
-     - prometheus-nginx-exporter
-   - require:
-     - pkgrepo: repo_openhab2
-
--- a/base/packages/openhab/pkg.sls
+++ b/base/packages/openhab/pkg.sls
@@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
---
-
-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
-    
-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";
-        
--- a/base/packages/openhab/prometheus.sls
+++ b/base/packages/openhab/prometheus.sls
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
---
-
-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: 399ba098b46abe482ce3be57484bf401d4d5a600 
-     - user: openhab
-     - group: openhab
-     - mode: 0755
-
-prometheus-nginx-exporter:
-  service.running:
-    - enable: True
-    - watch:
-      - file: etc-default-prometheus-nginx-exporter
-
-etc-default-prometheus-nginx-exporter:
-  file.managed:
-    - name: /etc/default/prometheus-nginx-exporter
-    - contents: |
-        #SALT managed
-        ARGS="-nginx.scrape-uri http://127.0.0.1:80/stub_status"
--- a/base/packages/openhab/ser2net_client.sls
+++ b/base/packages/openhab/ser2net_client.sls
@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
---
-
-ser2net_client-pkgs:
-  pkg.installed:
-    - pkgs:
-      - socat
-
-ser2net_socat-conf:
-  file.managed:
-    - name: /etc/default/ser2net-client
-    - user: root
-    - mode: 0644
-    - contents: |
-        #SALT managed
-        OPTIONS="pty,link=/dev/ttySER2NET0,raw,user=openhab,group=dialout,mode=660 tcp:auto:3333"
-
-ser2net_socat-init:
-  file.managed:
-    - name: /etc/init.d/ser2net-client
-    - user: root
-    - mode: 0740
-    - source: salt://base/packages/openhab/files/socat.init
-
-ser2net_socat-service:
-  service.running:
-    - name: ser2net-client
-    - enable: True
-    - reload: True
-    - require:
-      - file: /etc/init.d/ser2net-client
-    - watch:
-      - file: /etc/default/ser2net-client    
--- a/base/packages/openhab/ser2net_server.sls
+++ b/base/packages/openhab/ser2net_server.sls
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
---
-# manually installed from
-#https://github.com/longshine/ser2nets
-
-ser2net_server-pkgs:
-  pkg.installed:
-    - pkgs:
-      - ser2net
-      
-ser2net-conf:
-  file.managed:
-    - name: /etc/ser2net.conf
-    - user: root
-    - mode: 0644
-    - contents: |
-        #SALT managed
-        3333:raw:0:/dev/ttyAMA0:115200 8DATABITS NONE 1STOPBIT
-
-ser2net-service:
-  service.running:
-    - name: ser2net
-    - enable: True
-    - reload: True
-    - require:
-      - file: /etc/ser2net.conf
-    - watch:
-      - file: /etc/ser2net.conf
-      
--- a/base/packages/repo/debian.sls
+++ b/base/packages/repo/debian.sls
@@ -34,7 +34,8 @@ repo_debian:
    - name: 'deb http://{{ cache_url }}deb.debian.org/debian {{ os_rel }} main contrib #non-free'
    - file: /etc/apt/sources.list.d/debian.list
    - clean_file: True
-
+    
+{% if grains['oscodename] == 'bullseye' %}}
 repo_debian-updates:
  pkgrepo.managed:
    - name: 'deb http://{{ cache_url }}deb.debian.org/debian {{ os_rel }}-updates main contrib #non-free'
@@ -59,4 +60,5 @@ repo_debian-backports:
    - name: 'deb http://{{ cache_url }}deb.debian.org/debian {{ os_rel }}-backports main contrib #non-free'
    - file: /etc/apt/sources.list.d/debian-backports.list
    - clean_file: True
-{% endif %}    
+{% endif %}
+{% endif %}