diff --git a/jetty.init b/jetty.init deleted file mode 100644 index e96c8ce..0000000 --- a/jetty.init +++ /dev/null @@ -1,153 +0,0 @@ -#!/bin/sh -# -# jetty This shell script takes care of starting and stopping jetty -# -# chkconfig: - 80 20 -# description: The Jetty Webserver and Servlet Container -# processname: jetty -# pidfile: /var/run/jetty/jetty.pid -# config: /etc/jetty/jetty.conf -# -# -# Portions from tomcat4.init by: -# -# Gomez Henri -# Keith Irwin -# Nicolas Mailhot -# -# - - -# Source function library. -. /etc/init.d/functions - -[ -r /etc/java/java.conf ] && . /etc/java/java.conf -export JAVA_HOME - -# Get Jetty's config - -JETTY_CFG="/etc/jetty/jetty.conf" - -[ -r "$JETTY_CFG" ] && . "${JETTY_CFG}" - -# Path to the jetty launch script (direct don't use the wrapper) -JETTY_SCRIPT=/usr/bin/djetty - -# if JETTY_USER is not set, use jetty -if [ -z "$JETTY_USER" ]; then - JETTY_USER="jetty" -fi - -# if JETTY_HOME is not set, use /usr/share/jetty -if [ -z "$JETTY_HOME" ]; then - JETTY_HOME="/usr/share/jetty" -fi - -if [ -z "$SHUTDOWN_WAIT" ]; then - SHUTDOWN_WAIT=10 -fi - -if [ -z "$JETTY_PID" ]; then - JETTY_PID=/var/run/jetty/jetty.pid -fi - - -prog=jetty -RETVAL=0 - -start() { - - if [ -f /var/lock/subsys/jetty ] ; then - if [ -f $JETTY_PID ]; then - read kpid < $JETTY_PID - if checkpid $kpid 2>&1; then - echo "process already running" - return -1 - else - echo "lock file found but no process running for pid $kpid, continuing" - fi - fi - fi - - echo -n $"Starting $prog: " -# [ -x ${JETTY_HOME}/ext ] && -# rebuild-jar-repository -s ${JETTY_HOME}/ext - - if [ -x /etc/rc.d/init.d/functions ]; then - daemon --user $JETTY_USER JETTY_PID=$JETTY_PID $JETTY_SCRIPT - else - su - $JETTY_USER -c "JETTY_PID=$JETTY_PID $JETTY_SCRIPT" - fi - - RETVAL=$? - [ $RETVAL = 0 ] && touch /var/lock/subsys/jetty && success || failure - echo - return $RETVAL -} - - -stop() { - - if [ -f /var/lock/subsys/jetty ] ; then - echo -n $"Stopping $prog: " - count=0; - - if [ -f $JETTY_PID ]; then - - read kpid < $JETTY_PID - let kwait=$SHUTDOWN_WAIT - -# Try issuing SIGTERM - - kill -15 $kpid - until [ `ps --pid $kpid 2> /dev/null | grep -c $kpid 2> /dev/null` -eq '0' ] || [ $count -gt $kwait ] - do -# echo "waiting for processes to exit"; - sleep 1 - let count=$count+1; - done - - if [ $count -gt $kwait ]; then -# echo "killing processes which didn't stop after $SHUTDOWN_WAIT seconds" - kill -9 $kpid - fi - fi - rm -f /var/lock/subsys/jetty $JETTY_PID - success - echo - fi -} - - - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status -p $JETTY_PID jetty - ;; - restart|reload) - stop - sleep 2 - start - ;; - condrestart) - [ -f $JETTY_PID ] || exit 0 - stop - start - ;; - *) - echo "Usage: $0 {start|stop|status|restart|reload|condrestart}" - exit 1 -esac - -exit $? - -# -# -# end diff --git a/jetty.script b/jetty.script deleted file mode 100644 index 8449675..0000000 --- a/jetty.script +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# Wrapper script for Jetty5, to be sure it will allways -# be run with correct user profile (jetty by default) -# -# derived from stuff in tomcat5.init -# -# Gomez Henri -# Keith Irwin -# Nicolas Mailhot -# -# version 1.01 - Fix webapps dir permissions -# - -[ -r /etc/java/java.conf ] && . /etc/java/java.conf -export JAVA_HOME - -# Path to the jetty launch script -JETTY_SCRIPT=/usr/bin/djetty - -# Jetty name :) -JETTY_PROG=jetty - -# if JETTY_USER is not set, use jetty -if [ -z "$JETTY_USER" ]; then - JETTY_USER="jetty" -fi - -# if JETTY_HOME is not set, use /usr/share/jetty -if [ -z "$JETTY_HOME" ]; then - JETTY_HOME="/usr/share/jetty" -fi - -pushd ${JETTY_HOME}/ext - rm -f jcert.jar - ln -s $(build-classpath jsse/jcert) - rm -f jnet.jar - ln -s $(build-classpath jsse/jnet) - rm -f jsse.jar - ln -s $(build-classpath jsse/jsse) -popd - - - -RETVAL=0 - -su - $JETTY_USER -c "$JETTY_SCRIPT $@" -RETVAL=$? -exit $RETVAL diff --git a/jetty.spec b/jetty.spec index 215a03c..6dbca89 100644 --- a/jetty.spec +++ b/jetty.spec @@ -52,7 +52,6 @@ License: ASL 2.0 URL: http://jetty.mortbay.org/jetty/ Source0: http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/snapshot/jetty-%{version}.%{addver}.tar.bz2 Source1: djetty.script -Source2: jetty.init Source3: jetty.logrotate Source4: %{name}-depmap.xml Source5: %{name}.service @@ -117,7 +116,9 @@ Requires: xerces-j2 >= 0:2.7 Requires: xml-commons-apis %{?FE_USERADD_REQ} -Requires(post): systemd-sysv +Requires(post): systemd-units, systemd-sysv +Requires(preun): systemd-units +Requires(postun): systemd-units Provides: group(%username) = %jtuid Provides: user(%username) = %jtuid @@ -182,7 +183,6 @@ mvn-rpmbuild -X \ %install # dirs install -dm 755 %{buildroot}%{_bindir} -install -dm 755 %{buildroot}%{_initrddir} install -dm 755 %{buildroot}%{_sysconfdir}/logrotate.d install -dm 755 %{buildroot}%{_javadir}/%{name} @@ -208,7 +208,6 @@ chmod +x %{buildroot}%{homedir}/bin/jetty-xinetd.sh chmod +x djetty mv djetty %{buildroot}%{_bindir}/djetty ln -s %{homedir}/bin/jetty.sh %{buildroot}%{_bindir}/%{name} -install -pm 755 %{SOURCE2} %{buildroot}%{_initrddir}/%{name} install -pm 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} echo '# Placeholder configuration file. No default is provided.' > \ %{buildroot}%{confdir}/jetty.conf @@ -345,14 +344,28 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/ %pre # Add the "jetty" user and group %__fe_groupadd %jtuid -r %username &>/dev/null || : -# Use /bin/sh so init script will start properly. -%__fe_useradd %jtuid -r -s /bin/sh -d %homedir -M \ +%__fe_useradd %jtuid -r -s /sbin/nologin -d %homedir -M \ -g %username %username &>/dev/null || : %post -[ -x /sbin/chkconfig ] && /sbin/chkconfig --add %{name} +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi + +%preun +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl --no-reload disable %{name}.service >/dev/null 2>&1 || : + /bin/systemctl stop %{name}.service >/dev/null 2>&1 || : +fi %postun +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : +fi %__fe_userdel %username &>/dev/null || : %__fe_groupdel %username &>/dev/null || : @@ -370,13 +383,6 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/ /sbin/chkconfig --del jetty >/dev/null 2>&1 || : /bin/systemctl try-restart jetty.service >/dev/null 2>&1 || : -%preun -if [ $1 = 0 ]; then - [ -f /var/lock/subsys/%{name} ] && %{_initrddir}/%{name} stop - [ -f %{_initrddir}/%{name} -a -x /sbin/chkconfig ] && /sbin/chkconfig --del %{name} - - %{_sbindir}/fedora-userdel %{name} >> /dev/null 2>&1 || : -fi %files %doc NOTICE.txt README.txt VERSION.txt LICENSE* @@ -404,8 +410,9 @@ fi %changelog * Mon Apr 23 2012 Mikolaj Izdebski - 8.1.0-6 -- Fix incorrect init script return value -- Resolves #814788 +- Drop init script, resolves #814788 +- Remove jetty.script from SCM +- Reload systemd on package install/upgrade/remove * Wed Apr 18 2012 Mikolaj Izdebski - 8.1.0-5 - Replace eclipse-rcp BR with felix-framework