Merge pull request #576 from torrancew/fix_packaging_format

Fix generated .deb packages up a bit

.gitignore

@@ -1,5 +1,7 @@
 .*.swp
 *.gem
+pkg/*.deb
+pkg/*.rpm
 *.class
 .rbx
 Gemfile.lock

Makefile

@@ -66,6 +66,7 @@ clean:
 	-$(QUIET)rm -rf .bundle
 	-$(QUIET)rm -rf build
 	-$(QUIET)rm -rf vendor
+	-$(QUIET)rm -f pkg/*.deb
 
 .PHONY: compile
 compile: compile-grammar compile-runner | build/ruby

pkg/build.sh

@@ -49,22 +49,31 @@ case $os@$release in
     install -m755 logstash.sysv.redhat $destdir/etc/init.d/logstash
     ;;
   ubuntu@*)
+    mkdir -p $destdir/etc/logstash/conf.d
     mkdir -p $destdir/etc/logrotate.d
     mkdir -p $destdir/etc/init
     mkdir -p $destdir/var/log/logstash
-    mkdir -p $destdir/etc/sysconfig
-    touch $destdir/etc/sysconfig/logstash
-    install -m644 logrotate.conf $destdir/etc/logrotate.d/
+    mkdir -p $destdir/etc/default
+    touch $destdir/etc/default/logstash
+    install -m644 logrotate.conf $destdir/etc/logrotate.d/logstash
+    install -m644 logstash.default $destdir/etc/default/logstash
+    install -m644 logstash-web.default $destdir/etc/default/logstash-web
     install -m755 logstash.upstart.ubuntu $destdir/etc/init/logstash.conf
+    install -m755 logstash-web.upstart.ubuntu $destdir/etc/init/logstash-web.conf
     ;;
   debian@*)
+    mkdir -p $destdir/etc/logstash/conf.d
     mkdir -p $destdir/etc/logrotate.d
     mkdir -p $destdir/etc/init.d
     mkdir -p $destdir/var/lib/logstash
-    mkdir -p $destdir/var/run/logstash
     mkdir -p $destdir/var/log/logstash
-    install -m644 logrotate.conf $destdir/etc/logrotate.d/
+    mkdir -p $destdir/etc/default
+    touch $destdir/etc/default/logstash
+    install -m644 logrotate.conf $destdir/etc/logrotate.d/logstash
+    install -m644 logstash.default $destdir/etc/default/logstash
+    install -m644 logstash-web.default $destdir/etc/default/logstash-web
     install -m755 logstash.sysv.debian $destdir/etc/init.d/logstash
+    install -m755 logstash-web.sysv.debian $destdir/etc/init.d/logstash-web
     ;;
   *) 
     echo "Unknown OS: $os $release"
@@ -87,9 +96,10 @@ case $os in
     fpm -s dir -t deb -n logstash -v "$VERSION" \
       -a all --iteration 1-$os \
       -d "java6-runtime" \
-      --before-install ubuntu/before-install.sh \
-      --before-remove ubuntu/before-remove.sh \
-      --after-install ubuntu/after-install.sh \
+      --deb-user root --deb-group root \
+      --before-install $os/before-install.sh \
+      --before-remove $os/before-remove.sh \
+      --after-install $os/after-install.sh \
       -f -C $destdir .
     ;;
 esac

pkg/debian/after-install.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
 
-mkdir -p /home/logstash
-chown logstash:logstash /home/logstash
+chown -R logstash:logstash /opt/logstash
+chown logstash /var/log/logstash
+chown logstash:logstash /var/lib/logstash

pkg/debian/before-install.sh

@@ -7,6 +7,7 @@ fi
 
 # create logstash user
 if ! getent passwd logstash >/dev/null; then
-  useradd -r -g logstash -d /home/logstash \
-    -s /sbin/nologin -c "logstash" logstash
+  useradd -M -r -g logstash -d /var/lib/logstash \
+    -s /sbin/nologin -c "LogStash Service User" logstash
 fi
+

pkg/debian/before-remove.sh

@@ -1,17 +1,13 @@
 #!/bin/sh
 
 if [ $1 == "remove" ]; then
-  /etc/init.d/logstash > /dev/null 2>&1 || true
+  /etc/init.d/logstash stop >/dev/null 2>&1 || true
 
   if getent passwd logstash >/dev/null ; then
     userdel logstash
   fi
 
-  if getent group logstash > /dev/null ; then
+  if getent group logstash >/dev/null ; then
     groupdel logstash
   fi
-
-  if [ -d "/home/logstash" ] ; then
-    rm -rf /home/logstash
-  fi
 fi

pkg/logstash-web.default

@@ -0,0 +1,41 @@
+# defaults for logstash
+
+# Start logstash on boot?
+START=no
+
+# pulled in from the init script; makes things easier.
+NAME=logstash-web
+
+# location of java
+JAVA=/usr/bin/java
+
+# arguments to pass to java
+LS_JAVA_OPTS="-Xmx256m -Djava.io.tmpdir=/var/lib/logstash/"
+
+PIDFILE=/var/run/logstash-web.pid
+
+# user id to be invoked as
+LS_USER=logstash
+
+# location of the logstas jar file
+LS_JAR=/opt/logstash/logstash.jar
+
+# logstash home location
+LS_HOME=/var/lib/logstash
+
+# logstash log directory
+LOG_DIR=/var/log/logstash
+
+# logstash log file
+LOG_FILE=$LOG_DIR/$NAME.log
+
+# logstash configuration directory
+CONF_DIR=/etc/logstash/conf.d
+
+# Open file limit
+OPEN_FILES=2048
+
+# Nice level
+NICE=19
+
+HOME=/var/lib/logstash

pkg/logstash-web.sysv.debian

@@ -0,0 +1,201 @@
+#!/bin/bash
+#
+# /etc/init.d/logstash -- startup script for LogStash.
+#
+### BEGIN INIT INFO
+# Provides:          logstash-web
+# Required-Start:    $all
+# Required-Stop:     $all
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Starts the LogStash web server
+# Description:       Starts logstash-web using start-stop-daemon
+### END INIT INFO
+
+set -e
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+NAME=logstash-web
+DESC="Logstash Web Server"
+DEFAULT=/etc/default/$NAME
+
+if [ `id -u` -ne 0 ]; then
+   echo "You need root privileges to run this script"
+   exit 1
+fi
+
+. /lib/lsb/init-functions
+
+if [ -r /etc/default/rcS ]; then
+   . /etc/default/rcS
+fi
+
+# The following variables can be overwritten in $DEFAULT
+
+# Run logstash as this user ID and group ID
+LS_USER=logstash
+LS_GROUP=logstash
+
+JAVA=/usr/bin/java
+
+# Directory where the logstash all in one jar lives
+LS_HOME=/var/lib/logstash
+
+# Additional Java OPTS
+LS_JAVA_OPTS=" -Djava.io.tmpdir=/var/logstash/"
+
+# logstash log directory
+LOG_DIR=/var/log/logstash
+
+# logstash configuration directory
+CONF_DIR=/etc/logstash/conf.d
+
+# logstash log file
+LOG_FILE=$LOG_DIR/$NAME.log
+
+# Open File limit
+OPEN_FILES=2048
+
+
+
+# Nice level
+NICE=19
+
+# End of variables that can be overwritten in $DEFAULT
+
+# overwrite settings from default file
+if [ -f "$DEFAULT" ]; then
+   . "$DEFAULT"
+fi
+
+# Define other required variables
+PID_FILE=/var/run/$NAME.pid
+DAEMON=$LS_JAR
+DAEMON_OPTS="web"
+
+is_true() {
+    if [ "x$1" = "xtrue" -o "x$1" = "xyes" -o "x$1" = "x1" ] ; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+# Check DAEMON exists
+if ! test -e $DAEMON; then
+   log_failure_msg "Daemon $DAEMON doesn't exist"
+   exit 1
+fi
+
+case "$1" in
+   start)
+      if ! is_true "$START" ; then
+         echo "logstash not configured to start, please edit /etc/default/logstash to enable"
+         exit 0
+      fi
+
+      if [ -z "$JAVA" ]; then
+         log_failure_msg "no JDK found - $JAVA"
+         exit 1
+      fi
+
+      # Check if a config file exists
+      if ! test -e $CONF_DIR/*.conf; then
+         log_failure_msg "There aren't any configuration files in $CONF_DIR"
+         exit 1
+      fi
+
+      log_daemon_msg "Starting $DESC"
+
+      if start-stop-daemon --test --start --pidfile "$PID_FILE" \
+         --user "$LS_USER" --exec "$JAVA" \
+      >/dev/null; then
+         # Prepare environment
+         ulimit -n $OPEN_FILES
+
+         # Start Daemon
+         start-stop-daemon --start -b --user "$LS_USER" -c "$LS_USER":"$LS_GROUP" \
+           -d "$LS_HOME" --pidfile "$PID_FILE" --make-pidfile \
+           --exec "$JAVA" -- $LS_JAVA_OPTS -jar $DAEMON $DAEMON_OPTS
+
+         sleep 1
+
+         if start-stop-daemon --test --start --pidfile "$PID_FILE" \
+            --user "$LS_USER" --exec "$JAVA" \
+         >/dev/null; then
+
+            if [ -f "$PID_FILE" ]; then
+               rm -f "$PID_FILE"
+            fi
+
+            log_end_msg 1
+         else
+            log_end_msg 0
+         fi
+      else
+         log_progress_msg "(already running)"
+         log_end_msg 0
+      fi
+   ;;
+   stop)
+      log_daemon_msg "Stopping $DESC"
+
+      set +e
+
+      if [ -f "$PID_FILE" ]; then
+         start-stop-daemon --stop --pidfile "$PID_FILE" \
+            --user "$LS_USER" \
+            --retry=TERM/20/KILL/5 >/dev/null
+
+         if [ $? -eq 1 ]; then
+            log_progress_msg "$DESC is not running but pid file exists, cleaning up"
+         elif [ $? -eq 3 ]; then
+            PID="`cat $PID_FILE`"
+            log_failure_msg "Failed to stop $DESC (pid $PID)"
+            exit 1
+         fi
+
+         rm -f "$PID_FILE"
+      else
+         log_progress_msg "(not running)"
+      fi
+
+      log_end_msg 0
+      set -e
+   ;;
+   status)
+      set +e
+
+      start-stop-daemon --test --start --pidfile "$PID_FILE" \
+         --user "$LS_USER" --exec "$JAVA" \
+      >/dev/null 2>&1
+
+      if [ "$?" = "0" ]; then
+         if [ -f "$PID_FILE" ]; then
+            log_success_msg "$DESC is not running, but pid file exists."
+            exit 1
+         else
+            log_success_msg "$DESC is not running."
+            exit 3
+         fi
+      else
+         log_success_msg "$DESC is running with pid `cat $PID_FILE`"
+      fi
+
+      set -e
+   ;;
+   restart|force-reload)
+      if [ -f "$PID_FILE" ]; then
+         $0 stop
+         sleep 1
+      fi
+
+      $0 start
+   ;;
+   *)
+      log_success_msg "Usage: $0 {start|stop|restart|force-reload|status}"
+      exit 1
+   ;;
+esac
+
+exit 0

pkg/logstash-web.upstart.ubuntu

@@ -0,0 +1,18 @@
+# logstash-web - web server
+#
+
+description "logstash-web web server"
+
+start on virtual-filesystems
+stop on runlevel [06]
+
+# Respawn it if the process exits
+respawn
+
+setuid logstash
+setgid logstash
+
+# Change into a writable directory
+chdir /var/lib/logstash
+console log
+exec /usr/bin/java -jar /opt/logstash/logstash.jar web

pkg/logstash.default

@@ -0,0 +1,45 @@
+# defaults for logstash
+
+# Start logstash on boot?
+START=no
+
+# pulled in from the init script; makes things easier.
+NAME=logstash
+
+# location of java
+JAVA=/usr/bin/java
+
+# arguments to pass to java
+LS_JAVA_OPTS="-Xmx256m -Djava.io.tmpdir=/var/lib/logstash/"
+
+PIDFILE=/var/run/logstash.pid
+
+# user id to be invoked as
+LS_USER=logstash
+
+# location of the logstas jar file
+LS_JAR=/opt/logstash/logstash.jar
+
+# logstash home location
+LS_HOME=/var/lib/logstash
+
+# logstash log directory
+LOG_DIR=/var/log/logstash
+
+# logstash log file
+LOG_FILE=$LOG_DIR/$NAME.log
+
+# logstash configuration directory
+CONF_DIR=/etc/logstash/conf.d
+
+# Open file limit
+OPEN_FILES=2048
+
+# Nice level
+NICE=19
+
+# Set LogStash options
+LS_OPTS="--log ${LOG_FILE}"
+
+# Set a home directory
+HOME=/var/lib/logstash

pkg/logstash.sysv.debian

@@ -56,7 +56,8 @@ LOG_FILE=$LOG_DIR/$NAME.log
 # Open File limit
 OPEN_FILES=2048
 
-
+# LogStash options
+LS_OPTS="--log ${LOG_DIR}/${NAME}.log"
 
 # Nice level
 NICE=19
@@ -71,7 +72,7 @@ fi
 # Define other required variables
 PID_FILE=/var/run/$NAME.pid
 DAEMON=$LS_JAR
-DAEMON_OPTS="agent -f ${CONF_DIR} --log ${LOG_FILE}"
+DAEMON_OPTS="agent -f ${CONF_DIR} ${LS_OPTS}"
 
 is_true() {
     if [ "x$1" = "xtrue" -o "x$1" = "xyes" -o "x$1" = "x1" ] ; then

pkg/logstash.upstart.ubuntu

@@ -15,6 +15,6 @@ setgid logstash
 
 # You need to chdir somewhere writable because logstash needs to unpack a few
 # temporary files on startup.
-chdir /home/logstash
+chdir /var/lib/logstash
 console log
-exec /usr/bin/java -jar logstash.jar agent -f /etc/logstash/agent.conf
+exec /usr/bin/java -jar /opt/logstash/logstash.jar agent -f /etc/logstash/conf.d

pkg/ubuntu/after-install.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
 
-mkdir -p /home/logstash
-chown logstash:logstash /home/logstash
+chown -R logstash:logstash /opt/logstash
+chown logstash /var/log/logstash
+chown logstash:logstash /var/lib/logstash

pkg/ubuntu/before-install.sh

@@ -7,6 +7,6 @@ fi
 
 # create logstash user
 if ! getent passwd logstash >/dev/null; then
-  useradd -r -g logstash -d /home/logstash \
-    -s /sbin/nologin -c "logstash" logstash
+  useradd -M -r -g logstash -d /var/lib/logstash \
+    -s /sbin/nologin -c "LogStash Service User" logstash
 fi

pkg/ubuntu/before-remove.sh

@@ -1,17 +1,13 @@
 #!/bin/sh
 
 if [ $1 == "remove" ]; then
-  stop logstash > /dev/null 2>&1 || true
+  stop logstash >/dev/null 2>&1 || true
 
   if getent passwd logstash >/dev/null ; then
     userdel logstash
   fi
 
-  if getent group logstash > /dev/null ; then
+  if getent group logstash >/dev/null ; then
     groupdel logstash
   fi
-
-  if [ -d "/home/logstash" ] ; then
-    rm -rf /home/logstash
-  fi
 fi