more .gitignore work

added NFS support and cleaned up db-backup compose file

updated upsd compose file

Author: romkey

apps/db-backup/docker-compose.yml

@@ -1,20 +1,28 @@
 services:
-  db-backup:
-    image: ghcr.io/romkey/hackstack-db-backup:${IMAGE_VERSION:-latest}
-    container_name: db-backup
-    hostname: db-backup
+  dbbackup:
+    image: ghcr.io/romkey/hackstack-db-backup:latest
+    hostname: dbbackup
+    container_name: dbbackup
     restart: unless-stopped
     volumes:
-      - ${DBBACKUP_PARENT_HOST_PATH:-/opt}:/opt
-      - ${DBBACKUP_DEST_PATH}:/dest
-    env_file:
-      - .env
+      - /opt:/opt:ro
+      - backup_nfs:/dest
     networks:
-      - db
+      - postgresql
       - mariadb
+    env_file:
+      - .env
+
+volumes:
+  backup_nfs:
+    driver: local
+    driver_opts:
+      type: nfs
+      o: addr=${NFS_SERVER},${NFS_OPTIONS:-nfsvers=4,soft,rw}
+      device: ":${NFS_PATH}"
 
 networks:
-  db:
+  postgresql:
     external: true
     name: postgres-net
   mariadb:

apps/peanut/config/.gitignore apps/peanut/.gitignoreapps/peanut/config/.gitignore renamed to apps/peanut/.gitignore

@@ -0,0 +1,5 @@
+config/entrypoint.sh
+config/ups.conf
+config/upsd.conf
+config/upsd.users
+config/upsmon.conf

apps/upsd/.gitignore

@@ -0,0 +1,77 @@
+#! /bin/sh -e
+
+if [ -d /run/secrets ] && [ -s /run/secrets/$SECRETNAME ]; then
+  API_PASSWORD=$(cat /run/secrets/$SECRETNAME)
+fi
+
+if [ ! -e /etc/nut/.setup ]; then
+  if [ -e /etc/nut/local/ups.conf ]; then
+    cp /etc/nut/local/ups.conf /etc/nut/ups.conf
+  else
+    if [ -z "$SERIAL" ] && [ $DRIVER = usbhid-ups ] ; then
+      echo "** This container may not work without setting for SERIAL **"
+    fi
+    cat <<EOF >>/etc/nut/ups.conf
+[$NAME]
+        driver = $DRIVER
+        port = $PORT
+        desc = "$DESCRIPTION"
+EOF
+    if [ ! -z "$SERIAL" ]; then
+      echo "        serial = \"$SERIAL\"" >> /etc/nut/ups.conf
+    fi
+    if [ ! -z "$POLLINTERVAL" ]; then
+      echo "        pollinterval = $POLLINTERVAL" >> /etc/nut/ups.conf
+    fi
+    if [ ! -z "$VENDORID" ]; then
+      echo "        vendorid = $VENDORID" >> /etc/nut/ups.conf
+    fi
+    if [ ! -z "$SDORDER" ]; then
+      echo "        sdorder = $SDORDER" >> /etc/nut/ups.conf
+    fi
+  fi
+  if [ "$MAXAGE" -ne 15 ]; then
+      sed -i -e "s/^[# ]*MAXAGE [0-9]\+/MAXAGE $MAXAGE/" /etc/nut/upsd.conf
+  fi
+  if [ -e /etc/nut/local/upsd.conf ]; then
+    cp /etc/nut/local/upsd.conf /etc/nut/upsd.conf
+  else
+    cat <<EOF >>/etc/nut/upsd.conf
+LISTEN 0.0.0.0
+EOF
+  fi
+  if [ -e /etc/nut/local/upsd.users ]; then
+    cp /etc/nut/local/upsd.users /etc/nut/upsd.users
+  else
+    cat <<EOF >>/etc/nut/upsd.users
+[$API_USER]
+        password = $API_PASSWORD
+        upsmon $SERVER
+EOF
+  fi
+  if [ -e /etc/nut/local/upsmon.conf ]; then
+    cp /etc/nut/local/upsmon.conf /etc/nut/upsmon.conf
+  else
+    cat <<EOF >>/etc/nut/upsmon.conf
+MONITOR $NAME@localhost 1 $API_USER $API_PASSWORD $SERVER
+RUN_AS_USER $USER
+EOF
+  fi
+  touch /etc/nut/.setup
+fi
+
+chgrp $GROUP /etc/nut/*
+chmod 640 /etc/nut/*
+mkdir -p -m 2750 /dev/shm/nut
+chown $USER:$GROUP /dev/shm/nut
+[ -e /var/run/nut ] || ln -s /dev/shm/nut /var/run
+# Issue #15 - change pid warning message from "No such file" to "Ignoring"
+echo 0 > /var/run/nut/upsd.pid && chown $USER:$GROUP /var/run/nut/upsd.pid
+echo 0 > /var/run/upsmon.pid
+
+echo "upsmon.conf"
+cat /etc/nut/upsmon.conf
+
+/usr/sbin/upsdrvctl -u root start
+/usr/sbin/upsd -u $USER
+exec /usr/sbin/upsmon -D

apps/upsd/config/.gitkeep

@@ -1,14 +1,17 @@
 services:
   upsd:
-    image: gpdm/nut-upsd:${IMAGE_VERSION:-latest}
+    image: instantlinux/nut-upsd
     container_name: upsd
     hostname: upsd
     restart: unless-stopped
     privileged: true
+    entrypoint: /etc/nut/local/entrypoint.sh
     devices:
-      - "${UPS_DEVICE}:/dev/ups0:rw"
+#      - "${UPS_DEVICE}:/dev/ups0:rw"
+       - /dev/bus/usb:/dev/bus/usb
     volumes:
-      - ./config:/etc/nut
+      - ./config:/etc/nut/local
+#      - /dev/bus/usb:/dev/bus/usb
     ports:
       - 3493:3493
     env_file: