Dzahn has submitted this change and it was merged.
Change subject: planets: remove SSL stanzas
......................................................................
planets: remove SSL stanzas
Bug: T60048
Bug: T85789
PS5: also remove the SSL part in the plain 'planet' vhost
besides all the languages inside planet.wm.org
Change-Id: Ic51c1de8c6a031b2775278322159530b83e9e7e1
---
M modules/planet/templates/apache/planet-language.erb
M modules/planet/templates/apache/planet.erb
2 files changed, 3 insertions(+), 32 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/planet/templates/apache/planet-language.erb
b/modules/planet/templates/apache/planet-language.erb
index d51935c..a619a32 100644
--- a/modules/planet/templates/apache/planet-language.erb
+++ b/modules/planet/templates/apache/planet-language.erb
@@ -5,23 +5,11 @@
ServerName <%= @name %>.planet.<%=
scope.lookupvar('planet::planet_domain_name') %>
php_admin_flag engine off
- <Directory /var/www/planet/<%= @name %>>
- Allow from all
- </Directory>
-</VirtualHost>
-
-<VirtualHost *:443>
- DocumentRoot /var/www/planet/<%= @name %>
-
- ServerName <%= @name %>.planet.<%=
scope.lookupvar('planet::planet_domain_name') %>
- SSLEngine on
- SSLCertificateFile /etc/ssl/certs/star.planet.<%=
scope.lookupvar('planet::planet_domain_name') %>.pem
- SSLCertificateChainFile /etc/ssl/certs/star.planet.<%=
scope.lookupvar('planet::planet_domain_name') %>.chained.pem
- SSLCertificateKeyFile /etc/ssl/private/star.planet.<%=
scope.lookupvar('planet::planet_domain_name') %>.key
- <%= @ssl_settings.join("\n") %>
+ RewriteEngine On
+ RewriteCond %{HTTP:X-Forwarded-Proto} !https
+ RewriteRule ^/(.*)$ https://%{HTTP_HOST}%{REQUEST_URI}
[R=301,E=ProtoRedirect]
<Directory /var/www/planet/<%= @name %>>
Allow from all
</Directory>
-
</VirtualHost>
diff --git a/modules/planet/templates/apache/planet.erb
b/modules/planet/templates/apache/planet.erb
index 9e707db..a273f86 100644
--- a/modules/planet/templates/apache/planet.erb
+++ b/modules/planet/templates/apache/planet.erb
@@ -1,23 +1,6 @@
# config for planet.wikimedia.org -> redirect to page on meta
# actual *.planet language versions are in planet-language.erb
-<VirtualHost *:443>
- ServerName planet.<%= scope.lookupvar('planet::planet_domain_name') %>
- SSLEngine on
- SSLCertificateFile /etc/ssl/certs/star.planet.<%=
scope.lookupvar('planet::planet_domain_name') %>.pem
- SSLCertificateChainFile /etc/ssl/certs/star.planet.<%=
scope.lookupvar('planet::planet_domain_name') %>.chained.pem
- SSLCertificateKeyFile /etc/ssl/private/star.planet.<%=
scope.lookupvar('planet::planet_domain_name') %>.key
- <%= @ssl_settings.join("\n") %>
-
- DocumentRoot /var/www/planet
-
- Redirect /atom.xml https://en.planet.<%=
scope.lookupvar('planet::planet_domain_name') %>/atom.xml
- Redirect /rss10.xml https://en.planet.<%=
scope.lookupvar('planet::planet_domain_name') %>/rss10.xml
- Redirect /rss20.xml https://en.planet.<%=
scope.lookupvar('planet::planet_domain_name') %>/rss20.xml
-
- RedirectTemp / https://<%= scope.lookupvar('planet::planet_meta_link') %>
-</VirtualHost>
-
<VirtualHost *:80>
ServerName planet.<%= scope.lookupvar('planet::planet_domain_name') %>
php_admin_flag engine off
--
To view, visit https://gerrit.wikimedia.org/r/181984
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic51c1de8c6a031b2775278322159530b83e9e7e1
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
