Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/release packaging #5341

Closed

Conversation

untergeek
Copy link
Member

Updates to work with @jsvd's work on logstash.yml settings.

This uses a wrapper around pleaserun (bin/system-install) to generate the proper startup files for whatever environment you're using.

@@ -23,3 +23,6 @@ gem "rubyzip", "~> 1.1.7", :group => :build
gem "gems", "~> 0.8.3", :group => :build
gem "rack-test", :require => "rack/test", :group => :development
gem "flores", "~> 0.0.6", :group => :development
gem "pleaserun"
gem "mustache"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see Mustache invoked in this PR. Pleaserun uses it, but lists it as a dependency. Do we need it listed here?

Same question for Clamp.

@suyograo
Copy link
Contributor

Tested new dir structure and its consistent with ES layout.

suyog@ubuntu:~$ ls /usr/share/logstash/
bin  CHANGELOG.md  CONTRIBUTORS  Gemfile  Gemfile.jruby-1.9.lock  lib  LICENSE  NOTICE.TXT  vendor
suyog@ubuntu:~$ ls /etc/logstash/
conf.d  jvm.options  logstash.yml  startup.options

LGTM.

Update after-install scripts

Use /usr/lib/logstash instead of /opt/logstash

More revisions.

Using `/usr/share/logstash` instead of `/usr/lib/logstash`

Track these new files

More work in progress.

Proper arg parsing obtained

WIP: Use jvm.options like ES

Remove facter dependency

Due to an update from @jordansissel on pleaserun, facter is no longer necessary

Revert Gemfile to proper version

Latest work in progress.

I added a simple test to logstash.lib.sh to catch empty strings in java options.

Added `startup.options`, and touched up `jvm.options`

Edited the package scripts to make things play nice with new paths.

Tweaked `system-install` to allow users to provide their own `startup.options` file.

Patch up merge failure

Changes to work with the new logstash.yml

Add fpm dependency (build fails without it)

Fix missing gems in Gemfile

Don't know how these got lost

Use /etc/logstash for configuration in packages

Update the instructions/documentation for...

...startup.options

Merging proposed changes

Remove mustache and clamp

They're covered by pleaserun anyway

Prune config dir from /usr/share/logstash...

...but only when using RPM/DEB packages
@untergeek untergeek force-pushed the feature/release_packaging branch from f99ed24 to 27117f9 Compare May 25, 2016 17:13
@elasticsearch-bot
Copy link

Aaron Mildenstein merged this into the following branches!

Branch Commits
master e40ecbb

@jordansissel
Copy link
Contributor

Eeee much excite.

@untergeek untergeek deleted the feature/release_packaging branch May 25, 2016 21:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants