Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #1226 

Moved jetty.sh to jetty-home
relocated JETTY_RUN to be a jetty directory in /var/run etc.
moved start.log to be in JETTY_RUN
This commit is contained in:
Greg Wilkins 2017-01-10 17:10:27 +11:00
parent ced72c52bd
commit bf60197490
3 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jetty-home/pom.xml
View File

@ -11,7 +11,7 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
<assembly-directory>${basedir}/target/home</assembly-directory> <assembly-directory>${basedir}/target/jetty-home</assembly-directory>
<jetty-setuid-version>1.0.3</jetty-setuid-version> <jetty-setuid-version>1.0.3</jetty-setuid-version>
</properties> </properties>
@ -340,6 +340,24 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>set jetty.sh</id>
<phase>process-resources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<chmod dir="${assembly-directory}/bin" perm="755" includes="**/*.sh" />
</tasks>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>

7
jetty-distribution/src/main/resources/bin/jetty.sh → jetty-home/src/main/resources/bin/jetty.sh
View File

@ -274,7 +274,8 @@ fi
##################################################### #####################################################
if [ -z "$JETTY_RUN" ] if [ -z "$JETTY_RUN" ]
then then
JETTY_RUN=$(findDirectory -w /var/run /usr/var/run $JETTY_BASE /tmp) JETTY_RUN=$(findDirectory -w /var/run /usr/var/run $JETTY_BASE /tmp)/jetty
[ -d "$JETTY_RUN" ] || mkdir $JETTY_RUN
fi fi
##################################################### #####################################################
@ -433,7 +434,7 @@ case "$ACTION" in
CH_USER="-c$JETTY_USER" CH_USER="-c$JETTY_USER"
fi fi
start-stop-daemon -S -p"$JETTY_PID" $CH_USER -d"$JETTY_BASE" -b -m -a "$JAVA" -- "${RUN_ARGS[@]}" start-log-file="$JETTY_LOGS/start.log" start-stop-daemon -S -p"$JETTY_PID" $CH_USER -d"$JETTY_BASE" -b -m -a "$JAVA" -- "${RUN_ARGS[@]}" start-log-file="$JETTY_RUN/start.log"
else else
@ -455,7 +456,7 @@ case "$ACTION" in
chown "$JETTY_USER" "$JETTY_PID" chown "$JETTY_USER" "$JETTY_PID"
# FIXME: Broken solution: wordsplitting, pathname expansion, arbitrary command execution, etc. # FIXME: Broken solution: wordsplitting, pathname expansion, arbitrary command execution, etc.
su - "$JETTY_USER" $SU_SHELL -c " su - "$JETTY_USER" $SU_SHELL -c "
exec ${RUN_CMD[*]} start-log-file="$JETTY_LOGS/start.log" > /dev/null & exec ${RUN_CMD[*]} start-log-file="$JETTY_RUN/start.log" > /dev/null &
disown \$! disown \$!
echo \$! > '$JETTY_PID'" echo \$! > '$JETTY_PID'"
else else