From 6a5ebe6643ee1c438349b18e198deeef5dfd6f5c Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 24 Mar 2016 08:40:24 -0700 Subject: [PATCH] Remove old pypi vhost template This is no longer used. Change-Id: If2ef3099531e640c5115effea2b553fbc1dc1768 --- .../templates/pypi.vhost.erb | 37 ------------------- 1 file changed, 37 deletions(-) delete mode 100644 modules/openstack_project/templates/pypi.vhost.erb diff --git a/modules/openstack_project/templates/pypi.vhost.erb b/modules/openstack_project/templates/pypi.vhost.erb deleted file mode 100644 index aa60088670..0000000000 --- a/modules/openstack_project/templates/pypi.vhost.erb +++ /dev/null @@ -1,37 +0,0 @@ -# ************************************ -# 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 != nil -%> - <%= " ServerAlias #{@serveraliases}" -%> - <% end -%> - DocumentRoot <%= @www_root %> - > - Options <%= @options %> - AllowOverride None - Order allow,deny - allow from all - Satisfy any - = 2.4> - Require all granted - - - - # URL's are: - # /wheel/{distro}-{distro-version}/a/a/a-etc.whl - # /wheel/{distro}-{distro-version}/a/ab/abcd/abcd-etc.whl - # /wheel/{distro}-{distro-version}/a/ab/abcde/abcde-etc.whl - RewriteEngine On - RewriteRule ^/wheel/([^/]+)/([^/])/(.*)$ /wheel/$1/$2/$2/$3 [L] - RewriteRule ^/wheel/([^/]+)/([^/])([^/])([^/]*)/(.*)$ /wheel/$1/$2/$2$3/$2$3$4/$5 [L] - - ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_error.log - LogLevel warn - CustomLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_access.log combined - ServerSignature Off -