From 455f11d7a6b651254937413e6705aef3d4a3b91e Mon Sep 17 00:00:00 2001
From: j1nx
Date: Tue, 6 Feb 2024 15:51:25 +0000
Subject: [PATCH] [All] Mount host /etc/mycroft.conf into containers by
default. Shipping with OS release configuration while allowing to use the
user mycroft.conf to overwrite those settings again if wanted
---
.../rootfs-overlay/etc/mycroft.conf | 100 ++++++++++++++++++
.../hivemind-cli.container.d/Mycroft.conf | 2 +
.../Mycroft.conf | 2 +
.../ovos-audio.container.d/Mycroft.conf | 2 +
.../systemd/ovos-cli.container.d/Mycroft.conf | 2 +
.../ovos-core.container.d/Mycroft.conf | 2 +
.../ovos-gui-shell.container.d/Mycroft.conf | 2 +
.../Mycroft.conf | 2 +
.../Mycroft.conf | 2 +
.../ovos-messagebus.container.d/Mycroft.conf | 2 +
.../ovos-phal.container.d/Mycroft.conf | 2 +
.../Mycroft.conf | 2 +
.../home/ovos/ovos/config/mycroft.conf | 98 -----------------
13 files changed, 122 insertions(+), 98 deletions(-)
create mode 100644 buildroot-external/rootfs-overlay/etc/mycroft.conf
create mode 100644 buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/hivemind-cli.container.d/Mycroft.conf
create mode 100644 buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/hivemind-listener.container.d/Mycroft.conf
create mode 100644 buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-audio.container.d/Mycroft.conf
create mode 100644 buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-cli.container.d/Mycroft.conf
create mode 100644 buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-core.container.d/Mycroft.conf
create mode 100644 buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-shell.container.d/Mycroft.conf
create mode 100644 buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-websocket.container.d/Mycroft.conf
create mode 100644 buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener-dinkum.container.d/Mycroft.conf
create mode 100644 buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-messagebus.container.d/Mycroft.conf
create mode 100644 buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-phal.container.d/Mycroft.conf
create mode 100644 buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-tts-server-piper.container.d/Mycroft.conf
diff --git a/buildroot-external/rootfs-overlay/etc/mycroft.conf b/buildroot-external/rootfs-overlay/etc/mycroft.conf
new file mode 100644
index 00000000..d6dad66b
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/etc/mycroft.conf
@@ -0,0 +1,100 @@
+{
+ "confirm_listening": true,
+ "play_wav_cmdline": "pw-play %1",
+ "play_mp3_cmdline": "pw-play %1",
+ "sounds": {
+ "start_listening": "/home/ovos/.venv/lib/python3.11/site-packages/ovos_dinkum_listener/res/snd/start_listening.wav",
+ "end_listening": "/home/ovos/.venv/lib/python3.11/site-packages/ovos_dinkum_listener/res/snd/end_listening.wav",
+ "acknowledge": "/home/ovos/.venv/lib/python3.11/site-packages/ovos_dinkum_listener/res/snd/acknowledge.mp3"
+ },
+ "skills": {
+ "wait_for_internet": true
+ },
+ "gui": {
+ "extension": "ovos-gui-plugin-shell-companion",
+ "idle_display_skill": "skill-ovos-homescreen.openvoiceos",
+ "generic": {
+ "homescreen_supported": true
+ },
+ "gui_file_host_path": "/home/ovos/.cache/gui_files"
+ },
+ "websocket": {
+ "max_msg_size": 100
+ },
+ "listener": {
+ "silence_end": 0.5,
+ "recording_timeout": 7,
+ "VAD": {
+ "module": "ovos-vad-plugin-silero",
+ "ovos-vad-plugin-silero": {"threshold": 0.2}
+ },
+ "remove_silence": true
+ },
+ "hotwords": {
+ "hey_mycroft": {
+ "module": "ovos-ww-plugin-precise-lite",
+ "model": "https://github.com/OpenVoiceOS/precise-lite-models/raw/master/wakewords/en/hey_mycroft.tflite",
+ "listen": true,
+ "sound": "snd/start_listening.wav",
+ "expected_duration": 3,
+ "trigger_level": 3,
+ "sensitivity": 0.5,
+ "fallback_ww": "hey_mycroft_openwakeword"
+ },
+ "hey_mycroft_openwakeword": {
+ "module": "ovos-ww-plugin-openwakeword",
+ "threshold": 0.4,
+ "fallback_ww": "hey_mycroft_vosk"
+ }
+ },
+ "tts": {
+ "module": "ovos-tts-plugin-server",
+ "ovos-tts-plugin-server": {
+ "host": "https://pipertts.ziggyai.online",
+ "voice": "ryan-low",
+ "sentence_tokenize": true
+ }
+ },
+ "stt": {
+ "module": "ovos-stt-plugin-server",
+ "ovos-stt-plugin-server": {
+ "url": "https://fasterwhisper.ziggyai.online/stt"
+ },
+ "fallback_module": "ovos-stt-plugin-vosk",
+ "ovos-stt-plugin-vosk": {
+ "model": "http://alphacephei.com/vosk/models/vosk-model-small-en-us-0.15.zip"
+ }
+ },
+ "padatious": {
+ "regex_only": false
+ },
+ "g2p": {
+ "module": "ovos-g2p-plugin-mimic"
+ },
+ "Audio": {
+ "backends": {
+ "OCP": {
+ "type": "ovos_common_play",
+ "manage_external_players": true,
+ "active": true,
+ "youtube_backend": "youtube-dl",
+ "ydl_backend": "auto",
+ "disable_mpris": true
+ },
+ "vlc": {
+ "type": "ovos_vlc",
+ "active": false
+ },
+ "simple": {
+ "type": "ovos_audio_simple",
+ "active": false
+ }
+ }
+ },
+ "debug": false,
+ "log_level": "INFO",
+ "log_dir": "/var/log/mycroft",
+ "logs": {
+ "path": "stdout"
+ }
+}
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/hivemind-cli.container.d/Mycroft.conf b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/hivemind-cli.container.d/Mycroft.conf
new file mode 100644
index 00000000..26dfc55f
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/hivemind-cli.container.d/Mycroft.conf
@@ -0,0 +1,2 @@
+[Container]
+Volume=/etc/mycroft.conf:/etc/mycroft.conf:ro
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/hivemind-listener.container.d/Mycroft.conf b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/hivemind-listener.container.d/Mycroft.conf
new file mode 100644
index 00000000..26dfc55f
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/hivemind-listener.container.d/Mycroft.conf
@@ -0,0 +1,2 @@
+[Container]
+Volume=/etc/mycroft.conf:/etc/mycroft.conf:ro
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-audio.container.d/Mycroft.conf b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-audio.container.d/Mycroft.conf
new file mode 100644
index 00000000..26dfc55f
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-audio.container.d/Mycroft.conf
@@ -0,0 +1,2 @@
+[Container]
+Volume=/etc/mycroft.conf:/etc/mycroft.conf:ro
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-cli.container.d/Mycroft.conf b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-cli.container.d/Mycroft.conf
new file mode 100644
index 00000000..26dfc55f
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-cli.container.d/Mycroft.conf
@@ -0,0 +1,2 @@
+[Container]
+Volume=/etc/mycroft.conf:/etc/mycroft.conf:ro
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-core.container.d/Mycroft.conf b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-core.container.d/Mycroft.conf
new file mode 100644
index 00000000..26dfc55f
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-core.container.d/Mycroft.conf
@@ -0,0 +1,2 @@
+[Container]
+Volume=/etc/mycroft.conf:/etc/mycroft.conf:ro
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-shell.container.d/Mycroft.conf b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-shell.container.d/Mycroft.conf
new file mode 100644
index 00000000..26dfc55f
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-shell.container.d/Mycroft.conf
@@ -0,0 +1,2 @@
+[Container]
+Volume=/etc/mycroft.conf:/etc/mycroft.conf:ro
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-websocket.container.d/Mycroft.conf b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-websocket.container.d/Mycroft.conf
new file mode 100644
index 00000000..26dfc55f
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-gui-websocket.container.d/Mycroft.conf
@@ -0,0 +1,2 @@
+[Container]
+Volume=/etc/mycroft.conf:/etc/mycroft.conf:ro
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener-dinkum.container.d/Mycroft.conf b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener-dinkum.container.d/Mycroft.conf
new file mode 100644
index 00000000..26dfc55f
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-listener-dinkum.container.d/Mycroft.conf
@@ -0,0 +1,2 @@
+[Container]
+Volume=/etc/mycroft.conf:/etc/mycroft.conf:ro
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-messagebus.container.d/Mycroft.conf b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-messagebus.container.d/Mycroft.conf
new file mode 100644
index 00000000..26dfc55f
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-messagebus.container.d/Mycroft.conf
@@ -0,0 +1,2 @@
+[Container]
+Volume=/etc/mycroft.conf:/etc/mycroft.conf:ro
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-phal.container.d/Mycroft.conf b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-phal.container.d/Mycroft.conf
new file mode 100644
index 00000000..26dfc55f
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-phal.container.d/Mycroft.conf
@@ -0,0 +1,2 @@
+[Container]
+Volume=/etc/mycroft.conf:/etc/mycroft.conf:ro
diff --git a/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-tts-server-piper.container.d/Mycroft.conf b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-tts-server-piper.container.d/Mycroft.conf
new file mode 100644
index 00000000..26dfc55f
--- /dev/null
+++ b/buildroot-external/rootfs-overlay/home/ovos/.config/containers/systemd/ovos-tts-server-piper.container.d/Mycroft.conf
@@ -0,0 +1,2 @@
+[Container]
+Volume=/etc/mycroft.conf:/etc/mycroft.conf:ro
diff --git a/buildroot-external/rootfs-overlay/home/ovos/ovos/config/mycroft.conf b/buildroot-external/rootfs-overlay/home/ovos/ovos/config/mycroft.conf
index d6dad66b..2c63c085 100644
--- a/buildroot-external/rootfs-overlay/home/ovos/ovos/config/mycroft.conf
+++ b/buildroot-external/rootfs-overlay/home/ovos/ovos/config/mycroft.conf
@@ -1,100 +1,2 @@
{
- "confirm_listening": true,
- "play_wav_cmdline": "pw-play %1",
- "play_mp3_cmdline": "pw-play %1",
- "sounds": {
- "start_listening": "/home/ovos/.venv/lib/python3.11/site-packages/ovos_dinkum_listener/res/snd/start_listening.wav",
- "end_listening": "/home/ovos/.venv/lib/python3.11/site-packages/ovos_dinkum_listener/res/snd/end_listening.wav",
- "acknowledge": "/home/ovos/.venv/lib/python3.11/site-packages/ovos_dinkum_listener/res/snd/acknowledge.mp3"
- },
- "skills": {
- "wait_for_internet": true
- },
- "gui": {
- "extension": "ovos-gui-plugin-shell-companion",
- "idle_display_skill": "skill-ovos-homescreen.openvoiceos",
- "generic": {
- "homescreen_supported": true
- },
- "gui_file_host_path": "/home/ovos/.cache/gui_files"
- },
- "websocket": {
- "max_msg_size": 100
- },
- "listener": {
- "silence_end": 0.5,
- "recording_timeout": 7,
- "VAD": {
- "module": "ovos-vad-plugin-silero",
- "ovos-vad-plugin-silero": {"threshold": 0.2}
- },
- "remove_silence": true
- },
- "hotwords": {
- "hey_mycroft": {
- "module": "ovos-ww-plugin-precise-lite",
- "model": "https://github.com/OpenVoiceOS/precise-lite-models/raw/master/wakewords/en/hey_mycroft.tflite",
- "listen": true,
- "sound": "snd/start_listening.wav",
- "expected_duration": 3,
- "trigger_level": 3,
- "sensitivity": 0.5,
- "fallback_ww": "hey_mycroft_openwakeword"
- },
- "hey_mycroft_openwakeword": {
- "module": "ovos-ww-plugin-openwakeword",
- "threshold": 0.4,
- "fallback_ww": "hey_mycroft_vosk"
- }
- },
- "tts": {
- "module": "ovos-tts-plugin-server",
- "ovos-tts-plugin-server": {
- "host": "https://pipertts.ziggyai.online",
- "voice": "ryan-low",
- "sentence_tokenize": true
- }
- },
- "stt": {
- "module": "ovos-stt-plugin-server",
- "ovos-stt-plugin-server": {
- "url": "https://fasterwhisper.ziggyai.online/stt"
- },
- "fallback_module": "ovos-stt-plugin-vosk",
- "ovos-stt-plugin-vosk": {
- "model": "http://alphacephei.com/vosk/models/vosk-model-small-en-us-0.15.zip"
- }
- },
- "padatious": {
- "regex_only": false
- },
- "g2p": {
- "module": "ovos-g2p-plugin-mimic"
- },
- "Audio": {
- "backends": {
- "OCP": {
- "type": "ovos_common_play",
- "manage_external_players": true,
- "active": true,
- "youtube_backend": "youtube-dl",
- "ydl_backend": "auto",
- "disable_mpris": true
- },
- "vlc": {
- "type": "ovos_vlc",
- "active": false
- },
- "simple": {
- "type": "ovos_audio_simple",
- "active": false
- }
- }
- },
- "debug": false,
- "log_level": "INFO",
- "log_dir": "/var/log/mycroft",
- "logs": {
- "path": "stdout"
- }
}