summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2018-12-06 14:57:05 +0000
committerintrigeri <intrigeri@boum.org>2018-12-06 14:57:05 +0000
commit364e6db844ca834150ee7b725fbc72e45b4196a4 (patch)
treef72b5c3345c942dc7f4102c814d4cc2e77a83cf2
parent8f074bfd7103c666f9e76f682104be25be0376f7 (diff)
Redmine: drop support for redirecting to a different virtual host (refs: #15918)feature/15918-remove-old-labs-vhost
-rw-r--r--manifests/redmine.pp1
-rw-r--r--manifests/redmine/vhost.pp1
-rw-r--r--templates/redmine/apache/vhost.conf.erb5
3 files changed, 0 insertions, 7 deletions
diff --git a/manifests/redmine.pp b/manifests/redmine.pp
index 9150121..2801180 100644
--- a/manifests/redmine.pp
+++ b/manifests/redmine.pp
@@ -79,7 +79,6 @@ class tails::redmine (
$virtual_hosts.each |String $public_hostname, Hash $vhost_params| {
tails::redmine::vhost { $public_hostname:
ip => $vhost_params['ip'],
- redirect_to => $vhost_params['redirect_to'],
ssl => $vhost_params['ssl'],
}
}
diff --git a/manifests/redmine/vhost.pp b/manifests/redmine/vhost.pp
index 96ea4cc..7c18c37 100644
--- a/manifests/redmine/vhost.pp
+++ b/manifests/redmine/vhost.pp
@@ -3,7 +3,6 @@ define tails::redmine::vhost (
Stdlib::Fqdn $public_hostname = $name,
Stdlib::IP::Address::V4 $ip = $::ipaddress,
Boolean $ssl = true,
- Variant[Boolean, String] $redirect_to = false,
) {
file { "/etc/apache2/sites-enabled/${public_hostname}.conf":
diff --git a/templates/redmine/apache/vhost.conf.erb b/templates/redmine/apache/vhost.conf.erb
index 29934f6..1e4e330 100644
--- a/templates/redmine/apache/vhost.conf.erb
+++ b/templates/redmine/apache/vhost.conf.erb
@@ -23,10 +23,6 @@
DocumentRoot /var/www
- <%- if @redirect_to != false -%>
- RewriteEngine On
- RewriteRule (.*) https://<%= @redirect_to %>%{REQUEST_URI} [L,R=permanent]
- <%- else -%>
RailsBaseURI /code
PassengerPoolIdleTime 86400
PassengerMaxRequests 256
@@ -58,7 +54,6 @@
RewriteCond %{HTTP_USER_AGENT} Sogou [NC]
RewriteRule ^.* - [F,L]
- <%- end -%>
<%- if @ssl -%>
# SSL configuration