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

Switch config file.recurse to clean by default and tell it to ignore _* #111

Merged
merged 1 commit into from
Apr 1, 2015

Conversation

iggy
Copy link
Contributor

@iggy iggy commented Mar 27, 2015

Salt writes it's schedule file to /etc/salt/{minion,master}.d/_schedule.conf

We don't want to stomp all over Salt's files, but we do want a pristine
starting point to lay down our managed config. So we use clean: True on the
file.recurse call, but we tell it to ignore files that start with an _

We have to rename the current config file (_defaults.conf) because it will be
ignored by the rule that ignores Salt's _* config files.

This also means we need to clean up old config files (_defaults.conf) and
restart the service if we cleaned it up.

Salt writes it's schedule file to /etc/salt/{minion,master}.d/_schedule.conf

We don't want to stomp all over Salt's files, but we do want a pristine
starting point to lay down our managed config. So we use clean: True on the
file.recurse call, but we tell it to ignore files that start with an _

We have to rename the current config file (_defaults.conf) because it will be
ignored by the rule that ignores Salt's _* config files.

This also means we need to clean up old config files (_defaults.conf) and
restart the service if we cleaned it up.
@iggy
Copy link
Contributor Author

iggy commented Mar 27, 2015

Hopefully I didn't miss anything from #104

@aboe76
Copy link
Member

aboe76 commented Mar 28, 2015

@iggy why not rename the file to defaults.conf why f_defaults.conf?
or better yet, name it override_defaults.conf because this is what the file does.

@iggy
Copy link
Contributor Author

iggy commented Mar 28, 2015

I was just going for a short prefix (f_ "formula") that indicated that it was related to formulas. I don't feel particularly strongly about it.

@aboe76
Copy link
Member

aboe76 commented Mar 28, 2015

@iggy that's what I thought, and I think naming it override_defaults.conf is easier to figure out
in which file you need to look then f_defaults.conf

@iggy
Copy link
Contributor Author

iggy commented Mar 29, 2015

I'll wait and see what other people think. I'm not sure I like either option so far.

@iggy
Copy link
Contributor Author

iggy commented Mar 31, 2015

@gravyboat @nmadhok any preference on what to name the "default" conf file?

@gravyboat
Copy link
Contributor

@iggy I'd say just name it override_defaults.conf for the sake of simplicity. I don't feel strongly about it one way or the other though. Let's see what Nitin thinks.

@nmadhok
Copy link
Member

nmadhok commented Apr 1, 2015

I don't think the naming really matters. override_defaults.conf perfectly works. Merging this one. Thanks @iggy @aboe76 and @gravyboat for the discussion!

nmadhok added a commit that referenced this pull request Apr 1, 2015
Switch config file.recurse to clean by default and tell it to ignore _*
@nmadhok nmadhok merged commit a11c39c into saltstack-formulas:master Apr 1, 2015
@gravyboat
Copy link
Contributor

@nmadhok The change hadn't been made when this was merged, it's still f_defaults. @iggy did you already have an update ready to go on this PR to update that name?

@nmadhok
Copy link
Member

nmadhok commented Apr 1, 2015

@gravyboat Like I said the name doesn't really matter. f_defaults.conf or override_defaults.conf both perfectly work.

@gravyboat
Copy link
Contributor

@nmadhok Yeah I thought about it some more last night, and I think we should change it to something other than f_defaults.conf, because it sounds like 'fuck defaults'. @iggy am I grasping here?

@iggy
Copy link
Contributor Author

iggy commented Apr 2, 2015

I already said I'm not real fond of either. I was mostly being lazy when I did f_defaults.conf (but to give some context, it was actually formula_defaults.conf shortened).

@nmadhok
Copy link
Member

nmadhok commented Apr 2, 2015

@gravyboat Haha that's a good one! We can change it to another name. I don't mind :)

@gravyboat
Copy link
Contributor

@nmadhok Yeah I just don't want it to become a standard, which then becomes a cringe inducing joke for years. @iggy I remember you saying what it was originally short for, just don't want it to be interpreted incorrectly.

@iggy
Copy link
Contributor Author

iggy commented Apr 2, 2015

I'll do whatever we decide on. Would like to get it done sooner rather than later so I don't have to clean up 2 old config files.

@gravyboat
Copy link
Contributor

@iggy Since no one really cares lets just make it override_defaults.conf, stays concise but can't be interpreted in certain ways.

@iggy
Copy link
Contributor Author

iggy commented Apr 2, 2015

So what does override mean exactly?

@aboe76
Copy link
Member

aboe76 commented Apr 2, 2015

@iggy this gets better and better...:) let's keep fuc_defaults.conf that should stir up a lot of conversation...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants