Config path

Author: edwbaker

CMakeLists.txt

@@ -103,7 +103,7 @@ install(DIRECTORY include/audio_daemon
 
 # Install default config
 install(FILES config/ws-audiod.conf
-    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/ws-audiod
+    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/ws
 )
 
 # Install Python examples

README.md

@@ -195,7 +195,7 @@ Use **UP/+** and **DOWN/-** to adjust mic boost in 1 dB steps, **q** to quit.
 
 ## Configuration
 
-`/etc/ws/audiod/ws-audiod.conf`:
+`/etc/ws/ws-audiod.conf`:
 
 ```ini
 [daemon]
@@ -279,7 +279,7 @@ Each audio device requires a unique control socket path and shared memory
 identifier.
 
 ```ini
-# /etc/ws/audiod/garden_mic.conf
+# /etc/ws/garden_mic.conf
 [daemon]
 socket_path = /run/ws-audiod/garden_mic.sock
 clips_dir = /var/ws/audiod/garden_mic/clips
@@ -301,7 +301,7 @@ After=sound.target
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/ws-audiod -c /etc/ws/audiod/%i.conf
+ExecStart=/usr/bin/ws-audiod -c /etc/ws/%i.conf
 Restart=always
 RestartSec=5
 

build.sh

@@ -65,10 +65,10 @@ install_daemon() {
 
     sudo mkdir -p /var/lib/ws-audiod/clips
     sudo mkdir -p /var/lib/ws-audiod/blocks
-    sudo mkdir -p /etc/ws/audiod
+    sudo mkdir -p /etc/ws
 
-    if [ ! -f /etc/ws/audiod/ws-audiod.conf ]; then
-        sudo cp ../config/ws-audiod.conf /etc/ws/audiod/
+    if [ ! -f /etc/ws/ws-audiod.conf ]; then
+        sudo cp ../config/ws-audiod.conf /etc/ws/
     fi
 
     sudo cp ../config/ws-audiod.service /etc/systemd/system/

config/ws-audiod.service

@@ -4,7 +4,7 @@ After=sound.target
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/ws-audiod -c /etc/ws/audiod/ws-audiod.conf
+ExecStart=/usr/bin/ws-audiod -c /etc/ws/ws-audiod.conf
 Restart=always
 RestartSec=5
 RuntimeDirectory=ws-audiod

debian/ws-audiod.service

@@ -4,7 +4,7 @@ After=sound.target
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/ws-audiod -c /etc/ws/audiod/ws-audiod.conf
+ExecStart=/usr/bin/ws-audiod -c /etc/ws/ws-audiod.conf
 Restart=always
 RestartSec=5
 RuntimeDirectory=ws-audiod