Skip to content

Commit

Permalink
make $lib_path configurable
Browse files Browse the repository at this point in the history
  • Loading branch information
fraenki committed Apr 9, 2015
1 parent 0e8fb04 commit b1d640f
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 3 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,10 @@ Sets the amount of time the server waits for subsequent requests on a persistent

Sets the limit of the number of requests allowed per connection when KeepAlive is on. Defaults to '100'.

#####`lib_path`

Specifies the location where apache module files are stored. It should not be configured manually without special reason.

#####`loadfile_name`

Sets the file name for the module loadfile. Should be in the format *.load. This can be used to set the module load order.
Expand Down
1 change: 1 addition & 0 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
$mod_dir = $::apache::params::mod_dir,
$mod_enable_dir = $::apache::params::mod_enable_dir,
$mpm_module = $::apache::params::mpm_module,
$lib_path = $::apache::params::lib_path,
$conf_template = $::apache::params::conf_template,
$servername = $::apache::params::servername,
$manage_user = true,
Expand Down
2 changes: 1 addition & 1 deletion manifests/mod.pp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
$package = undef,
$package_ensure = 'present',
$lib = undef,
$lib_path = $::apache::params::lib_path,
$lib_path = $::apache::lib_path,
$id = undef,
$path = undef,
$loadfile_name = undef,
Expand Down
2 changes: 1 addition & 1 deletion manifests/mod/wsgi.pp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
if $mod_path =~ /\// {
$_mod_path = $mod_path
} else {
$_mod_path = "${::apache::params::lib_path}/${mod_path}"
$_mod_path = "${::apache::lib_path}/${mod_path}"
}
::apache::mod { 'wsgi':
package => $package_name,
Expand Down
2 changes: 1 addition & 1 deletion manifests/mpm.pp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
define apache::mpm (
$lib_path = $::apache::params::lib_path,
$lib_path = $::apache::lib_path,
$apache_version = $::apache::apache_version,
) {
if ! defined(Class['apache']) {
Expand Down

0 comments on commit b1d640f

Please sign in to comment.