Skip to content

Parametrize !includedir #509

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

Merged
merged 1 commit into from
Jul 23, 2014
Merged

Parametrize !includedir #509

merged 1 commit into from
Jul 23, 2014

Conversation

xbezdick
Copy link
Contributor

@xbezdick xbezdick commented May 7, 2014

Hardcoded path provided by puppet is now replaced by providing only the final directory as on
most systems includedir is provided by package and it's matter of user to provide it if he
wants to override it. This also allows disabling including at all.

@xbezdick xbezdick mentioned this pull request May 7, 2014
@igalic
Copy link
Contributor

igalic commented May 8, 2014

This looks very good to me (superficially) I haven't tested it yet

@igalic
Copy link
Contributor

igalic commented Jun 4, 2014

@xbezdick I'm perfectly sorry for neglecting this so long ._. I was pulled into a non-FOSS project in a cave :(

Could you please rebase so we can merge it?

@xbezdick
Copy link
Contributor Author

xbezdick commented Jun 4, 2014

I'm an idiot, I rebased older patch :)

@igalic
Copy link
Contributor

igalic commented Jun 4, 2014

:| is that why it's failing?

@xbezdick
Copy link
Contributor Author

xbezdick commented Jun 4, 2014

yep, I have to search in reflog for correct one, will take abour 20min :/

Hardcoded path provided by puppet is now replaced by providing only the final directory as on
most systems includedir is provided by package and it's matter of user to provide it if he
wants to override it. This also allows disabling including at all.
@igalic
Copy link
Contributor

igalic commented Jun 4, 2014

no worries. We'll be here all week. ;)

@@ -54,7 +54,9 @@
$server_package_name = 'mariadb-server'
$server_service_name = 'mariadb'
$log_error = '/var/log/mariadb/mariadb.log'
$config_file = '/etc/my.cnf'
$config_file = '/etc/my.cnf.d/server.cnf'
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this okay? Will this break anything ever? :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yum provides /etc/my.cnf and check it's content, we just make sure puppet by default won't touch it

@xbezdick
Copy link
Contributor Author

ping?

@igalic
Copy link
Contributor

igalic commented Jul 22, 2014

@xbezdick I think we're good to go now. @hunner, what'd you think?

@edestecd
Copy link
Contributor

Will this be merged? This solves all my problems.

igalic added a commit that referenced this pull request Jul 23, 2014
@igalic igalic merged commit 70cafdc into puppetlabs:master Jul 23, 2014
@igalic
Copy link
Contributor

igalic commented Jul 23, 2014

With the lack of feedback, I've decided to merge it into master and wait for reports from people who try to use our master branch ;)

@edestecd
Copy link
Contributor

Thanks, I'll be testing it today.

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

Successfully merging this pull request may close these issues.

5 participants