diff --git a/manifests/api.pp b/manifests/api.pp
index 527b133..86f67b3 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -71,8 +71,14 @@ class openstack_health::api(
ensure => present,
}
}
- if ! defined(Httpd::Mod['cache_disk']) {
- httpd::mod { 'cache_disk':
+
+ if $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '12.04' {
+ $cache_disk_module = 'disk_cache'
+ } else {
+ $cache_disk_module = 'cache_disk'
+ }
+ if ! defined(Httpd::Mod[$cache_disk_module]) {
+ httpd::mod { $cache_disk_module:
ensure => present,
}
}
diff --git a/templates/openstack-health-api.vhost.erb b/templates/openstack-health-api.vhost.erb
index 3f7b260..9d6bcc6 100644
--- a/templates/openstack-health-api.vhost.erb
+++ b/templates/openstack-health-api.vhost.erb
@@ -20,17 +20,23 @@ WSGIPythonHome <%= scope.lookupvar("openstack_health::api::virtualenv_dir") %>
Order allow,deny
Allow from all
- Require all granted
+ = 2.4>
+ Require all granted
+
-
+ <% if @operatingsystem == "Ubuntu" and @operatingsystemrelease == "12.04" %>
+
+ <% else %>
+
+ <% end %>
CacheRoot "/var/cache/apache2/mod_disk_cache"
CacheEnable disk "/"
CacheDirLevels 5
CacheDirLength 3
CacheLock on
-
+
DocumentRoot <%= scope.lookupvar("openstack_health::api::api_dir") %>
diff --git a/templates/openstack-health-frontend.vhost.erb b/templates/openstack-health-frontend.vhost.erb
index d14f8fa..37fe134 100644
--- a/templates/openstack-health-frontend.vhost.erb
+++ b/templates/openstack-health-frontend.vhost.erb
@@ -12,7 +12,9 @@ Listen <%= @vhost_port %>
>
Order allow,deny
Allow from all
- Require all granted
+ = 2.4>
+ Require all granted
+
DocumentRoot <%= @frontend_dir %>