From af6add336176cbfe800159cc887f34c31d7592d5 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Tue, 21 Oct 2014 18:41:14 +0000 Subject: [PATCH] Host a devstack.org redirect on static This provides a hollow "devstack.org" vhost as a permanent redirect to the docs.openstack.org/developer/devstack site. It also aliases *.devstack.org to the same vhost. Change-Id: Ib96e4d4e21bbdd961eb32529c66acf750d79bec5 --- modules/openstack_project/manifests/static.pp | 11 ++++++++++ .../templates/devstack.vhost.erb | 21 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 modules/openstack_project/templates/devstack.vhost.erb diff --git a/modules/openstack_project/manifests/static.pp b/modules/openstack_project/manifests/static.pp index c95cccdf53..d8166cc9a1 100644 --- a/modules/openstack_project/manifests/static.pp +++ b/modules/openstack_project/manifests/static.pp @@ -243,4 +243,15 @@ class openstack_project::static ( require => [File['/srv/static/specs'], $::project_config::config_dir], } + + ########################################################### + # legacy devstack.org site redirect + + apache::vhost { 'devstack.org': + port => 80, + priority => '50', + docroot => 'MEANINGLESS_ARGUMENT', + serveraliases => ['*.devstack.org'], + template => 'openstack_project/devstack.vhost.erb', + } } diff --git a/modules/openstack_project/templates/devstack.vhost.erb b/modules/openstack_project/templates/devstack.vhost.erb new file mode 100644 index 0000000000..d669987b5d --- /dev/null +++ b/modules/openstack_project/templates/devstack.vhost.erb @@ -0,0 +1,21 @@ +# ************************************ +# 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 -%> + + RewriteEngine On + RewriteRule ^/(.*) http://docs.openstack.org/developer/devstack/$1 [last,redirect=permanent] + + ErrorLog /var/log/apache2/<%= @name %>_error.log + LogLevel warn + CustomLog /var/log/apache2/<%= @name %>_access.log combined + ServerSignature Off +