Merge pull request #21 from Opendigitalradio/next

Prepare version 3.2.2
Opendigitalradio · Oct 27, 2024 · 6f95f42 · 6f95f42
2 parents babedcf + 2056aff
commit 6f95f42
Show file tree

Hide file tree

Showing 5 changed files with 235 additions and 287 deletions.
diff --git a/config/encodermanager.json b/config/encodermanager.json
@@ -2,11 +2,11 @@
     "global": {
         "daemon": false,
         "max_encoder_instance": 3,
-        "logs_directory": "/home/pi/ODR-mmbTools/ODR-EncoderManager/logs/",
+        "logs_directory": "@@DIR_ENCMGR@@/logs/",
         "supervisor_xmlrpc": "http://odr:odr@127.0.0.1:8001/RPC2",
-        "static_directory": "/home/pi/ODR-mmbTools/ODR-EncoderManager/static/",
+        "static_directory": "@@DIR_ENCMGR@@/static/",
         "host": "0.0.0.0",
-        "supervisor_file": "/home/pi/config/supervisor/ODR-encoders.conf",
+        "supervisor_file": "@@DIR_CONFIG@@/supervisor/ODR-encoders.conf",
         "port": 8003
     },
     "auth": {
@@ -71,8 +71,8 @@
             "padenc": {
                 "enable": "true",
                 "pad": "34",
-                "dls_file": "/home/pi/config/mot/P01/INFO.dls",
-                "slide_directory": "/home/pi/config/mot/P01/slide/",
+                "dls_file": "@@DIR_CONFIG@@/mot/P01/INFO.dls",
+                "slide_directory": "@@DIR_CONFIG@@/mot/P01/slide/",
                 "slide_sleeping": "0",
                 "slide_once": "false",
                 "raw_dls": "false",
@@ -144,8 +144,8 @@
             "padenc": {
                 "enable": "true",
                 "pad": "34",
-                "dls_file": "/home/pi/config/mot/P02/INFO.dls",
-                "slide_directory": "/home/pi/config/mot/P02/slide",
+                "dls_file": "@@DIR_CONFIG@@/mot/P02/INFO.dls",
+                "slide_directory": "@@DIR_CONFIG@@/mot/P02/slide",
                 "slide_sleeping": "0",
                 "slide_once": "false",
                 "raw_dls": "false",

diff --git a/config/supervisor/ODR-encoders.conf b/config/supervisor/ODR-encoders.conf
@@ -1,9 +1,9 @@
 # P01
 [program:odr-padencoder-defee58a-f768-4ca9-a0f7-88f08b2e8748]
 command=odr-padenc
- --dir=/home/pi/config/mot/P01/slide
+ --dir=@@DIR_CONFIG@@/mot/P01/slide
  --sleep=0
- --dls=/home/pi/config/mot/P01/INFO.dls
+ --dls=@@DIR_CONFIG@@/mot/P01/INFO.dls
  --output=defee58a-f768-4ca9-a0f7-88f08b2e8748
  --label=12
  --label-ins=1200
@@ -27,7 +27,7 @@ command=odr-audioenc
  --aaclc
  --pad=34
  --pad-socket=defee58a-f768-4ca9-a0f7-88f08b2e8748
- --write-icy-text=/home/pi/config/mot/P01/INFO.dls
+ --write-icy-text=@@DIR_CONFIG@@/mot/P01/INFO.dls
  --edi tcp://127.0.0.1:9001
  --stats=/var/tmp/P01.stats
 autostart=false
@@ -41,9 +41,9 @@ stdout_logfile=/var/log/supervisor/odr-audioencoder-defee58a-f768-4ca9-a0f7-88f0
 # P02
 [program:odr-padencoder-7158c498-1ef1-4580-b385-23a3c06ba985]
 command=odr-padenc
- --dir=/home/pi/config/mot/P02/slide
+ --dir=@@DIR_CONFIG@@/mot/P02/slide
  --sleep=0
- --dls=/home/pi/config/mot/P02/INFO.dls
+ --dls=@@DIR_CONFIG@@/mot/P02/INFO.dls
  --output=7158c498-1ef1-4580-b385-23a3c06ba985
  --label=12
  --label-ins=1200
@@ -67,7 +67,7 @@ command=odr-audioenc
  --aaclc
  --pad=34
  --pad-socket=7158c498-1ef1-4580-b385-23a3c06ba985
- --write-icy-text=/home/pi/config/mot/P02/INFO.dls
+ --write-icy-text=@@DIR_CONFIG@@/mot/P02/INFO.dls
  --edi tcp://127.0.0.1:9002
  --stats=/var/tmp/P02.stats
 autostart=false

diff --git a/config/supervisor/ODR-misc.conf b/config/supervisor/ODR-misc.conf
@@ -1,6 +1,6 @@
 [program:10-EncoderManager]
-command=python3 run.py -c /home/pi/config/encodermanager.json
-directory=/home/pi/ODR-mmbTools/ODR-EncoderManager
+command=python3 run.py -c @@DIR_CONFIG@@/encodermanager.json
+directory=@@DIR_ENCMGR@@
 autostart=false
 autorestart=false
 priority=10
@@ -11,7 +11,7 @@ stdout_logfile=/var/log/supervisor/encoderManager.log
 
 [program:20-Multiplex]
 command=odr-dabmux odr-dabmux.info
-directory=/home/pi/config/
+directory=@@DIR_CONFIG@@
 autostart=false
 autorestart=false
 user=pi
@@ -21,7 +21,7 @@ stdout_logfile=/var/log/supervisor/mux.log
 
 [program:21-Multiplex-Manager]
 command=python3 odr-dabmux-gui.py --port=8002 --host=raspberrypi.local
-directory=/home/pi/ODR-mmbTools/ODR-DabMux/gui
+directory=@@DIR_MUX@@/gui
 autostart=false
 autorestart=false
 user=pi
@@ -31,8 +31,11 @@ stdout_logfile=/var/log/supervisor/mux-manager.log
 
 [program:30-Modulator]
 command=odr-dabmod odr-dabmod.ini
-directory=/home/pi/config/
+directory=@@DIR_CONFIG@@
 autostart=false
 autorestart=false
+user=pi
+group=pi
+stopsignal=INT
 stderr_logfile=/var/log/supervisor/mod.log
 stdout_logfile=/var/log/supervisor/mod.log