removed obsolete openhab stuff

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

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

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
-

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";
-        

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"

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    

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
-      

base/packages/repo/debian.sls

@@ -35,6 +35,7 @@ repo_debian:
     - 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'
@@ -60,3 +61,4 @@ repo_debian-backports:
     - file: /etc/apt/sources.list.d/debian-backports.list
     - clean_file: True
 {% endif %}
+{% endif %}

roles/mpd/files/mpd.conf

@@ -1,8 +1,401 @@
+###
+### SALT managed
+###
+
+
 # An example configuration file for MPD.
 # Read the user manual for documentation: http://www.musicpd.org/doc/user/
 # or /usr/share/doc/mpd/html/user.html
 
 
+# Files and directories #######################################################
+#
+# This setting controls the top directory which MPD will search to discover the
+# available audio files and add them to the daemon's online database. This
+# setting defaults to the XDG directory, otherwise the music directory will be
+# be disabled and audio files will only be accepted over ipc socket (using
+# file:// protocol) or streaming files over an accepted protocol.
+#
+music_directory     "/net/tumor.chaos/srv/pub/Music"
+#
+# This setting sets the MPD internal playlist directory. The purpose of this
+# directory is storage for playlists created by MPD. The server will use
+# playlist files not created by the server but only if they are in the MPD
+# format. This setting defaults to playlist saving being disabled.
+#
+playlist_directory      "/var/lib/mpd/playlists"
+#
+# This setting sets the location of the MPD database. This file is used to
+# load the database at server start up and store the database while the
+# server is not up. This setting defaults to disabled which will allow
+# MPD to accept files over ipc socket (using file:// protocol) or streaming
+# files over an accepted protocol.
+#
+db_file         "/var/lib/mpd/tag_cache"
+#
+# These settings are the locations for the daemon log files for the daemon.
+# These logs are great for troubleshooting, depending on your log_level
+# settings.
+#
+# The special value "syslog" makes MPD use the local syslog daemon. This
+# setting defaults to logging to syslog.
+#
+# If you use systemd, do not configure a log_file.  With systemd, MPD
+# defaults to the systemd journal, which is fine.
+#
+#log_file           "/var/log/mpd/mpd.log"
+
+# This setting sets the location of the file which stores the process ID
+# for use of mpd --kill and some init scripts. This setting is disabled by
+# default and the pid file will not be stored.
+#
+# If you use systemd, do not configure a pid_file.
+#
+#pid_file           "/run/mpd/pid"
+
+# This setting sets the location of the file which contains information about
+# most variables to get MPD back into the same general shape it was in before
+# it was brought down. This setting is disabled by default and the server
+# state will be reset on server start up.
+#
+state_file          "/var/lib/mpd/state"
+#
+# The location of the sticker database.  This is a database which
+# manages dynamic information attached to songs.
+#
+sticker_file                   "/var/lib/mpd/sticker.sql"
+#
+###############################################################################
+
+
+# General music daemon options ################################################
+#
+# This setting specifies the user that MPD will run as. MPD should never run as
+# root and you may use this setting to make MPD change its user ID after
+# initialization. This setting is disabled by default and MPD is run as the
+# current user.
+#
+user                "mpd"
+#
+# This setting specifies the group that MPD will run as. If not specified
+# primary group of user specified with "user" setting will be used (if set).
+# This is useful if MPD needs to be a member of group such as "audio" to
+# have permission to use sound card.
+#
+#group              "nogroup"
+#
+# This setting sets the address for the daemon to listen on. Careful attention
+# should be paid if this is assigned to anything other than the default, any.
+# This setting can deny access to control of the daemon. Not effective if
+# systemd socket activation is in use.
+#
+# For network
+bind_to_address     "0.0.0.0"
+#
+# And for Unix Socket
+#bind_to_address        "/run/mpd/socket"
+#
+# This setting is the TCP port that is desired for the daemon to get assigned
+# to.
+#
+#port               "6600"
+#
+# Suppress all messages below the given threshold.  Use "verbose" for
+# troubleshooting. Available setting arguments are "notice", "info", "verbose",
+# "warning" and "error".
+#
+log_level           "warning"
+#
+# Setting "restore_paused" to "yes" puts MPD into pause mode instead
+# of starting playback after startup.
+#
+#restore_paused "no"
+#
+# This setting enables MPD to create playlists in a format usable by other
+# music players.
+#
+#save_absolute_paths_in_playlists   "no"
+#
+# This setting defines a list of tag types that will be extracted during the
+# audio file discovery process. The complete list of possible values can be
+# found in the user manual.
+#metadata_to_use    "artist,album,title,track,name,genre,date,composer,performer,disc"
+#
+# This example just enables the "comment" tag without disabling all
+# the other supported tags:
+#metadata_to_use "+comment"
+#
+# This setting enables automatic update of MPD's database when files in
+# music_directory are changed.
+#
+#auto_update    "yes"
+#
+# Limit the depth of the directories being watched, 0 means only watch
+# the music directory itself.  There is no limit by default.
+#
+#auto_update_depth "3"
+#
+###############################################################################
+
+
+# Symbolic link behavior ######################################################
+#
+# If this setting is set to "yes", MPD will discover audio files by following
+# symbolic links outside of the configured music_directory.
+#
+#follow_outside_symlinks    "yes"
+#
+# If this setting is set to "yes", MPD will discover audio files by following
+# symbolic links inside of the configured music_directory.
+#
+#follow_inside_symlinks     "yes"
+#
+###############################################################################
+
+
+# Zeroconf / Avahi Service Discovery ##########################################
+#
+# If this setting is set to "yes", service information will be published with
+# Zeroconf / Avahi.
+#
+#zeroconf_enabled       "yes"
+#
+# The argument to this setting will be the Zeroconf / Avahi unique name for
+# this MPD server on the network. %h will be replaced with the hostname.
+#
+#zeroconf_name          "Music Player @ %h"
+#
+###############################################################################
+
+
+# Permissions #################################################################
+#
+# If this setting is set, MPD will require password authorization. The password
+# setting can be specified multiple times for different password profiles.
+#
+#password                        "password@read,add,control,admin"
+#
+# This setting specifies the permissions a user has who has not yet logged in.
+#
+#default_permissions             "read,add,control,admin"
+#
+###############################################################################
+
+
+# Database #######################################################################
+#
+# An example of a database section instead of the old 'db_file' setting.
+# It enables mounting other storages into the music directory.
+#
+#database {
+#       plugin "simple"
+#       path "/var/lib/mpd/tag_cache"
+#       cache_directory "/var/lib/mpd/cache"
+#}
+#
+# An example of database config for a satellite setup
+#
+#music_directory "nfs://fileserver.local/srv/mp3"
+#database {
+#       plugin "proxy"
+#       host "other.mpd.host"
+#       port "6600"
+#}
+
+# Input #######################################################################
+#
+input {
+        plugin "curl"
+#       proxy "proxy.isp.com:8080"
+#       proxy_user "user"
+#       proxy_password "password"
+}
+
+# Decoder #####################################################################
+#
+
+decoder {
+        plugin                  "hybrid_dsd"
+        enabled                 "no"
+#       gapless                 "no"
+}
+decoder {
+        plugin        "wildmidi"
+        enabled       "no"
+        #config_file "/etc/timidity/timidity.cfg"
+}
+
+#
+###############################################################################
+
+# Audio Output ################################################################
+#
+# MPD supports various audio output types, as well as playing through multiple
+# audio outputs at the same time, through multiple audio_output settings
+# blocks. Setting this block is optional, though the server will only attempt
+# autodetection for one sound card.
+#
+# An example of an ALSA output:
+#
+audio_output {
+    type "pipewire"
+    name "Pipewire"
+#   target "name" #Link to the given target. If not specified, 
+                  # let the PipeWire manager select a target. 
+                  # To get a list of available targets, type pw-cli dump short Node
+#   remote "name"
+    dsd    "no" #Enable DSD playback. This requires PipeWire 0.38.
+
+}
+
+#audio_output {
+#   type        "alsa"
+#   name        "My ALSA Device"
+##  device      "hw:0,0"    # optional
+##  mixer_type      "hardware"  # optional
+##  mixer_device    "default"   # optional
+##  mixer_control   "PCM"       # optional
+##  mixer_index "0"     # optional
+#}
+#
+# An example of an OSS output:
+#
+#audio_output {
+#   type        "oss"
+#   name        "My OSS Device"
+##  device      "/dev/dsp"  # optional
+##  mixer_type      "hardware"  # optional
+##  mixer_device    "/dev/mixer"    # optional
+##  mixer_control   "PCM"       # optional
+#}
+#
+# An example of a shout output (for streaming to Icecast):
+#
+#audio_output {
+#   type        "shout"
+#   encoder     "vorbis"        # optional
+#   name        "My Shout Stream"
+#   host        "localhost"
+#   port        "8000"
+#   mount       "/mpd.ogg"
+#   password    "hackme"
+#   quality     "5.0"
+#   bitrate     "128"
+#   format      "44100:16:1"
+##  protocol    "icecast2"      # optional
+##  user        "source"        # optional
+##  description "My Stream Description" # optional
+##  url     "http://example.com"    # optional
+##  genre       "jazz"          # optional
+##  public      "no"            # optional
+##  timeout     "2"         # optional
+##  mixer_type      "software"      # optional
+#}
+#
+# An example of a recorder output:
+#
+#audio_output {
+#   type        "recorder"
+#   name        "My recorder"
+#   encoder     "vorbis"        # optional, vorbis or lame
+#   path        "/var/lib/mpd/recorder/mpd.ogg"
+##  quality     "5.0"           # do not define if bitrate is defined
+#   bitrate     "128"           # do not define if quality is defined
+#   format      "44100:16:1"
+#}
+#
+# An example of a httpd output (built-in HTTP streaming server):
+#
+#audio_output {
+#   type        "httpd"
+#   name        "My HTTP Stream"
+#   encoder     "vorbis"        # optional, vorbis or lame
+#   port        "8000"
+#   bind_to_address "0.0.0.0"       # optional, IPv4 or IPv6
+##  quality     "5.0"           # do not define if bitrate is defined
+#   bitrate     "128"           # do not define if quality is defined
+#   format      "44100:16:1"
+#   max_clients "0"         # optional 0=no limit
+#}
+#
+# An example of a pulseaudio output (streaming to a remote pulseaudio server)
+# Please see README.Debian if you want mpd to play through the pulseaudio
+# daemon started as part of your graphical desktop session!
+#
+#audio_output {
+#   type        "pulse"
+#   name        "My Pulse Output"
+##  server      "remote_server"     # optional
+##  sink        "remote_server_sink"    # optional
+##  media_role  "media_role"        #optional
+#}
+#
+# An example of a winmm output (Windows multimedia API).
+#
+#audio_output {
+#   type        "winmm"
+#   name        "My WinMM output"
+##  device      "Digital Audio (S/PDIF) (High Definition Audio Device)" # optional
+#       or
+##  device      "0"     # optional
+##  mixer_type  "hardware"  # optional
+#}
+#
+# An example of an openal output.
+#
+#audio_output {
+#   type        "openal"
+#   name        "My OpenAL output"
+##  device      "Digital Audio (S/PDIF) (High Definition Audio Device)" # optional
+#}
+#
+# An example of an sndio output.
+#
+#audio_output {
+#   type        "sndio"
+#   name        "sndio output"
+#   mixer_type  "hardware"
+#}
+#
+# An example of an OS X output:
+#
+#audio_output {
+#   type        "osx"
+#   name        "My OS X Device"
+##  device      "Built-in Output"   # optional
+##  channel_map      "-1,-1,0,1"    # optional
+#}
+#
+## Example "pipe" output:
+#
+#audio_output {
+#   type        "pipe"
+#   name        "my pipe"
+#   command     "aplay -f cd 2>/dev/null"
+## Or if you're want to use AudioCompress
+#   command     "AudioCompress -m | aplay -f cd 2>/dev/null"
+## Or to send raw PCM stream through PCM:
+#   command     "nc example.org 8765"
+#   format      "44100:16:2"
+#}
+#
+## An example of a null output (for no audio output):
+#
+#audio_output {
+#   type        "null"
+#   name        "My Null Output"
+#   mixer_type      "none"          # optional
+#}
+#
+###############################################################################
+
+
+# Normalization automatic volume adjustments ##################################
+## An example configuration file for MPD.
+# Read the user manual for documentation: http://www.musicpd.org/doc/user/
+# or /usr/share/doc/mpd/html/user.html
+
+
 # Files and directories #######################################################
 #
 # This setting controls the top directory which MPD will search to discover the
