Dzahn has submitted this change and it was merged. Change subject: remove singer from site.pp, it's dead and the old secure site has also been moved to cluster meanwhile. also remove misc/secure.pp and apache site file, it's been replaced by apache-config ......................................................................
remove singer from site.pp, it's dead and the old secure site has also been moved to cluster meanwhile. also remove misc/secure.pp and apache site file, it's been replaced by apache-config Change-Id: Ibf67fc39b11b294a0a1f0f520d816a163e52451a --- D files/apache/sites/secure.wikimedia.org D manifests/misc/secure.pp M manifests/site.pp 3 files changed, 0 insertions(+), 74 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/files/apache/sites/secure.wikimedia.org b/files/apache/sites/secure.wikimedia.org deleted file mode 100644 index d0d8a0a..0000000 --- a/files/apache/sites/secure.wikimedia.org +++ /dev/null @@ -1,46 +0,0 @@ -##################################################################### -#### THIS FILE IS MANAGED BY PUPPET -#### puppet:///files/apache/sites/secure.wikimedia.org -###################################################################### - -<VirtualHost 208.80.152.134:443> - ServerName secure.wikimedia.org - ServerAdmin [email protected] - - SSLEngine on - SSLCertificateFile /etc/ssl/certs/star.wikimedia.org.pem - SSLCertificateKeyFile /etc/ssl/private/star.wikimedia.org.key - - ErrorLog /var/log/apache2/error.log - - # Possible values include: debug, info, notice, warn, error, crit, - # alert, emerg. - LogLevel warn - - CustomLog /var/log/apache2/access.log combined - - # Old OTRS URLs - RewriteEngine On - RewriteRule ^/otrs/(.*)$ https://ticket.wikimedia.org/otrs/$1 [R=301,L] - RewriteRule ^/otrs-web/(.*)$ https://ticket.wikimedia.org/otrs-web/$1 [R=301,L] - - # old URLs, redirect them to proper SSL - RewriteRule ^/$ https://www.wikimedia.org/ [R=301,L] - RewriteRule ^/keys\.html$ https://www.mediawiki.org/keys/keys.html [R=301,L] - RewriteRule ^/(w/.*)$ https://meta.wikimedia.org/$1 [R=301,L,NE] - RewriteRule ^/wikipedia/(advisory|auditcom|boardgovcom|board|chair|chapcom|checkuser|collab|commons|donate|exec|grants|incubator|internal|meta|movementroles|office|otrs-wiki|outreach|quality|searchcom|spcom|species|steward|strategy|usability|wikimania\d+|wikimaniateam)/(.*)$ https://$1.wikimedia.org/$2 [R=301,L,NE] - RewriteRule ^/wikipedia/foundation/(.*)$ https://wikimediafoundation.org/$1 [R=301,L,NE] - RewriteRule ^/wikipedia/mediawiki/(.*)$ https://www.mediawiki.org/$1 [R=301,L,NE] - RewriteRule ^/wikipedia/sources/(.*)$ https://wikisource.org/$1 [R=301,L,NE] - RewriteRule ^/wikipedia/wikidata/(.*)$ https://www.wikidata.org/$1 [R=301,L,NE] - RewriteRule ^/(wikipedia|wikinews|wikisource|wikibooks|wikiquote|wikiversity|wiktionary|wikimedia)/([^@:/]+)/(.*)$ https://$2.$1.org/$3 [R=301,L,NE] - -</VirtualHost> - -<VirtualHost 208.80.152.134:80> - ServerName secure.wikimedia.org - - RewriteEngine on - RewriteRule ^/(.*)$ https://secure.wikimedia.org/$1 [R=302] -</VirtualHost> - diff --git a/manifests/misc/secure.pp b/manifests/misc/secure.pp deleted file mode 100644 index 205e4a6..0000000 --- a/manifests/misc/secure.pp +++ /dev/null @@ -1,16 +0,0 @@ -# (old) SSL secure.wm host -# https://secure.wikimedia.org | http://en.wikipedia.org/wiki/Wikipedia:Secure_server -class misc::secure { - system_role { "misc::secure": description => "secure.wikimedia.org" } - apache_module { rewrite: name => "rewrite" } - - file { - "/etc/apache2/sites-available/secure.wikimedia.org": - source => "puppet:///files/apache/sites/secure.wikimedia.org", - owner => root, - group => root, - mode => 0444; - } - - apache_site { secure: name => "secure.wikimedia.org" } -} diff --git a/manifests/site.pp b/manifests/site.pp index bcbb09f..2c0f095 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -2325,18 +2325,6 @@ mobile::vumi::udp2log } -node "singer.wikimedia.org" { - $cluster = "misc" - $gid=500 - include standard, - generic::mysql::packages::client, - misc::secure - - - install_certificate{ "star.wikimedia.org": } - monitor_service { "secure cert": description => "Certificate expiration", check_command => "check_cert!secure.wikimedia.org!443!Equifax_Secure_CA.pem", critical => "true" } -} - node "sockpuppet.pmtpa.wmnet" { include passwords::puppet::database -- To view, visit https://gerrit.wikimedia.org/r/67475 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibf67fc39b11b294a0a1f0f520d816a163e52451a Gerrit-PatchSet: 3 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
