diff --git a/modules/openstack_project/manifests/static.pp b/modules/openstack_project/manifests/static.pp index 027b9004f0..c71a0996f8 100644 --- a/modules/openstack_project/manifests/static.pp +++ b/modules/openstack_project/manifests/static.pp @@ -33,6 +33,7 @@ class openstack_project::static ( priority => '50', docroot => '/srv/static/logs', require => File['/srv/static/logs'], + template => 'openstack_project/logs.vhost.erb', } file { '/srv/static': diff --git a/modules/openstack_project/templates/logs.vhost.erb b/modules/openstack_project/templates/logs.vhost.erb new file mode 100644 index 0000000000..4ee66e850f --- /dev/null +++ b/modules/openstack_project/templates/logs.vhost.erb @@ -0,0 +1,34 @@ +# ************************************ +# Managed by Puppet +# ************************************ + +NameVirtualHost <%= vhost_name %>:<%= port %> +:<%= port %>> + ServerName <%= srvname %> +<% if serveraliases.is_a? Array -%> +<% serveraliases.each do |name| -%><%= " ServerAlias #{name}\n" %><% end -%> +<% elsif serveraliases != '' -%> +<%= " ServerAlias #{serveraliases}" %> +<% end -%> + DocumentRoot <%= docroot %> + + ForceType text/plain + AddDefaultCharset UTF-8 + AddEncoding x-gzip gz + + + ForceType text/html + AddDefaultCharset UTF-8 + AddEncoding x-gzip gz + + > + Options <%= options %> + AllowOverride None + Order allow,deny + allow from all + + ErrorLog /var/log/apache2/<%= name %>_error.log + LogLevel warn + CustomLog /var/log/apache2/<%= name %>_access.log combined + ServerSignature Off +