Commit graph

119 commits

Author SHA1 Message Date
Jan Gaedicke
b91bf22fc7 fixes https://logstash.jira.com/browse/LOGSTASH-2040
stderror still open after calling /etc/init.d/logstash start
You should redirect stderror AND stdout of logstash to /dev/null, so all outputs are closed cleanly and automation tools reading the output of the init-script can quit cleanly.
2014-04-01 20:46:14 +02:00
Jan Gaedicke
942d3550a3 starting a already running service should return exit code 0
according to the Linux Standard Base Core Specification this shouldn't be 99 but 0
see http://refspecs.linuxbase.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html
2014-04-01 20:46:14 +02:00
James Turnbull
53285b8862 Fixed RPM license linting error 2014-03-23 01:39:59 -04:00
Jordan Sissel
76aaf0cada Dont need 'build time' in the iteration 2014-03-19 21:00:52 +00:00
Faye Salwin
981f0b9073 Fix for the awk version in debian 7.3 (by not using awk) 2014-02-25 16:52:04 -08:00
Faye Salwin
69d5fb3583 add recommended options to fpm for centos, which should negate the need to set executable 2014-02-24 14:21:01 -08:00
Faye Salwin
3537c6b847 Tarball packages. Homogenized init. Common defaults. 2014-02-24 14:21:01 -08:00
Richard Pijnenburg
0558a8f834 Fixes for Init files
- Remove the START=true check from all sysv style init files.
- Set the java check to a which command
2014-02-13 17:08:39 +01:00
Jordan Sissel
c18afeb7ad Merge pull request #910 from sbagmeijer/master
Update logstash.spec
2014-02-03 16:02:07 -08:00
Pieter Lexis
3d2f303e22 Use Java 7 on debian if it's available 2014-02-01 13:40:29 +01:00
Jordan Sissel
b5509295c4 Depend on java6 at minimum. 2014-01-31 15:44:58 -08:00
Jordan Sissel
c60f2e49cd Ubuntu/Debian should depend on 'java-runtime-headless'
This fixes #893. The previous dependency "default-jre-headless" is just
a metapackage pointing at openjre6, but "java6-runtime-headless" is a
'Provides' entry that openjdk packages seem to provide for java versions
6 and 7. This should ensure we are correctly requesting *any* java 6+
implementation instead of requiring a specific java package.
2014-01-31 10:26:12 -08:00
Adam Peck
b0c36843cb Use instead of pgrep to get PID 2014-01-20 13:02:09 -07:00
Jordan Sissel
add4c98011 Add license/vendor info to rpms as well 2014-01-20 10:21:23 -08:00
Jordan Sissel
af332f2bd5 Add vendor and license data to the packages 2014-01-20 10:18:53 -08:00
Sjir Bagmeijer
3a4907a37a Update logstash.spec
Updated to version 1.3.2 and also added support for the ARM version of Fedora.
2014-01-04 11:58:44 +01:00
Richard Pijnenburg
84441699c5 Fix deb package name.
Replace + sign with - sign
2013-12-27 17:22:01 +01:00
Jordan Sissel
522248b20e Fix bug in centos package building (this is a bug in fpm, but work around it for now) 2013-12-23 15:31:55 -08:00
Aaron Mildenstein
570ef184dc Merge pull request #742 from atwardowski/patch-1
Update logstash.sysv.redhat

Thanks for making Logstash more awesome! :)
2013-12-06 09:07:38 -08:00
Marc Fournier
7a4ee6aaf8 [packaging] adapt previous patchset to new .VERSION.mk
To recap, the goal is to keep the commit sha1 in the package release
number after the always-incrementing timestamp, and not in logstash's
version number.

