7 Commits

Author SHA1 Message Date
0eaf18822b Version bump to v0.3.6
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2023-01-25 13:27:58 -05:00
7bdd4a5dfb Added log4j2.xml to linux packages to fix the deployment
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2023-01-25 13:27:16 -05:00
ea6e6c95e1 Updated woodpecker
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2023-01-25 11:54:31 -05:00
c7f9c4cf73 Fixed woodpecker config
Some checks failed
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline failed
2023-01-25 11:38:48 -05:00
ce9efc463d Version bump to v0.3.5
Some checks failed
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline failed
2023-01-25 11:09:28 -05:00
879ff8f8f4 Updated woodpecker config to copy packages to the local repo
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2023-01-25 11:08:38 -05:00
f132861cbc Fixed log4j class not found error; Updated log4j version
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2023-01-25 10:14:50 -05:00
4 changed files with 66 additions and 5 deletions

View File

@ -31,3 +31,49 @@ pipeline:
- target/rpm/dragoon/RPMS/noarch/dragoon-*.rpm
when:
event: tag
copy_deb_package:
image: appleboy/drone-scp
settings:
host: "repo.int.metaunix.net"
username:
from_secret: repo_admin
password:
from_secret: repo_password
port: 22
target: /srv/repo/apt/dragoon/
source: target/dragoon-*.deb
strip_components: 1
when:
event: tag
copy_rpm_package:
image: appleboy/drone-scp
settings:
host: "repo.int.metaunix.net"
username:
from_secret: repo_admin
password:
from_secret: repo_password
port: 22
target: /srv/repo/dnf/dragoon/
source: target/rpm/dragoon/RPMS/noarch/dragoon-*.rpm
strip_components: 5
when:
event: tag
update_repos:
image: appleboy/drone-ssh
settings:
host:
- repo.int.metaunix.net
username:
from_secret: repo_admin
password:
from_secret: repo_password
port: 22
command_timeout: 2m
script:
- sudo /home/xadmin/scripts/update_repo.sh
when:
event: tag

21
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>tech.bitgoblin</groupId>
<artifactId>dragoon</artifactId>
<version>0.3.4</version>
<version>0.3.6</version>
<name>Dragoon</name>
<url>https://www.bitgoblin.tech</url>
@ -55,12 +55,12 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.17.2</version>
<version>2.19.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.2</version>
<version>2.19.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@ -160,6 +160,10 @@
<source>${basedir}/target/dragoon-${project.version}-jar-with-dependencies.jar</source>
<target>/opt/dragoon/dragoon.jar</target>
</fileSet>
<fileSet>
<source>${basedir}/src/main/resources/log4j2.xml</source>
<target>/opt/dragoon/log4j2.xml</target>
</fileSet>
</fileSets>
</configuration>
</plugin>
@ -201,6 +205,17 @@
</source>
</sources>
</mapping>
<mapping>
<directory>/opt/dragoon/log4j2.xml</directory>
<filemode>755</filemode>
<username>dragoon</username>
<groupname>dragoon</groupname>
<sources>
<source>
<location>${basedir}/src/main/resources/log4j2.xml</location>
</source>
</sources>
</mapping>
<mapping>
<directory>/etc/dragoon</directory>
<configuration>true</configuration>

View File

@ -4,7 +4,7 @@ Description=Dragoon video transcoder service
[Service]
User=dragoon
Group=dragoon
ExecStart=/usr/bin/java -jar '/opt/dragoon/dragoon.jar'
ExecStart=/usr/bin/java -jar '/opt/dragoon/dragoon.jar' -Dlog4j.configurationFile=/opt/dragoon/log4j2.xml
SuccessExitStatus=143
[Install]

View File

@ -4,6 +4,6 @@ import org.apache.logging.log4j.LogManager;
public class Logger {
public static org.apache.logging.log4j.Logger logger = LogManager.getLogger();
public static org.apache.logging.log4j.Logger logger = LogManager.getRootLogger();
}