Skip to content

Commit 12dea00

Browse files
committed
🏃 run: Fix Linux service scripts to use classpath and class
Update the service scripts to use `-cp` and specify the GitBlitServer class, instead of the `-jar` parameter. Fixes #1333
1 parent 275d353 commit 12dea00

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/main/distrib/linux/install-service-fedora.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ After=network.target
1818
[Service]
1919
User=gitblit
2020
Group=gitblit
21-
Environment="ARGS=-server -Xmx1024M -Djava.awt.headless=true -jar"
21+
Environment="ARGS=-server -Xmx1024M -Djava.awt.headless=true -cp"
2222
EnvironmentFile=-/etc/sysconfig/gitblit
2323
WorkingDirectory=/opt/gitblit
24-
ExecStart=/usr/bin/java \$ARGS gitblit.jar --httpsPort \$GITBLIT_HTTPS_PORT --httpPort \$GITBLIT_HTTP_PORT --baseFolder \$GITBLIT_BASE_FOLDER --dailyLogFile
25-
ExecStop=/usr/bin/java \$ARGS gitblit.jar --baseFolder \$GITBLIT_BASE_FOLDER --stop
24+
ExecStart=/usr/bin/java \$ARGS gitblit.jar:ext/* com.gitblit.GitBlitServer --httpsPort \$GITBLIT_HTTPS_PORT --httpPort \$GITBLIT_HTTP_PORT --baseFolder \$GITBLIT_BASE_FOLDER --dailyLogFile
25+
ExecStop=/usr/bin/java \$ARGS gitblit.jar:ext/* com.gitblit.GitBlitServer --baseFolder \$GITBLIT_BASE_FOLDER --stop
2626
2727
[Install]
2828
WantedBy=multi-user.target
2929
EOF
3030

3131
# Finally copy the files to the destination and register the systemd unit.
32-
sudo su -c "cp /tmp/gitblit.defaults /etc/sysconfig/gitblit && cp /tmp/gitblit.service /etc/systemd/system/"
33-
sudo su -c "systemctl daemon-reload && systemctl enable gitblit.service && systemctl start gitblit.service"
32+
sudo sh -c "cp /tmp/gitblit.defaults /etc/sysconfig/gitblit && cp /tmp/gitblit.service /etc/systemd/system/"
33+
sudo sh -c "systemctl daemon-reload && systemctl enable gitblit.service && systemctl start gitblit.service"

src/main/distrib/linux/service-centos.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ GITBLIT_HTTP_PORT=0
1111
GITBLIT_HTTPS_PORT=8443
1212
GITBLIT_LOG=/var/log/gitblit.log
1313
source ${GITBLIT_PATH}/java-proxy-config.sh
14-
JAVA="java -server -Xmx1024M ${JAVA_PROXY_CONFIG} -Djava.awt.headless=true -jar"
14+
JAVA="java -server -Xmx1024M ${JAVA_PROXY_CONFIG} -Djava.awt.headless=true -cp"
1515

1616
RETVAL=0
1717

@@ -21,7 +21,7 @@ case "$1" in
2121
then
2222
echo $"Starting gitblit server"
2323
cd $GITBLIT_PATH
24-
$JAVA $GITBLIT_PATH/gitblit.jar --httpsPort $GITBLIT_HTTPS_PORT --httpPort $GITBLIT_HTTP_PORT --baseFolder $GITBLIT_BASE_FOLDER --dailyLogFile &
24+
$JAVA "$GITBLIT_PATH/gitblit.jar:$GITBLIT_PATH/ext/*" com.gitblit.GitBlitServer --httpsPort $GITBLIT_HTTPS_PORT --httpPort $GITBLIT_HTTP_PORT --baseFolder $GITBLIT_BASE_FOLDER --dailyLogFile &
2525
echo "."
2626
exit $RETVAL
2727
fi
@@ -32,7 +32,7 @@ case "$1" in
3232
then
3333
echo $"Stopping gitblit server"
3434
cd $GITBLIT_PATH
35-
$JAVA $GITBLIT_PATH/gitblit.jar --baseFolder $GITBLIT_BASE_FOLDER --stop > /dev/null &
35+
$JAVA "$GITBLIT_PATH/gitblit.jar:$GITBLIT_PATH/ext/*" com.gitblit.GitBlitServer --baseFolder $GITBLIT_BASE_FOLDER --stop > /dev/null &
3636
echo "."
3737
exit $RETVAL
3838
fi

src/main/distrib/linux/service-ubuntu.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ GITBLIT_PATH=/opt/gitblit
1919
GITBLIT_BASE_FOLDER=/opt/gitblit/data
2020
GITBLIT_USER="gitblit"
2121
source ${GITBLIT_PATH}/java-proxy-config.sh
22-
ARGS="-server -Xmx1024M ${JAVA_PROXY_CONFIG} -Djava.awt.headless=true -jar gitblit.jar --baseFolder $GITBLIT_BASE_FOLDER --dailyLogFile"
22+
ARGS="-server -Xmx1024M ${JAVA_PROXY_CONFIG} -Djava.awt.headless=true -cp gitblit.jar:ext/* com.gitblit.GitBlitServer --baseFolder $GITBLIT_BASE_FOLDER --dailyLogFile"
2323

2424
RETVAL=0
2525

0 commit comments

Comments
 (0)