@@ -409,3 +802,49 @@ audio_output {
 filesystem_charset      "UTF-8"
 #
 ###############################################################################
+
+# This setting specifies the type of ReplayGain to use. This setting can have
+# the argument "off", "album", "track" or "auto". "auto" is a special mode that
+# chooses between "track" and "album" depending on the current state of
+# random playback. If random playback is enabled then "track" mode is used.
+# See <https://wiki.hydrogenaud.io/index.php?title=Replaygain> for
+# more details about ReplayGain.
+# This setting is off by default.
+#
+#replaygain         "album"
+#
+# This setting sets the pre-amp used for files that have ReplayGain tags. By
+# default this setting is disabled.
+#
+#replaygain_preamp      "0"
+#
+# This setting sets the pre-amp used for files that do NOT have ReplayGain tags.
+# By default this setting is disabled.
+#
+#replaygain_missing_preamp  "0"
+#
+# This setting enables or disables ReplayGain limiting.
+# MPD calculates actual amplification based on the ReplayGain tags
+# and replaygain_preamp / replaygain_missing_preamp setting.
+# If replaygain_limit is enabled MPD will never amplify audio signal
+# above its original level. If replaygain_limit is disabled such amplification
+# might occur. By default this setting is enabled.
+#
+#replaygain_limit       "yes"
+#
+# This setting enables on-the-fly normalization volume adjustment. This will
+# result in the volume of all playing audio to be adjusted so the output has
+# equal "loudness". This setting is disabled by default.
+#
+#volume_normalization       "no"
+#
+###############################################################################
+
+# Character Encoding ##########################################################
+#
+# If file or directory names do not display correctly for your locale then you
+# may need to modify this setting.
+#
+filesystem_charset      "UTF-8"
+#
+###############################################################################