Merge branch 'main' of github.com:romkey/pdxhackerspace-hackstack

romkey · romkey · commit 10f60af55512 · 2025-01-18T08:18:25.000-08:00
diff --git a/.gitignore b/.gitignore
diff --git a/membermatters/.env.example b/membermatters/.env.example
@@ -0,0 +1,13 @@
+BACKUP_DATABASES=postgres://membermatters_user:MEMBERSMATTER_PASSWORD@postgresql/membermatters_db
+
+POSTGRES_USER=membermatters_user
+POSTGRES_PASSWORD=MEMBERSMATTER_PASSWORD
+POSTGRES_DB=membermatters_db
+POSTGRES_HOST=postgresql
+
+MM_ENV: "Production"
+MM_SECRET_KEY: "CHANGE_ME"
+MM_USE_POSTGRES: True
+MM_REDIS_HOST: "redis://mm-redis:6379/0"
+
+CE_BROKER_URL: "redis://mm-redis:6379/0"
diff --git a/membermatters/docker-compose.yml b/membermatters/docker-compose.yml
@@ -0,0 +1,75 @@
+services:
+  mm-redis:
+    image: redis
+    restart: unless-stopped
+    networks:
+      - redis
+
+  mm-webapp:
+    image: membermatters/membermatters
+    restart: unless-stopped
+    env_file:
+      - .env
+    ports:
+      - "8000:8000"
+    depends_on:
+      - mm-redis
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8000"]
+      interval: 5s
+      timeout: 5s
+      retries: 15
+    networks:
+      - proxy
+      - database
+      - redis
+
+  mm-celery-worker:
+    image: membermatters/membermatters
+    restart: unless-stopped
+    env_file:
+      - .env
+    depends_on:
+      - mm-webapp
+      - mm-redis
+    networks:
+      - proxy
+      - database
+      - redis
+
+  mm-celery-beat:
+    image: membermatters/membermatters
+    restart: unless-stopped
+    env_file:
+      - .env
+    depends_on:
+      - mm-webapp
+      - mm-celery-worker
+      - mm-redis
+    networks:
+      - proxy
+      - database
+      - redis
+
+  mm-celery-prom-exporter:
+    image: danihodovic/celery-exporter
+    restart: unless-stopped
+    env_file:
+      - .env
+    depends_on:
+      - mm-celery-worker
+      - mm-redis
+    networks:
+      - proxy
+      - database
+      - redis
+
+networks:
+  proxy:
+    external: true
+    name: nginx-proxy-net
+  database:
+    external: true
+    name: postgres-net
+  redis:
+    name: mm-redis-net
diff --git a/mosquitto/bin/mkuser.sh b/mosquitto/bin/mkuser.sh
@@ -14,15 +14,15 @@ fi
 export USER=$1
 export PASSWORD=`pwgen 24 1`
 
-echo "Will create this user:"
+echo "Creating this user:"
 echo
 echo "username: ${USER}"
 echo "password: ${PASSWORD}"
 echo "broker: mosquitto"
 echo "port: 1883"
 echo "url: mqtt://${USER}:${PASSWORD}@mosquitto:1883"
 echo
-echo "Only usable from within a hackstack container. To use externally, replace 'mosquitto' with the name or IP address of this server"
+echo "Only usable from within a hackstack container. To use externally, replace 'mosquitto' with the name or IP address or name of this server"
 
 echo "creating user:"
 CMD="docker compose -f ../docker-compose.yml exec mosquitto mosquitto_passwd -b /mosquitto/data/mos_passwd ${USER} ${PASSWORD}"
@@ -33,3 +33,10 @@ else
     echo "failed"
 fi
 
+echo "force Mosquitto to reload password file"
+CMD="docker compose -f ../docker-compose.yml exec mosquitto pkill -1 mosquitto"
+if $CMD ; then
+    echo "successful"
+else
+    echo "failed"
+fi
diff --git a/shairport-metadata-display/Dockerfile b/shairport-metadata-display/Dockerfile
@@ -0,0 +1,23 @@
+FROM node:23-alpine
+
+# Set the working directory in the container
+WORKDIR /app
+
+RUN apk add --update --no-cache git file imagemagick
+
+RUN git clone https://github.com/AlainGourves/shairport-metadata-display .
+RUN mkdir /app/public/img
+
+#COPY package*.json ./
+
+# Install Node.js dependencies
+RUN npm install --omit=dev
+
+# Copy the application source code to the container
+COPY . .
+
+# Expose the port if the application uses one (adjust as needed)
+EXPOSE 8080
+
+# Set the default command to run the application
+CMD [ "npm", "start" ]
diff --git a/shairport-metadata-display/docker-compose.yml b/shairport-metadata-display/docker-compose.yml
@@ -0,0 +1,9 @@
+# https://github.com/AlainGourves/shairport-metadata-display
+services:
+  shairport-metadata-display:
+    build: .
+    restart: unless-stopped
+    env_file:
+      - .env
+    volumes:
+      - ../../run/shairport-sync/fifos:/tmp/shairport-sync-metadata
diff --git a/shairport-sync/.gitignore b/shairport-sync/.gitignore
diff --git a/shairport-sync/config/shairport-sync.conf.example b/shairport-sync/config/shairport-sync.conf.example
diff --git a/shairport-sync/docker-compose.yml b/shairport-sync/docker-compose.yml
@@ -3,8 +3,11 @@
 services:
   shairport-sync:
     image: mikebrady/shairport-sync:latest
