Dzahn has submitted this change and it was merged.
Change subject: bugzilla: remove SSL Apache config for old-bz
......................................................................
bugzilla: remove SSL Apache config for old-bz
to put behind misc-web varnish we need to
adjust the Apache config on the backend.
remove SSL part and change RewriteCond to be
based on X-Forwarded-Proto
keep bug-attachment unchanged
Change-Id: I3ce54f7d59efade97f0449f5f13380bab9d3cb96
---
M modules/bugzilla/templates/apache/bugzilla.wikimedia.org.erb
1 file changed, 3 insertions(+), 33 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/bugzilla/templates/apache/bugzilla.wikimedia.org.erb
b/modules/bugzilla/templates/apache/bugzilla.wikimedia.org.erb
index 27aff46..2e529e3 100644
--- a/modules/bugzilla/templates/apache/bugzilla.wikimedia.org.erb
+++ b/modules/bugzilla/templates/apache/bugzilla.wikimedia.org.erb
@@ -10,47 +10,17 @@
<VirtualHost *:80>
ServerAdmin [email protected]
- ServerName <%= @svc_name %>
+ ServerName bugs.wikimedia.org
Redirect permanent / https://<%= @svc_name %>/
RewriteEngine On
- RewriteCond %{HTTPS} off
- RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
+ RewriteCond %{HTTP:X-Forwarded-Proto} !https
+ RewriteRule (.*) https://<%= @svc_name %>%{REQUEST_URI}
</VirtualHost>
<VirtualHost *:80>
ServerAdmin [email protected]
- ServerName bugs.wikimedia.org
- Redirect permanent / https://<%= @svc_name %>/
- RewriteEngine On
- RewriteCond %{HTTPS} off
- RewriteRule (.*) https://<%= @svc_name %>%{REQUEST_URI}
-</VirtualHost>
-
-<VirtualHost *:443>
- ServerAdmin [email protected]
- ServerName bugs.wikimedia.org
- Redirect permanent / https://<%= @svc_name %>/
- SSLEngine On
- SSLCompression Off
- SSLCertificateFile /etc/ssl/certs/bugzilla.wikimedia.org.pem
- SSLCertificateKeyFile /etc/ssl/private/bugzilla.wikimedia.org.key
- SSLCACertificatePath /etc/ssl/certs/
- <%= @ssl_settings.join("\n") %>
-
- RewriteEngine On
- RewriteRule (.*) https://<%= @svc_name %>%{REQUEST_URI}
-</VirtualHost>
-
-<VirtualHost *:443>
- ServerAdmin [email protected]
ServerName <%= @svc_name %>
DocumentRoot <%= @docroot %>
- SSLEngine On
- SSLCompression Off
- SSLCertificateFile /etc/ssl/certs/bugzilla.wikimedia.org.pem
- SSLCertificateKeyFile /etc/ssl/private/bugzilla.wikimedia.org.key
- SSLCACertificatePath /etc/ssl/certs/
- <%= @ssl_settings.join("\n") %>
<Directory />
Options FollowSymLinks
--
To view, visit https://gerrit.wikimedia.org/r/175615
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3ce54f7d59efade97f0449f5f13380bab9d3cb96
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
