Project

General

Profile

« Previous | Next » 

Revision 24b477a1

Added by Justin Sherrill over 10 years ago

Update puppet modules

View differences:

modules/apache/manifests/mod.pp
$package = undef,
$package_ensure = 'present',
$lib = undef,
$lib_path = $apache::params::lib_path,
$lib_path = $::apache::params::lib_path,
$id = undef,
$path = undef,
) {
......
$mod = $name
#include apache #This creates duplicate resources in rspec-puppet
$mod_dir = $apache::mod_dir
$mod_dir = $::apache::mod_dir
# Determine if we have special lib
$mod_libs = $apache::params::mod_libs
$mod_libs = $::apache::params::mod_libs
$mod_lib = $mod_libs[$mod] # 2.6 compatibility hack
if $lib {
$_lib = $lib
......
}
# Determine if we have a package
$mod_packages = $apache::params::mod_packages
$mod_packages = $::apache::params::mod_packages
$mod_package = $mod_packages[$mod] # 2.6 compatibility hack
if $package {
$_package = $package
......
$package_before = $::osfamily ? {
'freebsd' => [
File["${mod_dir}/${mod}.load"],
File["${apache::params::conf_dir}/${apache::params::conf_file}"]
File["${::apache::params::conf_dir}/${::apache::params::conf_file}"]
],
default => File["${mod_dir}/${mod}.load"],
}
......
ensure => file,
path => "${mod_dir}/${mod}.load",
owner => 'root',
group => $apache::params::root_group,
group => $::apache::params::root_group,
mode => '0644',
content => "LoadModule ${_id} ${_path}\n",
require => [
......
}
if $::osfamily == 'Debian' {
$enable_dir = $apache::mod_enable_dir
$enable_dir = $::apache::mod_enable_dir
file{ "${mod}.load symlink":
ensure => link,
path => "${enable_dir}/${mod}.load",
target => "${mod_dir}/${mod}.load",
owner => 'root',
group => $apache::params::root_group,
group => $::apache::params::root_group,
mode => '0644',
require => [
File["${mod}.load"],
......
path => "${enable_dir}/${mod}.conf",
target => "${mod_dir}/${mod}.conf",
owner => 'root',
group => $apache::params::root_group,
group => $::apache::params::root_group,
mode => '0644',
require => [
File["${mod}.conf"],

Also available in: Unified diff