Added support for $apache_datadir variable.
This commit is contained in:
parent
8717973d80
commit
dc3f04cfda
1 changed files with 28 additions and 6 deletions
|
@ -3,12 +3,34 @@
|
||||||
#
|
#
|
||||||
class apache::common {
|
class apache::common {
|
||||||
|
|
||||||
file { [ "/srv/www",
|
if $apache_datadir {
|
||||||
"/srv/www/log", ]:
|
file { "${apache_datadir}":
|
||||||
ensure => directory,
|
ensure => directory,
|
||||||
mode => 0755,
|
mode => 0755,
|
||||||
owner => root,
|
owner => root,
|
||||||
group => root,
|
group => root,
|
||||||
|
}
|
||||||
|
|
||||||
|
file { "/srv/www":
|
||||||
|
ensure => link,
|
||||||
|
target => "${apache_datadir}",
|
||||||
|
require => File["${apache_datadir}"],
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
file { "/srv/www":
|
||||||
|
ensure => directory,
|
||||||
|
mode => 0755,
|
||||||
|
owner => root,
|
||||||
|
group => root,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
file { "/srv/www/log":
|
||||||
|
ensure => directory,
|
||||||
|
mode => 0755,
|
||||||
|
owner => root,
|
||||||
|
group => root,
|
||||||
|
require => File["/srv/www"],
|
||||||
}
|
}
|
||||||
|
|
||||||
package { "httpd":
|
package { "httpd":
|
||||||
|
|
Loading…
Add table
Reference in a new issue