Tarball packages. Homogenized init. Common defaults.

Makefile

@@ -427,13 +427,10 @@ releaseNote:
 	$(QUIET)curl -si "https://logstash.jira.com/secure/ReleaseNote.jspa?version=$(JIRA_VERSION_ID)&projectId=10020" | sed -n '/<textarea.*>/,/<\/textarea>/p' | grep textarea -v >> releaseNote.html
 	$(QUIET)ruby pull_release_note.rb
 
-package:
-	[ ! -f build/logstash-$(VERSION)-flatjar.jar ] \
-		&& make build/logstash-$(VERSION)-flatjar.jar ; \
+package: build/logstash-$(VERSION).tar.gz
 	(cd pkg; \
-		./build.sh ubuntu 12.10; \
-		./build.sh centos 6; \
-		./build.sh debian 6; \
+		./build.sh ubuntu 12.04; \
+		./build.sh centos 6 \
 	)
 
 vendor/kibana: | vendor

bin/logstash

@@ -23,6 +23,9 @@ basedir=$(cd `dirname $0`/..; pwd)
 
 setup
 
+# Export these so that they can be picked up by file input (and others?).
+export HOME SINCEDB_DIR
+
 case $1 in
   deps) install_deps ;;
   -*) 

pkg/build.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-
+# We only need to build two packages now, rpm and deb.  Leaving the os/version stuff in case things change.
 
 [ ! -f ../.VERSION.mk ] && make -C .. .VERSION.mk
 
@@ -12,7 +12,6 @@ if ! git show-ref --tags | grep -q "$(git rev-parse HEAD)"; then
 	RPM_REVISION=".${BUILD_TIME}.${REVISION}"
 fi
 
-
 URL="http://logstash.net"
 DESCRIPTION="An extensible logging pipeline"
 
@@ -37,18 +36,17 @@ fi
 
 mkdir -p $destdir/$prefix
 
-
-# install logstash.jar
-jar="$(dirname $0)/../build/logstash-$VERSION-flatjar.jar"
-if [ ! -f "$jar" ] ; then
-  echo "Unable to find $jar"
-  exit 1
+# Deploy the tarball to /opt/logstash
+tar="$(dirname $0)/../build/logstash-$VERSION.tar.gz"
+if [ ! -f "$tar" ] ; then
+echo "Unable to find $tar"
+exit 1
 fi
 
-cp $jar $destdir/$prefix/logstash.jar
+tar -C $destdir/$prefix --strip-components 1 -zxf $tar
 
 case $os@$release in
-  centos@*)
+ centos@*|fedora@*|el6@*|sl6@*)
     mkdir -p $destdir/etc/logrotate.d
     mkdir -p $destdir/etc/sysconfig
     mkdir -p $destdir/etc/init.d
@@ -57,36 +55,28 @@ case $os@$release in
     mkdir -p $destdir/var/lib/logstash
     mkdir -p $destdir/var/run/logstash
     mkdir -p $destdir/var/log/logstash
-    cp $os/sysconfig $destdir/etc/sysconfig/logstash
+    chmod 0755 $destdir/opt/logstash/bin/logstash
     install -m644 logrotate.conf $destdir/etc/logrotate.d/logstash
+    install -m644 logstash.default $destdir/etc/sysconfig/logstash
     install -m755 logstash.sysv.redhat $destdir/etc/init.d/logstash
+    install -m644 logstash-web.default $destdir/etc/sysconfig/logstash
+    install -m755 logstash-web.sysv.redhat $destdir/etc/init.d/logstash-web
     ;;
-  ubuntu@*)
+  ubuntu@*|debian@*)
     mkdir -p $destdir/etc/logstash/conf.d
     mkdir -p $destdir/etc/logrotate.d
     mkdir -p $destdir/etc/init
-    mkdir -p $destdir/var/lib/logstash
-    mkdir -p $destdir/var/log/logstash
-    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/log/logstash
     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.sysv.debian $destdir/etc/init.d/logstash
+    install -m644 logstash-web.default $destdir/etc/default/logstash-web
+    install -m755 logstash-web.upstart.ubuntu $destdir/etc/init/logstash-web.conf
     install -m755 logstash-web.sysv.debian $destdir/etc/init.d/logstash-web
     ;;
   *) 
@@ -97,9 +87,9 @@ esac
 
 description="logstash is a system for managing and processing events and logs"
 case $os in
-  centos|fedora|redhat) 
+  centos|fedora|redhat|sl) 
     fpm -s dir -t rpm -n logstash -v "$RELEASE" \
-      -a noarch --iteration "1_${os}${RPM_REVISION}" \
+      -a noarch --iteration "1_${RPM_REVISION}" \
       --url "$URL" \
       --description "$DESCRIPTION" \
       -d "jre >= 1.6.0" \
@@ -121,12 +111,12 @@ case $os in
     fi
 
     fpm -s dir -t deb -n logstash -v "$RELEASE" \
-      -a all --iteration "1-${os}${DEB_REVISION}" \
+      -a all --iteration "1-${DEB_REVISION}" \
       --url "$URL" \
       --description "$DESCRIPTION" \
       --vendor "Elasticsearch" \
       --license "Apache 2.0" \
-      -d "java7-runtime-headless | java6-runtime-headless" \
+      -d "java7-runtime-headless | java6-runtime-headless | j2re1.7" \
       --deb-user root --deb-group root \
       --before-install $os/before-install.sh \
       --before-remove $os/before-remove.sh \

pkg/centos/after-install.sh

@@ -1 +1,7 @@
 /sbin/chkconfig --add logstash
+
+chown -R logstash:logstash /opt/logstash
+chown logstash /var/log/logstash
+chown logstash:logstash /var/lib/logstash
+chmod +x /etc/rc.d/init.d/logstash
+chmod +x /opt/logstash/bin/logstash

pkg/debian/before-install.sh

@@ -10,4 +10,3 @@ if ! getent passwd logstash >/dev/null; then
   useradd -M -r -g logstash -d /var/lib/logstash \
     -s /sbin/nologin -c "LogStash Service User" logstash
 fi
-

pkg/debian/before-remove.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ $1 = "remove" ]; then
-  /etc/init.d/logstash stop >/dev/null 2>&1 || true
+  service logstash stop >/dev/null 2>&1 || true
 
   if getent passwd logstash >/dev/null ; then
     userdel logstash