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

apache::balancer now respects apache::confd_dir #1463

Merged
merged 1 commit into from
May 20, 2016
Merged

apache::balancer now respects apache::confd_dir #1463

merged 1 commit into from
May 20, 2016

Conversation

traylenator
Copy link
Contributor

Previously with a configuration of

class{'apache':
  confd_dir => '/my/directory':
}
balancer{'myb':}

balencer would create a file incorrectly in the default location
/etc/apache2/conf.d/balancer_myb.conf

balencer now uses the value apache::confd_dir.

A test case has been added for this bug.

:concat_basedir => '/dne',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:kernel => 'Linux',
:is_pe => false,
Copy link
Contributor

Choose a reason for hiding this comment

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

These seem to be the same facts as above? Please put them into the outer describe block, and avoid the duplication.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes - fixed and re-based.

@DavidS
Copy link
Contributor

DavidS commented May 20, 2016

Good catch, and thanks for the test!

@traylenator traylenator changed the title apache::balencar now respects apache::confd_dir apache::balancer now respects apache::confd_dir May 20, 2016
Previously with a configuration of

```
class{'apache':
  confd_dir => '/my/directory':
}
balancer{'myb':}
```

balencer would create a file incorrectly in the default location
*/etc/apache2/conf.d/balancer_myb.conf*

balencer now uses the value *apache::confd_dir*.

A test case has been added for this bug.
@DavidS DavidS merged commit 1145e08 into puppetlabs:master May 20, 2016
@DavidS
Copy link
Contributor

DavidS commented May 20, 2016

Sweet, thanks!

@traylenator traylenator deleted the balancepath branch May 20, 2016 20:21
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.

3 participants