aboutsummaryrefslogtreecommitdiffstats
path: root/modules/apache/manifests
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-02-13 23:42:10 +0000
committerMichael Scherer <misc@mageia.org>2011-02-13 23:42:10 +0000
commit071fe5257bb078ef421ad32bdf79634be6347977 (patch)
treeabad5e9045c8b5155d3b8c6d7e3092747033e984 /modules/apache/manifests
parentd52a3f9add147886c017c93f9ca6ce8917206a12 (diff)
downloadpuppet-071fe5257bb078ef421ad32bdf79634be6347977.tar
puppet-071fe5257bb078ef421ad32bdf79634be6347977.tar.gz
puppet-071fe5257bb078ef421ad32bdf79634be6347977.tar.bz2
puppet-071fe5257bb078ef421ad32bdf79634be6347977.tar.xz
puppet-071fe5257bb078ef421ad32bdf79634be6347977.zip
add proper requires, to avoid ordering error when deploying apache based web software
Diffstat (limited to 'modules/apache/manifests')
-rw-r--r--modules/apache/manifests/init.pp11
1 files changed, 10 insertions, 1 deletions
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp
index f5c47488..da79819b 100644
--- a/modules/apache/manifests/init.pp
+++ b/modules/apache/manifests/init.pp
@@ -6,6 +6,10 @@ class apache {
ensure => installed
}
+ package { "apache-conf":
+ ensure => installed,
+ }
+
service { httpd:
alias => apache,
ensure => running,
@@ -16,7 +20,7 @@ class apache {
ensure => present,
path => "/etc/httpd/conf.d/customization.conf",
content => template("apache/customization.conf"),
- require => Package["apache"],
+ require => Package["apache-conf"],
notify => Service["apache"],
owner => root,
group => root,
@@ -30,6 +34,7 @@ class apache {
group => root,
mode => 644,
notify => Service['apache'],
+ require => Package["apache-conf"],
content => template("apache/00_default_vhosts.conf")
}
}
@@ -85,6 +90,7 @@ class apache {
owner => root,
group => root,
mode => 644,
+ require => Package['apache-conf'],
content => template('apache/mod_wsgi.conf')
}
@@ -141,6 +147,7 @@ class apache {
group => root,
mode => 644,
notify => Service['apache'],
+ require => Package['apache-conf'],
content => template("apache/vhost_base.conf")
}
}
@@ -199,6 +206,7 @@ class apache {
group => root,
mode => 644,
notify => Service['apache'],
+ require => Package['apache-conf'],
content => template($vhost_file)
}
}
@@ -234,6 +242,7 @@ class apache {
group => root,
mode => 644,
notify => Service['apache'],
+ require => Package['apache-conf'],
content => template($webapp_file)
}
}