diff options
| author | Micah <micah@riseup.net> | 2015-10-09 19:58:43 +0000 |
|---|---|---|
| committer | Micah <micah@riseup.net> | 2015-10-09 19:58:43 +0000 |
| commit | b57be4fc99274f850e7fe818cd8bbd7e70dba705 (patch) | |
| tree | 56830f9df598064751f9ea56da1be10459d6d9e7 /manifests/module.pp | |
| parent | 240fa02355ed56838e5662d971fd693b79e94fee (diff) | |
| parent | e092c5a13af891738fe563e8cc7d6813aad3e3ea (diff) | |
Merge branch 'fix_debian_moduledir' into 'master'
Fix module management on Debian, closes #7
Manage files and symlinks directly instead of using
a2enmod/a2dismod, which are interactive utilities anyway.
See merge request !3
Diffstat (limited to 'manifests/module.pp')
| -rw-r--r-- | manifests/module.pp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/manifests/module.pp b/manifests/module.pp index 42639bb..cbcf2d0 100644 --- a/manifests/module.pp +++ b/manifests/module.pp @@ -1,7 +1,8 @@ define apache::module ( $ensure = present, $source = '', - $destination = '', $module = '', $package_name = 'absent' ) -{ + $destination = '', $module = '', $package_name = 'absent', + $conf_content = '', $conf_source = '', +) { $real_module = $module ? { '' => $name, @@ -23,7 +24,8 @@ define apache::module ( } 'debian','ubuntu': { apache::debian::module { "$real_module": - ensure => $ensure, package_name => $package_name + ensure => $ensure, package_name => $package_name, + conf_content => $conf_content, conf_source => $conf_source } } default: { |