Merge pull request #483 from Scene53/1.1.x

1.1.x

pkg/build.sh

@@ -32,13 +32,15 @@ if [ ! -f "$jar" ] ; then
   exit 1
 fi
 
-cp $jar $destdir/$prefix/
+cp $jar $destdir/$prefix/logstash.jar
 
 case $os@$release in
   centos@*)
     mkdir -p $destdir/etc/logrotate.d
     mkdir -p $destdir/etc/sysconfig
     mkdir -p $destdir/etc/init.d
+	mkdir -p $destdir/etc/logstash/conf.d
+	mkdir -p $destdir/opt/logstash/tmp
     mkdir -p $destdir/var/lib/logstash
     mkdir -p $destdir/var/run/logstash
     mkdir -p $destdir/var/log/logstash

pkg/logstash.sysv.redhat

@@ -131,12 +131,12 @@ case "$1" in
   start)
     echo -n "Starting $DESC: "
     do_start
-    touch /var/lock/subsys/logstash/$NAME
+    touch /var/run/logstash/$NAME
     ;;
   stop)
     echo -n "Stopping $DESC: "
     do_stop
-    rm /var/lock/subsys/logstash/$NAME
+    rm /var/run/logstash/$NAME
     ;;
   restart|reload)
     echo -n "Restarting $DESC: "