This commit is contained in:
@@ -16,6 +16,7 @@ RUN git clone -b gr310 https://github.com/boatbod/op25 /op25
|
||||
WORKDIR /op25
|
||||
|
||||
# Run the install script to set up op25
|
||||
RUN sed -i 's/sudo //g' install.sh
|
||||
RUN ./install.sh -f
|
||||
|
||||
# Install the op25.liq file
|
||||
|
||||
@@ -86,10 +86,6 @@ class MetadataConfig(BaseModel):
|
||||
module: str = "icecast.py"
|
||||
streams: List[MetadataStreamConfig]
|
||||
|
||||
class AudioConfig(BaseModel):
|
||||
module: Optional[str] = "sockaudio.py"
|
||||
instances: Optional[List[AudioInstanceConfig]] = [AudioInstanceConfig()]
|
||||
|
||||
class TerminalConfig(BaseModel):
|
||||
module: Optional[str] = "terminal.py"
|
||||
terminal_type: Optional[str] = "http:0.0.0.0:8081"
|
||||
|
||||
@@ -3,7 +3,7 @@ import subprocess
|
||||
import os
|
||||
import signal
|
||||
import json
|
||||
from models import ConfigGenerator, DecodeMode, ChannelConfig, DeviceConfig, TrunkingConfig, TrunkingChannelConfig, AudioConfig, TerminalConfig
|
||||
from models import ConfigGenerator, DecodeMode, ChannelConfig, DeviceConfig, TrunkingConfig, TrunkingChannelConfig, TerminalConfig, MetadataConfig
|
||||
from internal.logger import create_logger
|
||||
from internal.bot_manager import DiscordBotManager
|
||||
from internal.op25_config_utls import save_talkgroup_tags, save_whitelist, del_none_in_dict, get_current_system_from_config
|
||||
@@ -72,7 +72,7 @@ def create_op25_router(bot_manager: DiscordBotManager):
|
||||
)]
|
||||
)
|
||||
|
||||
audio = AudioConfig()
|
||||
metadata = MetadataConfig()
|
||||
|
||||
terminal = TerminalConfig()
|
||||
|
||||
@@ -80,7 +80,7 @@ def create_op25_router(bot_manager: DiscordBotManager):
|
||||
"channels": [channel.dict() for channel in channels],
|
||||
"devices": [device.dict() for device in devices],
|
||||
"trunking": trunking.dict(),
|
||||
"audio": audio.dict(),
|
||||
"metadata": metadata.dict(),
|
||||
"terminal": terminal.dict()
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user