Giuseppe Lavagetto has submitted this change and it was merged. Change subject: mediawiki/apache: use ports.conf ......................................................................
mediawiki/apache: use ports.conf Include the basic ports.conf in our apache config (as usually done in debian) and use VirtualHost *:80 everywhere Change-Id: I633b611000d919c2da741a38a4359048021c550c Signed-off-by: Giuseppe Lavagetto <[email protected]> --- M modules/mediawiki/files/apache/sites/foundation.conf M modules/mediawiki/files/apache/sites/main.conf M modules/mediawiki/files/apache/sites/nonexistent.conf M modules/mediawiki/files/apache/sites/redirects.conf M modules/mediawiki/files/apache/sites/remnant.conf M modules/mediawiki/files/apache/sites/search.wikimedia.conf M modules/mediawiki/files/apache/sites/secure.wikimedia.conf M modules/mediawiki/files/apache/sites/wikimania.conf M modules/mediawiki/files/apache/sites/wikimedia.conf M modules/mediawiki/files/apache/sites/wwwportals.conf M modules/mediawiki/templates/apache/apache2.conf.erb M modules/mediawiki/templates/apache/monitoring.conf.erb 12 files changed, 68 insertions(+), 68 deletions(-) Approvals: Ori.livneh: Looks good to me, but someone else must approve Filippo Giunchedi: Looks good to me, but someone else must approve Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/mediawiki/files/apache/sites/foundation.conf b/modules/mediawiki/files/apache/sites/foundation.conf index da0590b..244b58f 100644 --- a/modules/mediawiki/files/apache/sites/foundation.conf +++ b/modules/mediawiki/files/apache/sites/foundation.conf @@ -1,4 +1,4 @@ -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/foundation" ServerName wikimediafoundation.org diff --git a/modules/mediawiki/files/apache/sites/main.conf b/modules/mediawiki/files/apache/sites/main.conf index 3e76a6a..29fdd38 100644 --- a/modules/mediawiki/files/apache/sites/main.conf +++ b/modules/mediawiki/files/apache/sites/main.conf @@ -5,7 +5,7 @@ </IfModule> # MediaWiki -<VirtualHost *> +<VirtualHost *:80> ServerName www.mediawiki.org ServerAlias download.mediawiki.org DocumentRoot "/usr/local/apache/common/docroot/mediawiki" @@ -56,7 +56,7 @@ </VirtualHost> # test.wikidata -<VirtualHost *> +<VirtualHost *:80> ServerName test.wikidata.org DocumentRoot "/usr/local/apache/common/docroot/testwikidata" @@ -89,7 +89,7 @@ </VirtualHost> # Wikidata -<VirtualHost *> +<VirtualHost *:80> ServerName www.wikidata.org ServerAlias *.wikidata.org @@ -128,7 +128,7 @@ </VirtualHost> # Wiktionaries -<VirtualHost *> +<VirtualHost *:80> ServerName wiktionary ServerAlias *.wiktionary.org UseCanonicalName off @@ -196,7 +196,7 @@ </VirtualHost> # Wikiquotes -<VirtualHost *> +<VirtualHost *:80> ServerName wikiquote ServerAlias *.wikiquote.org UseCanonicalName off @@ -272,7 +272,7 @@ # Donate wiki is here instead of remnants.conf because it needs to catch donate.wikipedia.org # and the 'wikipedia' server's wildcard ServerAlias would otherwise apply -<VirtualHost *> +<VirtualHost *:80> ServerName donate.wikimedia.org ServerAlias donate.wikipedia.org DocumentRoot "/usr/local/apache/common/docroot/donate" @@ -312,7 +312,7 @@ </Directory> </VirtualHost> -<VirtualHost *> +<VirtualHost *:80> ServerName vote.wikimedia.org DocumentRoot "/usr/local/apache/common/docroot/vote" @@ -341,7 +341,7 @@ </VirtualHost> # Wikipedias -<VirtualHost *> +<VirtualHost *:80> ServerName wikipedia ServerAlias *.wikipedia.org UseCanonicalName off @@ -424,7 +424,7 @@ </VirtualHost> # Wikibooks -<VirtualHost *> +<VirtualHost *:80> ServerName wikibooks ServerAlias *.wikibooks.org UseCanonicalName off @@ -496,7 +496,7 @@ </VirtualHost> # Wikisource (note: approved languages only) -<VirtualHost *> +<VirtualHost *:80> ServerName wikisource ServerAlias *.wikisource.org UseCanonicalName off @@ -568,7 +568,7 @@ </VirtualHost> # Wikinews (approved subdomains only) -<VirtualHost *> +<VirtualHost *:80> ServerName wikinews ServerAlias *.wikinews.org UseCanonicalName off @@ -641,7 +641,7 @@ # Wikiversity (note: approved languages only) -<VirtualHost *> +<VirtualHost *:80> ServerName wikiversity ServerAlias *.wikiversity.org UseCanonicalName off @@ -713,7 +713,7 @@ </VirtualHost> # Wikivoyage -<VirtualHost *> +<VirtualHost *:80> ServerName wikivoyage ServerAlias *.wikivoyage.org diff --git a/modules/mediawiki/files/apache/sites/nonexistent.conf b/modules/mediawiki/files/apache/sites/nonexistent.conf index c881967..d59ae9f 100644 --- a/modules/mediawiki/files/apache/sites/nonexistent.conf +++ b/modules/mediawiki/files/apache/sites/nonexistent.conf @@ -1,5 +1,5 @@ # First entry in virtual host list, for non-existent domains -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/default" ServerName nonexistent ErrorDocument 404 /index.html diff --git a/modules/mediawiki/files/apache/sites/redirects.conf b/modules/mediawiki/files/apache/sites/redirects.conf index 8662d1f..6b2a9c0 100644 --- a/modules/mediawiki/files/apache/sites/redirects.conf +++ b/modules/mediawiki/files/apache/sites/redirects.conf @@ -2,7 +2,7 @@ # source file redirects.dat and managed on servers by Puppet # Do not edit it manually! -<VirtualHost *> +<VirtualHost *:80> ServerName redirector ServerAlias \ wikijunior.com \ diff --git a/modules/mediawiki/files/apache/sites/remnant.conf b/modules/mediawiki/files/apache/sites/remnant.conf index ee179ab..2879c93 100644 --- a/modules/mediawiki/files/apache/sites/remnant.conf +++ b/modules/mediawiki/files/apache/sites/remnant.conf @@ -1,5 +1,5 @@ # Meta -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/meta" ServerName meta.wikimedia.org @@ -47,7 +47,7 @@ </VirtualHost> # Wikisource -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/sources" ServerName wikisource.org @@ -88,7 +88,7 @@ </VirtualHost> # Wikimedia Commons -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/commons" ServerName commons.wikimedia.org @@ -132,7 +132,7 @@ </VirtualHost> # Internal grants wiki -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/grants" ServerName grants.wikimedia.org @@ -164,7 +164,7 @@ </VirtualHost> # fdc.wikimedia.org - Funds Dissemination Committee Wiki -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/fdc" ServerName fdc.wikimedia.org @@ -196,7 +196,7 @@ </VirtualHost> # Internal wiki -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/internal" ServerName internal.wikimedia.org @@ -228,7 +228,7 @@ </VirtualHost> # Board wiki -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/board" ServerName board.wikimedia.org @@ -260,7 +260,7 @@ </VirtualHost> # Board Governance Committee -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/boardgovcom" ServerName boardgovcom.wikimedia.org @@ -292,7 +292,7 @@ </VirtualHost> # Spcom wiki -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/spcom" ServerName spcom.wikimedia.org @@ -324,7 +324,7 @@ </VirtualHost> # Chapcom wiki -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/chapcom" ServerName chapcom.wikimedia.org @@ -356,7 +356,7 @@ </VirtualHost> # Incubator wiki -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/incubator" ServerName incubator.wikimedia.org @@ -394,7 +394,7 @@ </VirtualHost> # WikiSpecies wiki -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/species" ServerName species.wikimedia.org @@ -435,7 +435,7 @@ </VirtualHost> # search committee private wiki -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/searchcom" ServerName searchcom.wikimedia.org @@ -467,7 +467,7 @@ </VirtualHost> # Usability Wiki -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/usability" ServerName usability.wikimedia.org @@ -505,7 +505,7 @@ </VirtualHost> # strategy wiki -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/strategy" ServerName strategy.wikimedia.org @@ -543,7 +543,7 @@ </VirtualHost> # office private wiki -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/office" ServerName office.wikimedia.org @@ -576,7 +576,7 @@ </VirtualHost> # chair private wiki -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/chair" ServerName chair.wikimedia.org @@ -608,7 +608,7 @@ </VirtualHost> # advisory board PUBLIC wiki -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/advisory" ServerName advisory.wikimedia.org @@ -643,7 +643,7 @@ </VirtualHost> # auditcom private wiki -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/auditcom" ServerName auditcom.wikimedia.org @@ -676,7 +676,7 @@ # quality private wiki -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/quality" ServerName quality.wikimedia.org @@ -713,7 +713,7 @@ # OTRS private wiki -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/otrs-wiki" ServerName otrs-wiki.wikimedia.org @@ -745,7 +745,7 @@ </VirtualHost> # Executive director's private wiki -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/exec" ServerName exec.wikimedia.org @@ -777,7 +777,7 @@ </VirtualHost> # Private wiki for Jay and his minions -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/collab" ServerName collab.wikimedia.org @@ -809,7 +809,7 @@ </VirtualHost> # Outreach Wiki -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/outreach" ServerName outreach.wikimedia.org @@ -844,7 +844,7 @@ </VirtualHost> #movementroles wiki -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/movementroles" ServerName movementroles.wikimedia.org @@ -876,7 +876,7 @@ </VirtualHost> # checkuser private wiki -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/checkuser" ServerName checkuser.wikimedia.org @@ -908,7 +908,7 @@ </VirtualHost> # steward private wiki -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/steward" ServerName steward.wikimedia.org @@ -940,7 +940,7 @@ </VirtualHost> # ombudsmen private wiki -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/ombudsmen" ServerName ombudsmen.wikimedia.org diff --git a/modules/mediawiki/files/apache/sites/search.wikimedia.conf b/modules/mediawiki/files/apache/sites/search.wikimedia.conf index 2134e74..e6c130a 100644 --- a/modules/mediawiki/files/apache/sites/search.wikimedia.conf +++ b/modules/mediawiki/files/apache/sites/search.wikimedia.conf @@ -1,6 +1,6 @@ # Apple dictionary bridge -<VirtualHost *> +<VirtualHost *:80> ServerName search.wikimedia.org DocumentRoot "/usr/local/apache/common/docroot/search.wikimedia.org" DirectoryIndex index.php diff --git a/modules/mediawiki/files/apache/sites/secure.wikimedia.conf b/modules/mediawiki/files/apache/sites/secure.wikimedia.conf index 3cc6c5e..3b168f8 100644 --- a/modules/mediawiki/files/apache/sites/secure.wikimedia.conf +++ b/modules/mediawiki/files/apache/sites/secure.wikimedia.conf @@ -2,7 +2,7 @@ # as it was hosted on singer before we had proper https # but cool URIs don't change, so moved over to cluster -<VirtualHost *> +<VirtualHost *:80> ServerName secure.wikimedia.org ServerAdmin [email protected] diff --git a/modules/mediawiki/files/apache/sites/wikimania.conf b/modules/mediawiki/files/apache/sites/wikimania.conf index 4154acd..3b20c28 100644 --- a/modules/mediawiki/files/apache/sites/wikimania.conf +++ b/modules/mediawiki/files/apache/sites/wikimania.conf @@ -1,5 +1,5 @@ # Wikimania wikis -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org" ServerName wikimania @@ -53,7 +53,7 @@ </VirtualHost> # Wikimaniateam wiki -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org" ServerName wikimaniateam.wikimedia.org diff --git a/modules/mediawiki/files/apache/sites/wikimedia.conf b/modules/mediawiki/files/apache/sites/wikimedia.conf index ca7c04b..49ccedb 100644 --- a/modules/mediawiki/files/apache/sites/wikimedia.conf +++ b/modules/mediawiki/files/apache/sites/wikimedia.conf @@ -1,5 +1,5 @@ # Chapter wikis -<VirtualHost *> +<VirtualHost *:80> ServerName wikimedia-chapter ServerAlias no.wikimedia.org nl.wikimedia.org www.nl.wikimedia.org pl.wikimedia.org nz.wikimedia.org il.wikimedia.org rs.wikimedia.org pa-us.wikimedia.org us.wikimedia.org se.wikimedia.org ru.wikimedia.org ua.wikimedia.org co.wikimedia.org fi.wikimedia.org ve.wikimedia.org br.wikimedia.org dk.wikimedia.org tr.wikimedia.org noboard-chapters.wikimedia.org mk.wikimedia.org et.wikimedia.org nyc.wikimedia.org mx.wikimedia.org ar.wikimedia.org bd.wikimedia.org be.wikimedia.org UseCanonicalName off @@ -56,7 +56,7 @@ </VirtualHost> #bits -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/bits/" ServerName bits.wikimedia.org @@ -91,7 +91,7 @@ </VirtualHost> # loginwiki -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/login" ServerName login.wikimedia.org @@ -119,7 +119,7 @@ </VirtualHost> # transitionteam private wiki - RT-4850 -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/transitionteam" ServerName transitionteam.wikimedia.org @@ -151,7 +151,7 @@ </VirtualHost> # iegcom private wiki - RT-5042 -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/iegcom" ServerName iegcom.wikimedia.org @@ -183,7 +183,7 @@ </VirtualHost> # legalteamwiki bugzilla:61222 -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org" ServerName legalteam.wikimedia.org @@ -215,7 +215,7 @@ </VirtualHost> # zerowiki RT #6831 -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/wikimedia.org" ServerName zero.wikimedia.org @@ -247,7 +247,7 @@ </VirtualHost> # wikimedia.org -<VirtualHost *> +<VirtualHost *:80> DocumentRoot "/usr/local/apache/common/docroot/wwwportal" # bare wikimedia.org is in redirects.dat ServerName www.wikimedia.org diff --git a/modules/mediawiki/files/apache/sites/wwwportals.conf b/modules/mediawiki/files/apache/sites/wwwportals.conf index 3435c0d..d3feb64 100644 --- a/modules/mediawiki/files/apache/sites/wwwportals.conf +++ b/modules/mediawiki/files/apache/sites/wwwportals.conf @@ -1,4 +1,4 @@ -<VirtualHost *> +<VirtualHost *:80> ServerName wikipedia.org # Redirecting from subdirectories of wikipedia.org to subdomains @@ -11,7 +11,7 @@ RewriteRule ^(.*)$ %{ENV:RW_PROTO}://www.wikipedia.org$1 [R=301,L] </VirtualHost> -<VirtualHost *> +<VirtualHost *:80> DocumentRoot /usr/local/apache/common/docroot/wwwportal ServerName www.wikipedia.org @@ -48,7 +48,7 @@ php_admin_flag engine on </VirtualHost> -<VirtualHost *> +<VirtualHost *:80> ServerName m.wikipedia.org ServerAlias zero.wikipedia.org UseCanonicalName off @@ -61,7 +61,7 @@ RewriteRule ^/$ /w/mobilelanding.php [L] </VirtualHost> -<VirtualHost *> +<VirtualHost *:80> ServerName www.wiktionary.org DocumentRoot /usr/local/apache/common/docroot/wwwportal @@ -82,7 +82,7 @@ RewriteRule ^(.*)$ %{ENV:RW_PROTO}://en.wiktionary.org$1 [R=301,L] </VirtualHost> -<VirtualHost *> +<VirtualHost *:80> ServerName www.wikinews.org DocumentRoot /usr/local/apache/common/docroot/wwwportal @@ -103,7 +103,7 @@ RewriteRule ^(.*)$ %{ENV:RW_PROTO}://en.wikinews.org$1 [R=301,L] </VirtualHost> -<VirtualHost *> +<VirtualHost *:80> ServerName www.wikiquote.org DocumentRoot /usr/local/apache/common/docroot/wwwportal @@ -124,7 +124,7 @@ RewriteRule ^(.*)$ %{ENV:RW_PROTO}://en.wikiquote.org$1 [R=301,L] </VirtualHost> -<VirtualHost *> +<VirtualHost *:80> ServerName www.wikiversity.org ServerAlias wikiversity.org @@ -146,7 +146,7 @@ RewriteRule ^(.*)$ %{ENV:RW_PROTO}://en.wikiversity.org$1 [R=301,L] </VirtualHost> -<VirtualHost *> +<VirtualHost *:80> ServerName www.wikibooks.org DocumentRoot /usr/local/apache/common/docroot/wwwportal @@ -167,7 +167,7 @@ RewriteRule ^(.*)$ %{ENV:RW_PROTO}://en.wikibooks.org$1 [R=301,L] </VirtualHost> -<VirtualHost *> +<VirtualHost *:80> ServerName www.wikivoyage.org DocumentRoot /usr/local/apache/common/docroot/wwwportal diff --git a/modules/mediawiki/templates/apache/apache2.conf.erb b/modules/mediawiki/templates/apache/apache2.conf.erb index 688afe5..24d0ed6 100644 --- a/modules/mediawiki/templates/apache/apache2.conf.erb +++ b/modules/mediawiki/templates/apache/apache2.conf.erb @@ -70,7 +70,8 @@ CoreDumpDirectory /usr/local/apache/core </IfDefine> -Listen 80 +# This listens on port 80 by default and defines NameVirtualHost *:80 +Include ports.conf User apache Group apache @@ -318,7 +319,6 @@ ErrorDocument 503 /503.html ErrorDocument 404 /w/404.php -NameVirtualHost * Include sites-enabled/*.conf # Set ETags for files to not be based on inode, diff --git a/modules/mediawiki/templates/apache/monitoring.conf.erb b/modules/mediawiki/templates/apache/monitoring.conf.erb index 01d2bfb..4e1f902 100644 --- a/modules/mediawiki/templates/apache/monitoring.conf.erb +++ b/modules/mediawiki/templates/apache/monitoring.conf.erb @@ -1,4 +1,4 @@ -<VirtualHost *> +<VirtualHost *:80> ServerName <%= scope['::fqdn'] %> DocumentRoot "/var/www/monitoring" -- To view, visit https://gerrit.wikimedia.org/r/148098 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I633b611000d919c2da741a38a4359048021c550c Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: Alexandros Kosiaris <[email protected]> Gerrit-Reviewer: Filippo Giunchedi <[email protected]> Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: Ori.livneh <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
