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

Only glob *.conf by default in conf.d folder #7130

Merged
merged 4 commits into from
May 19, 2017

Conversation

suyograo
Copy link
Contributor

Fixes #6979, Fixes #1831

@jordansissel
Copy link
Contributor

Change looks good. Any thoughts on an acceptance test for this?

def get_unmatched_files
# transform "/var/lib/*.conf" => /var/lib/*
t = File.split(@path)
all_files = Dir.glob(File.join(t.first, "*")).sort
Copy link
Contributor

Choose a reason for hiding this comment

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

This will not show hidden (dot files) in the list of unmatched. I don't anticipate this to be confusing to users, but wanted to point it out.

If a user has a file named '.foo.conf' it will not be matched, nor will '.foo.bar' be shown as being skipped.

@suyograo
Copy link
Contributor Author

@jordansissel I'd love to add acceptance tests, but they are all broken already. Tracking here: #7123

How about I create an issue and add an acceptance for this when #7123 is settled?

@jordansissel
Copy link
Contributor

+1 on creating an issue and adding later.

@suyograo suyograo merged commit cfecf81 into elastic:master May 19, 2017
@suyograo suyograo deleted the allow_conf_files branch May 19, 2017 18:26
untergeek pushed a commit that referenced this pull request May 19, 2017
* Only glob *.conf by default in conf.d folder

Fixes #6979, Fixes #1831
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.

2 participants