Otherwise, we risk having dpkg/rpm believe the package will be
downgraded in the case let's say you have an 1.2.3.dev-abc123 version
which arrives after 1.2.3.dev-def456.
2013-11-27 15:14:23 +01:00
Marc Fournier
3ccf067c2f [packaging] depend on default-jre-headless
On debian/ubuntu, "default-jre" will pull several audio and GUI libs by
dependency, which aren't required to run logstash.
2013-11-27 14:32:06 +01:00
Marc Fournier
cace46ec2d [packaging] install only one copy of logrotate.conf 2013-11-27 14:32:06 +01:00
Marc Fournier
8b5b908ec2 [packaging] minor RPM improvements
- add time and commit id to package revision number
 - include url and description
2013-11-27 14:32:06 +01:00
Marc Fournier
11f574f6fd [packaging] flag files in /etc as configfiles
This prevents them from getting overwritten when the logstash deb/rpm is
upgraded.
2013-11-27 14:28:20 +01:00
Jordan Sissel
e73147129c - fetch the version from .VERSION.mk
- skip duplicating commit hash in the deb package iteration (it's
  included by default now)
2013-11-18 22:11:37 +00:00
Nick Ethier
692dd040d8 Merge pull request #680 from sbagmeijer/master
Update logstash.spec
2013-11-06 17:12:52 -08:00
Jordan Sissel
aefbebc161 Merge pull request #709 from pieterlexis/debian_dependencies
Alter dependency for Java on Debian
2013-11-06 16:35:11 -08:00
Pieter Lexis
7aaf45a925 Alter dependency for Java on Debian
* We don't want to pull in java6 when java7 is already installed
2013-10-29 10:34:37 +01:00
Sjir Bagmeijer
c80a69a3d5 Update logstash.spec
Fixed the following warnings:
[root@localhost rpmbuild]# rpmbuild -bb SPECS/logstash.spec
varning: bogus date in %changelog: Fri May 6 2013 sjir@basefarm.se 1.1.10-3
varning: bogus date in %changelog: Sat Feb  1 2013 Richard Pijnenburg <richard@i                                    spavailability.com> - 1.1.9-1
varning: bogus date in %changelog: Fri May 6 2013 sjir@basefarm.se 1.1.10-3
varning: bogus date in %changelog: Sat Feb  1 2013 Richard Pijnenburg <richard@i                                    spavailability.com> - 1.1.9-1
2013-10-27 10:21:10 +01:00
Sjir Bagmeijer
07405daf7f Update logstash.spec
Fixed the following warnings:
[root@localhost rpmbuild]# rpmbuild -bb SPECS/logstash.spec
varning: bogus date in %changelog: Fri May 6 2013 sjir@basefarm.se 1.1.10-3
varning: bogus date in %changelog: Sat Feb  1 2013 Richard Pijnenburg <richard@i                                    spavailability.com> - 1.1.9-1
varning: bogus date in %changelog: Fri May 6 2013 sjir@basefarm.se 1.1.10-3
varning: bogus date in %changelog: Sat Feb  1 2013 Richard Pijnenburg <richard@i                                    spavailability.com> - 1.1.9-1
2013-10-27 10:20:32 +01:00
Sjir Bagmeijer
207f09c5ae Fixed bogus dates
Fixed the following warnings:
[root@localhost rpmbuild]# rpmbuild -bb SPECS/logstash.spec
varning: bogus date in %changelog: Fri May 6 2013 sjir@basefarm.se 1.1.10-3
varning: bogus date in %changelog: Sat Feb  1 2013 Richard Pijnenburg <richard@i                                    spavailability.com> - 1.1.9-1
varning: bogus date in %changelog: Fri May 6 2013 sjir@basefarm.se 1.1.10-3
varning: bogus date in %changelog: Sat Feb  1 2013 Richard Pijnenburg <richard@i                                    spavailability.com> - 1.1.9-1
2013-10-27 10:19:05 +01:00
Adam Twardowski
72142fc01a Update logstash.sysv.redhat
Move daemon startup to be much later to allow for network file-systems to be mounted before we start.
2013-10-24 12:37:12 -04:00
Sjir Bagmeijer
e19d057ecc Update logstash.spec 2013-10-23 14:11:56 +02:00
Sjir Bagmeijer
dca65ff9d3 Update logstash.spec
* Wed Okt 23 2013 sjir@basefarm.no 1.2.2-1
- Update logstash version to 1.2.2-1
2013-10-23 14:08:51 +02:00
Sjir Bagmeijer
130bd6f79f Create logstash.conf
Added a default "Logstash.conf" as example and so logstash can actually run once you compile the rpm.
2013-09-30 18:02:35 +02:00
Sjir Bagmeijer
9f6257ed53 Create logstash.wrapper
Fixed the problem with the plugins as this no longer works.