+    container_name: shairport-sync
+    hostname: shairport-sync
     restart: unless-stopped
     network_mode: host
     devices:
       - /dev/snd:/dev/snd
-      
+    volumes:
+      - ../../run/shairport-sync/fifos:/tmp/shairport-sync-metadata/
diff --git a/snapclient/.env.example b/snapclient/.env.example
@@ -0,0 +1,3 @@
+SOUND_DEVICE=/dev/snd
+# IP address or hostname of snapserver
+HOST=10.0.1.11
diff --git a/snapclient/docker-compose.yml b/snapclient/docker-compose.yml
@@ -0,0 +1,11 @@
+# https://hub.docker.com/r/ivdata/snapclient
+services:
+  snapclient:
+    image: ivdata/snapclient
+    hostname: snapclient
+    container_name: snapclient
+    restart: unless-stopped
+    devices:
+      - ${SOUND_DEVICE}
+    env_file:
+      - .env
diff --git a/snapserver/.env.example b/snapserver/.env.example
@@ -0,0 +1,3 @@
+PUID=1000
+PGID=1000 # set to audio group ID
+TZ=America/Los_Angeles
diff --git a/snapserver/.gitignore b/snapserver/.gitignore
@@ -0,0 +1 @@
+config/snapcast.conf
diff --git a/snapserver/config/snapcast.conf b/snapserver/config/snapcast.conf
@@ -0,0 +1,186 @@
+#######################################################################################
+#     ______                                                                          #
+#    / _____)                                                                         #
+#   ( (____   ____   _____  ____    ___  _____   ____  _   _  _____   ____            #
+#    \____ \ |  _ \ (____ ||  _ \  /___)| ___ | / ___)| | | || ___ | / ___)           #
+#    _____) )| | | |/ ___ || |_| ||___ || ____|| |     \ V / | ____|| |               #
+#   (______/ |_| |_|\_____||  __/ (___/ |_____)|_|      \_/  |_____)|_|               #
+#                          |_|                                                        #
+#                                                                                     #
+#  Snapserver config file                                                             #
+#                                                                                     #
+#  Source: https://github.com/badaix/snapcast/blob/develop/server/etc/snapserver.conf #                                                                          #
+#                                                                                     #
+#######################################################################################
+
+# default values are commented
+# uncomment and edit to change them
+
+# Settings can be overwritten on command line with:
+#  "--<section>.<name>=<value>", e.g. --server.threads=4
+
+
+# General server settings #####################################################
+#
+[server]
+# Number of additional worker threads to use
+# - For values < 0 the number of threads will be 2 (on single and dual cores)
+#   or 4 (for quad and more cores)
+# - 0 will utilize just the processes main thread and might cause audio drops
+#   in case there are a couple of longer running tasks, such as encoding
+#   multiple audio streams
+#threads = -1
+
+# the pid file when running as daemon
+#pidfile = /var/run/snapserver/pid
+
+# the user to run as when daemonized
+#user = snapserver
+# the group to run as when daemonized
+#group = snapserver
+
+# directory where persistent data is stored (server.json)
+# if empty, data dir will be
+#  - "/var/lib/snapserver/" when running as daemon
+#  - "$HOME/.config/snapserver/" when not running as daemon
+datadir = /data/
+
+#
+###############################################################################
+
+
+# HTTP RPC ####################################################################
+#
+[http]
+# enable HTTP Json RPC (HTTP POST and websockets)
+enabled = true
+
+# address to listen on, can be specified multiple times
+# use "0.0.0.0" to bind to any IPv4 address or :: to bind to any IPv6 address
+# or "127.0.0.1" or "::1" to bind to localhost IPv4 or IPv6, respectively
+# use the address of a specific network interface to just listen to and accept
+# connections from that interface
+bind_to_address = 0.0.0.0
+
+# which port the server should listen to
+port = 1780
+
+# serve a website from the doc_root location
+# disabled if commented or empty
+doc_root = /usr/share/snapserver/snapweb
+
+# Hostname or IP under which clients can reach this host
+# used to serve cached cover art
+# use <hostname> as placeholder for your actual host name
+#host = <hostname>
+
+#
+###############################################################################
+
+
+# TCP RPC #####################################################################
+#
+[tcp]
+# enable TCP Json RPC
+enabled = true
+
+# address to listen on, can be specified multiple times
+# use "0.0.0.0" to bind to any IPv4 address or :: to bind to any IPv6 address
+# or "127.0.0.1" or "::1" to bind to localhost IPv4 or IPv6, respectively
+# use the address of a specific network interface to just listen to and accept
+# connections from that interface
+bind_to_address = 0.0.0.0
+
+# which port the server should listen to
+port = 1705
+#
+###############################################################################
+
+
+# Stream settings #############################################################
+#
+[stream]
+# address to listen on, can be specified multiple times
+# use "0.0.0.0" to bind to any IPv4 address or :: to bind to any IPv6 address
+# or "127.0.0.1" or "::1" to bind to localhost IPv4 or IPv6, respectively
+# use the address of a specific network interface to just listen to and accept
+# connections from that interface
+bind_to_address = 0.0.0.0
+
+# which port the server should listen to
+port = 1704
+
+# source URI of the PCM input stream, can be configured multiple times
+# The following notation is used in this paragraph:
+#  <angle brackets>: the whole expression must be replaced with your specific setting
+# [square brackets]: the whole expression is optional and can be left out
+# [key=value]: if you leave this option out, "value" will be the default for "key"
+#
+# Format: TYPE://host/path?name=<name>[&codec=<codec>][&sampleformat=<sampleformat>][&chunk_ms=<chunk ms>][&controlscript=<control script filename>[&controlscriptparams=<control script command line arguments>]]
+#  parameters have the form "key=value", they are concatenated with an "&" character
+#  parameter "name" is mandatory for all sources, while codec, sampleformat and chunk_ms are optional
+#  and will override the default codec, sampleformat or chunk_ms settings
+# Non blocking sources support the dryout_ms parameter: when no new data is read from the source, send silence to the clients
+# Available types are:
+# pipe: pipe:///<path/to/pipe>?name=<name>[&mode=create][&dryout_ms=2000], mode can be "create" or "read"
+# librespot: librespot:///<path/to/librespot>?name=<name>[&dryout_ms=2000][&username=<my username>&password=<my password>][&devicename=Snapcast][&bitrate=320][&wd_timeout=7800][&volume=100][&onevent=""][&nomalize=false][&autoplay=false][&params=<generic librepsot process arguments>]
+#  note that you need to have the librespot binary on your machine
+#  sampleformat will be set to "44100:16:2"
+# file: file:///<path/to/PCM/file>?name=<name>
+# process: process:///<path/to/process>?name=<name>[&dryout_ms=2000][&wd_timeout=0][&log_stderr=false][&params=<process arguments>]
+# airplay: airplay:///<path/to/airplay>?name=<name>[&dryout_ms=2000][&port=5000]
+#  note that you need to have the airplay binary on your machine
+#  sampleformat will be set to "44100:16:2"
+# tcp server: tcp://<listen IP, e.g. 127.0.0.1>:<port>?name=<name>[&mode=server]
+# tcp client: tcp://<server IP, e.g. 127.0.0.1>:<port>?name=<name>&mode=client
+# alsa: alsa:///?name=<name>&device=<alsa device>[&send_silence=false][&idle_threshold=100][&silence_threshold_percent=0.0]
+# meta: meta:///<name of source#1>/<name of source#2>/.../<name of source#N>?name=<name>
+#source = librespot://librespot?name=LibreSpot&bitrate=320&sampleformat=44100:16:2
+# source = airplay:///usr/bin/shairport-sync?name=shairport[&dryout_ms=2000&devicename=Snapcast&port=5000
+#source = pipe:////audio/snapcast_fifo?name=Mopidy
+source = pipe:////audio/snapfifo?name=fifo
+
+# Default sample format: <sample rate>:<bits per sample>:<channels>
+sampleformat = 44100:16:2
+
+# Default transport codec
+# (flac|ogg|opus|pcm)[:options]
+# Start Snapserver with "--stream:codec=<codec>:?" to get codec specific options
+codec = pcm
+
+# Default source stream read chunk size [ms].
+# The server will continously read this number of milliseconds from the source into buffer and pass this buffer to the encoder.
+# The encoded buffer is sent to the clients. Some codecs have a higher latency and will need more data, e.g. Flac will need ~26ms chunks
+#chunk_ms = 20
+
+# Buffer [ms]
+# The end-to-end latency, from capturing a sample on the server until the sample is played-out on the client
+buffer = 3000
+
+# Send audio to muted clients
+send_to_muted = false
+
+# Streaming client options ####################################################
+#
+[streaming_client]
+
+# Volume assigned to new snapclients [percent]
+# Defaults to 100 if unset
+initial_volume = 100
+#
+###############################################################################
+
+
+# Logging options #############################################################
+#
+[logging]
+
+# log sink [null,system,stdout,stderr,file:<filename>]
+# when left empty: if running as daemon "system" else "stdout"
+#sink =
+
+# log filter <tag>:<level>[,<tag>:<level>]*
+# with tag = * or <log tag> and level = [trace,debug,info,notice,warning,error,fatal]
+#filter = *:info
+#
+###############################################################################
diff --git a/snapserver/config/snapcast.conf.example b/snapserver/config/snapcast.conf.example
diff --git a/snapserver/docker-compose.yml b/snapserver/docker-compose.yml

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+SOUND_DEVICE=/dev/snd`
	`2`	`+# IP address or hostname of snapserver`
	`3`	`+HOST=10.0.1.11`