RobH has uploaded a new change for review. https://gerrit.wikimedia.org/r/108994
Change subject: doc.wikimedia.org and doc.mediawiki.org to use misc-web-lb ...................................................................... doc.wikimedia.org and doc.mediawiki.org to use misc-web-lb moving https termination from gallium to the misc-web-lb. this change will go live at the same time as the dns change Change-Id: I2fe62629f4deaf4c1ace4345ba7c743b84469fd9 RT: 6594 --- M modules/contint/files/apache/doc.wikimedia.org 1 file changed, 1 insertion(+), 42 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/94/108994/1 diff --git a/modules/contint/files/apache/doc.wikimedia.org b/modules/contint/files/apache/doc.wikimedia.org index df077cf..feeecc4 100644 --- a/modules/contint/files/apache/doc.wikimedia.org +++ b/modules/contint/files/apache/doc.wikimedia.org @@ -14,24 +14,6 @@ Redirect permanent / https://doc.wikimedia.org/ </VirtualHost> -<VirtualHost *:443> - ServerName doc.mediawiki.org - - LogLevel warn - ErrorLog /var/log/apache2/doc_error.log - CustomLog /var/log/apache2/doc_access.log vhost_combined - - SSLEngine on - SSLProtocol -ALL +SSLv3 +TLSv1 - SSLCipherSuite AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA - SSLHonorCipherOrder on - SSLCertificateFile /etc/ssl/certs/star.mediawiki.org.pem - SSLCertificateKeyFile /etc/ssl/private/star.mediawiki.org.key - SSLCACertificateFile /etc/ssl/certs/RapidSSL_CA.pem - - Redirect permanent / https://doc.wikimedia.org/ -</VirtualHost> - <VirtualHost *:80> ServerName doc.wikimedia.org @@ -51,27 +33,4 @@ RewriteEngine On RewriteRule ^/favicon\.ico$ /favicon.php [L] -</VirtualHost> - -<VirtualHost *:443> - ServerName doc.wikimedia.org - ServerAdmin n...@wikimedia.org - - DocumentRoot /srv/org/wikimedia/doc - - # Favicon proxy - RewriteEngine On - RewriteRule ^/favicon\.ico$ /favicon.php [L] - - LogLevel warn - ErrorLog /var/log/apache2/doc_error.log - CustomLog /var/log/apache2/doc_access.log vhost_combined - - SSLEngine on - SSLProtocol -ALL +SSLv3 +TLSv1 - SSLCipherSuite AES128-GCM-SHA256:RC4-SHA:RC4-MD5:DES-CBC3-SHA:AES128-SHA:AES256-SHA - SSLHonorCipherOrder on - SSLCertificateFile /etc/ssl/certs/star.wikimedia.org.pem - SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key - SSLCACertificateFile /etc/ssl/certs/RapidSSL_CA.pem -</VirtualHost> +</VirtualHost> \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/108994 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2fe62629f4deaf4c1ace4345ba7c743b84469fd9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: RobH <r...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits