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

Ubuntu exceptions #104

Merged
merged 2 commits into from
Mar 20, 2016
Merged

Ubuntu exceptions #104

merged 2 commits into from
Mar 20, 2016

Conversation

dalesit
Copy link
Contributor

@dalesit dalesit commented Mar 17, 2016

Ubuntu uses /etc/apache2/conf-enabled for custom config. This adds an exception for Ubuntu in the Debian family case

@jyaworski
Copy link
Member

Hello. Please rebase and squash.

Ubuntu uses /etc/apache2/conf-enabled for custom config
@dalesit dalesit force-pushed the ubuntu-exceptions branch from a38fb54 to 90120d6 Compare March 18, 2016 10:14
@dalesit
Copy link
Contributor Author

dalesit commented Mar 18, 2016

Rebased and squashed

@dalesit dalesit closed this Mar 18, 2016
@dalesit dalesit reopened this Mar 18, 2016
@@ -8,9 +8,14 @@

case $::osfamily {
'Debian': {
if $::operatingsystem == ubuntu {
Copy link
Member

Choose a reason for hiding this comment

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

Should this be == "Ubuntu"?

Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If you are using a bare word, then it needs to begin with lowercase.

see https://docs.puppetlabs.com/puppet/4.2/reference/lang_data_string.html#bare-words

so, can be either format, but == Ubuntu would be incorrect

@jyaworski
Copy link
Member

Since we don't have spec tests....

Is this also compatible with 3.x? I would assume so, but the bare words doc doesn't exist on 3.8 (by the same name).

@dalesit
Copy link
Contributor Author

dalesit commented Mar 19, 2016

jyaworski added a commit that referenced this pull request Mar 20, 2016
@jyaworski jyaworski merged commit f947d82 into voxpupuli:master Mar 20, 2016
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.

3 participants