Original file taken from:
https://github.com/piojo/logstash-rpm/blob/lsb/SOURCES/logstash.wrapper
2013-09-30 18:01:13 +02:00
Sjir Bagmeijer
bf6076ab54 Update logstash.sysconfig
Taken from: https://github.com/mhorbul/logstash-rpm/tree/master/SOURCES
2013-09-30 18:00:01 +02:00
Sjir Bagmeijer
9ee2f2b3fe Update logstash.init
Fixed the init.d script.

Example taken from: https://github.com/mhorbul/logstash-rpm/
2013-09-30 17:58:27 +02:00
Sjir Bagmeijer
55fbc55b9f Update logstash.spec
* Added a source5 with a default logstash.conf since logstash does not start without a config.

* Added buildarch so it can be build on i386
2013-09-30 17:55:50 +02:00
Sjir Bagmeijer
d7d236e782 Update logstash.spec
Removed the disabled java, should be enabled again.
2013-09-30 15:45:33 +02:00
Sjir Bagmeijer
1c38e1ba94 Update logstash.spec 2013-09-30 15:40:15 +02:00
Pieter Lexis
570d92c5b5 pkg/debian: Fix versioning if upstream is dev/rc
* Ensure a clean upgrade path on debian:
   * Change the upstream version from 'x.x.x.dev' and 'x.x.x.rcx' to 'x.x.x~dev' and 'x.x.x~rcx'
   * Use UTC instead of local time in the debian version
2013-09-23 11:48:01 +02:00
Nick Ethier
d2a2b7aa3b Merge pull request #596 from hco/patch-1
Created symlink for /var/lib/logstash/logstash.jar
2013-09-20 10:55:34 -07:00
Pieter Lexis
87329598ab pkg/debian: Make the package better
* Append date, time and git commithash to the local revision for non-releases
 * Add a url and short description to the package
 * Depend on 'default-jre' instead of a specific java version
2013-09-20 17:30:40 +02:00
Pieter Lexis
120ca1b89e pkg/debian: Implement better conffile detection 2013-09-20 17:30:40 +02:00
Pieter Lexis
e968bda364 pkg/debian: compare strings correctly 2013-09-20 17:30:40 +02:00
stuart-warren
e4573c80c3 Create /var/lib/logstash for ubuntu
Missing /var/lib/logstash for ubuntu
Package will not install properly without it
2013-09-03 12:46:43 +01:00
Hans-Christian Otto
a55a524864 Created symlink for /var/lib/logstash/logstash.jar
The puppet manifests expect it here. If you'd prefer that, i could also change it in the puppet manifests.
2013-08-26 17:35:10 +02:00
Tray Torrance
d28a250b46 Create and package an init script for logstash-web 2013-08-14 16:03:19 -07:00
Tray Torrance
8925b68082 Various fixes to generated .deb packages
This resolves a few inconsistencies and issues in the generated packages
for Debian/Ubuntu:

  * Creates /etc/logstash/conf.d
  * Installs a basic defaults file in /etc/default/logstash (which also sets HOME)
  * Stops creating /var/run/logstash (unused)
  * Uses /var/lib/logstash as the home directory of the logstash user instead of /home/logstash
  * Defaults package files to be owned by root, fixes ownership in post-install script
  * Properly stops service when removing the package on Debian

The end result is that after installing, LogStash will pretty much "just
work" with only 2 changes:

1) Enable START=yes in /etc/default/logstash
2) Provide a config for the LogStash agent
2013-08-14 16:03:19 -07:00