From bd4117df38230207969e6bd77e06381fd18789f8 Mon Sep 17 00:00:00 2001
From: Gregory Ballantine <gballantine@metaunix.net>
Date: Wed, 25 Jan 2023 13:42:36 -0500
Subject: [PATCH] Fixed a few housekeeping things to make the linux packages
 more plug-and-play

---
 pom.xml                                       |  4 ++--
 src/build/deb/etc/dragoon/config.example.toml |  1 +
 .../deb/etc/systemd/system/dragoon.service    |  2 +-
 src/build/deb/opt/log4j2.xml                  | 20 +++++++++++++++++++
 src/main/java/tech/bitgoblin/config/Cmd.java  |  2 +-
 5 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 src/build/deb/opt/log4j2.xml

diff --git a/pom.xml b/pom.xml
index d0202d8..5888223 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,7 +161,7 @@
                             <target>/opt/dragoon/dragoon.jar</target>
                         </fileSet>
                         <fileSet>
-                            <source>${basedir}/src/main/resources/log4j2.xml</source>
+                            <source>${basedir}/src/build/opt/log4j2.xml</source>
                             <target>/opt/dragoon/log4j2.xml</target>
                         </fileSet>
                     </fileSets>
@@ -212,7 +212,7 @@
                             <groupname>dragoon</groupname>
                             <sources>
                                 <source>
-                                    <location>${basedir}/src/main/resources/log4j2.xml</location>
+                                    <location>${basedir}/src/build/opt/log4j2.xml</location>
                                 </source>
                             </sources>
                         </mapping>
diff --git a/src/build/deb/etc/dragoon/config.example.toml b/src/build/deb/etc/dragoon/config.example.toml
index d7c871c..042be20 100644
--- a/src/build/deb/etc/dragoon/config.example.toml
+++ b/src/build/deb/etc/dragoon/config.example.toml
@@ -1,6 +1,7 @@
 # This example transcodes footage to DNxHD 1080p60 for use in video editors like DaVinci Resolve.
 [transcoder]
 repo_path = '~/videos' # location of the videos to transcode
+interval = 30
 video_format = 'mov' # video container format
 video_codec = 'dnxhd' # video codec to use
 video_parameters = 'scale=1920x1080,fps=60,format=yuv422p' # video extra format parameters flag - this will be broken later into separate attributes
diff --git a/src/build/deb/etc/systemd/system/dragoon.service b/src/build/deb/etc/systemd/system/dragoon.service
index 3f70432..9fd671c 100644
--- a/src/build/deb/etc/systemd/system/dragoon.service
+++ b/src/build/deb/etc/systemd/system/dragoon.service
@@ -4,7 +4,7 @@ Description=Dragoon video transcoder service
 [Service]
 User=dragoon
 Group=dragoon
-ExecStart=/usr/bin/java -jar '/opt/dragoon/dragoon.jar' -Dlog4j.configurationFile=/opt/dragoon/log4j2.xml
+ExecStart=/usr/bin/java -Dlog4j.configurationFile=/opt/dragoon/log4j2.xml -jar '/opt/dragoon/dragoon.jar' -c '/etc/dragoon/config.toml'
 SuccessExitStatus=143
 
 [Install]
diff --git a/src/build/deb/opt/log4j2.xml b/src/build/deb/opt/log4j2.xml
new file mode 100644
index 0000000..4247d30
--- /dev/null
+++ b/src/build/deb/opt/log4j2.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="info" name="Dragoon" packages="">
+    <Appenders>
+        <File name="DragoonLog" fileName="logs/dragoon.log">
+            <PatternLayout>
+                <Pattern>%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n</Pattern>
+            </PatternLayout>
+        </File>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout
+                    pattern="%highlight{%d [%t] %-5level: %msg%n%throwable}" />
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Root level="info">
+            <AppenderRef ref="DragoonLog"/>
+            <AppenderRef ref="Console"/>
+        </Root>
+    </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/src/main/java/tech/bitgoblin/config/Cmd.java b/src/main/java/tech/bitgoblin/config/Cmd.java
index 4431d49..fa306a8 100644
--- a/src/main/java/tech/bitgoblin/config/Cmd.java
+++ b/src/main/java/tech/bitgoblin/config/Cmd.java
@@ -4,7 +4,7 @@ import org.apache.commons.cli.*;
 
 public class Cmd {
 
-	private String configPath = "/etc/dragoon/config.toml";
+	private String configPath = "~/.config/dragoon.toml";
 
 	public Cmd(String[] args) throws ParseException {
 		Options options = new Options();