diff options
| author | Micah Anderson <micah@riseup.net> | 2013-04-12 13:23:29 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-04-12 14:37:28 -0400 |
| commit | 115691c87bad3f5863f088e73603133b67c9f828 (patch) | |
| tree | bbfd7b5c0d0c220ef3e52eb25acd4595a46b85d0 /manifests/debian | |
| parent | 2401aae6c4785c1e6a777756bebe70c38b889727 (diff) | |
| parent | 5ec141dfbf218dd9b2f2611d788db98f74e65073 (diff) | |
Merge remote-tracking branch 'immerda/master'
Fixed apache_no_default_site variable to be a parameter to the apache
class (no_default_site = false)
Conflicts:
files/include.d/Debian/ssl_defaults.inc
manifests/base.pp
manifests/config/file.pp
manifests/vhost.pp
manifests/vhost/php/standard.pp
manifests/vhost/template.pp
templates/vhosts/php/CentOS.erb
templates/vhosts/php/Debian.erb
Diffstat (limited to 'manifests/debian')
| -rw-r--r-- | manifests/debian/itk.pp | 14 | ||||
| -rw-r--r-- | manifests/debian/module.pp | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/manifests/debian/itk.pp b/manifests/debian/itk.pp index 2dde883..718a81b 100644 --- a/manifests/debian/itk.pp +++ b/manifests/debian/itk.pp @@ -1,9 +1,9 @@ class apache::debian::itk inherits apache::debian { - File['htpasswd_dir']{ - group => 0, - mode => 0644, - } - Package['apache']{ - name => 'apache2-mpm-itk', - } + File['htpasswd_dir']{ + group => 0, + mode => 0644, + } + Package['apache']{ + name => 'apache2-mpm-itk', + } } diff --git a/manifests/debian/module.pp b/manifests/debian/module.pp index 55500ad..4c100fa 100644 --- a/manifests/debian/module.pp +++ b/manifests/debian/module.pp @@ -5,7 +5,7 @@ define apache::debian::module( $modules_dir = "${apache::debian::config_dir}/mods" if ($package_name != 'absent') { - package { "${package_name}": + package { $package_name: ensure => $ensure, notify => Service['apache'], require => Package['apache'], |