Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
0eaf18822b | |||
7bdd4a5dfb | |||
ea6e6c95e1 | |||
c7f9c4cf73 | |||
ce9efc463d | |||
879ff8f8f4 | |||
f132861cbc |
@ -31,3 +31,49 @@ pipeline:
|
|||||||
- target/rpm/dragoon/RPMS/noarch/dragoon-*.rpm
|
- target/rpm/dragoon/RPMS/noarch/dragoon-*.rpm
|
||||||
when:
|
when:
|
||||||
event: tag
|
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
21
pom.xml
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>tech.bitgoblin</groupId>
|
<groupId>tech.bitgoblin</groupId>
|
||||||
<artifactId>dragoon</artifactId>
|
<artifactId>dragoon</artifactId>
|
||||||
<version>0.3.4</version>
|
<version>0.3.6</version>
|
||||||
|
|
||||||
<name>Dragoon</name>
|
<name>Dragoon</name>
|
||||||
<url>https://www.bitgoblin.tech</url>
|
<url>https://www.bitgoblin.tech</url>
|
||||||
@ -55,12 +55,12 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.logging.log4j</groupId>
|
<groupId>org.apache.logging.log4j</groupId>
|
||||||
<artifactId>log4j-api</artifactId>
|
<artifactId>log4j-api</artifactId>
|
||||||
<version>2.17.2</version>
|
<version>2.19.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.logging.log4j</groupId>
|
<groupId>org.apache.logging.log4j</groupId>
|
||||||
<artifactId>log4j-core</artifactId>
|
<artifactId>log4j-core</artifactId>
|
||||||
<version>2.17.2</version>
|
<version>2.19.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>junit</groupId>
|
<groupId>junit</groupId>
|
||||||
@ -160,6 +160,10 @@
|
|||||||
<source>${basedir}/target/dragoon-${project.version}-jar-with-dependencies.jar</source>
|
<source>${basedir}/target/dragoon-${project.version}-jar-with-dependencies.jar</source>
|
||||||
<target>/opt/dragoon/dragoon.jar</target>
|
<target>/opt/dragoon/dragoon.jar</target>
|
||||||
</fileSet>
|
</fileSet>
|
||||||
|
<fileSet>
|
||||||
|
<source>${basedir}/src/main/resources/log4j2.xml</source>
|
||||||
|
<target>/opt/dragoon/log4j2.xml</target>
|
||||||
|
</fileSet>
|
||||||
</fileSets>
|
</fileSets>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
@ -201,6 +205,17 @@
|
|||||||
</source>
|
</source>
|
||||||
</sources>
|
</sources>
|
||||||
</mapping>
|
</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>
|
<mapping>
|
||||||
<directory>/etc/dragoon</directory>
|
<directory>/etc/dragoon</directory>
|
||||||
<configuration>true</configuration>
|
<configuration>true</configuration>
|
||||||
|
@ -4,7 +4,7 @@ Description=Dragoon video transcoder service
|
|||||||
[Service]
|
[Service]
|
||||||
User=dragoon
|
User=dragoon
|
||||||
Group=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
|
SuccessExitStatus=143
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
|
@ -4,6 +4,6 @@ import org.apache.logging.log4j.LogManager;
|
|||||||
|
|
||||||
public class Logger {
|
public class Logger {
|
||||||
|
|
||||||
public static org.apache.logging.log4j.Logger logger = LogManager.getLogger();
|
public static org.apache.logging.log4j.Logger logger = LogManager.getRootLogger();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user