jenkins-bot has submitted this change and it was merged.
Change subject: Make docroot/bits/static and docroot/bits/static-current
symlinks
......................................................................
Make docroot/bits/static and docroot/bits/static-current symlinks
Moving bits.wm.o out from behind the old bits Varnish cluster exposed
several legacy URLs that are no longer available on the WMF production
cluster. We are pretty sure that we aren't creating any new pages that
point to these resources but there are legacy applications and 3rd
parties that still link to various bits.wm.o/static and
bits.wm.o/static-current URLs. Switching the bits docroot to point at
the same resources used for the rest of the Apache docroots should
restore *most* of the resources that were previously being served out of
cache from the bits Varnish cluster.
* Symlink docroot/bits/static to /srv/mediawiki/w/static
* Symlink legacy docroot/bits/static-current to /srv/mediawiki/w/static/current
* updateBranchPointers: stop maintaining a secondary link farm in
docroot/bits/static since that will now point at the canonical link
farm in w/static.
* checkoutMediaWiki.php: Stop making new per-branch symlinks in
docroot/bits/static
* deleteMediaWiki: Stop cleaning up docroot/bits/static links
Change-Id: I25e753a7d6519363e2e70c3220deaa917d576baf
---
A docroot/bits/static
A docroot/bits/static-current
D docroot/bits/static-current/extensions
D docroot/bits/static-current/resources
D docroot/bits/static-current/skins
D docroot/bits/static/1.26wmf10/extensions
D docroot/bits/static/1.26wmf10/resources
D docroot/bits/static/1.26wmf10/skins
D docroot/bits/static/1.26wmf11/extensions
D docroot/bits/static/1.26wmf11/resources
D docroot/bits/static/1.26wmf11/skins
D docroot/bits/static/1.26wmf12/extensions
D docroot/bits/static/1.26wmf12/resources
D docroot/bits/static/1.26wmf12/skins
D docroot/bits/static/1.26wmf13/extensions
D docroot/bits/static/1.26wmf13/resources
D docroot/bits/static/1.26wmf13/skins
D docroot/bits/static/1.26wmf14/extensions
D docroot/bits/static/1.26wmf14/resources
D docroot/bits/static/1.26wmf14/skins
D docroot/bits/static/1.26wmf15/extensions
D docroot/bits/static/1.26wmf15/resources
D docroot/bits/static/1.26wmf15/skins
D docroot/bits/static/1.26wmf16/extensions
D docroot/bits/static/1.26wmf16/resources
D docroot/bits/static/1.26wmf16/skins
D docroot/bits/static/1.26wmf9/extensions
D docroot/bits/static/1.26wmf9/resources
D docroot/bits/static/1.26wmf9/skins
D docroot/bits/static/apple-touch
D docroot/bits/static/current/extensions
D docroot/bits/static/current/resources
D docroot/bits/static/current/skins
D docroot/bits/static/favicon
D docroot/bits/static/master/extensions
D docroot/bits/static/master/resources
D docroot/bits/static/master/skins
M multiversion/checkoutMediaWiki.php
M multiversion/deleteMediaWiki
M multiversion/updateBranchPointers
40 files changed, 5 insertions(+), 62 deletions(-)
Approvals:
20after4: Looks good to me, approved
BBlack: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/docroot/bits/static b/docroot/bits/static
new file mode 120000
index 0000000..5134fa2
--- /dev/null
+++ b/docroot/bits/static
@@ -0,0 +1 @@
+/srv/mediawiki/w/static
\ No newline at end of file
diff --git a/docroot/bits/static-current b/docroot/bits/static-current
new file mode 120000
index 0000000..22169e7
--- /dev/null
+++ b/docroot/bits/static-current
@@ -0,0 +1 @@
+/srv/mediawiki/w/static/current
\ No newline at end of file
diff --git a/docroot/bits/static-current/extensions
b/docroot/bits/static-current/extensions
deleted file mode 120000
index c9b0b4b..0000000
--- a/docroot/bits/static-current/extensions
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf3/extensions
\ No newline at end of file
diff --git a/docroot/bits/static-current/resources
b/docroot/bits/static-current/resources
deleted file mode 120000
index 42132bc..0000000
--- a/docroot/bits/static-current/resources
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf3/resources
\ No newline at end of file
diff --git a/docroot/bits/static-current/skins
b/docroot/bits/static-current/skins
deleted file mode 120000
index d323e96..0000000
--- a/docroot/bits/static-current/skins
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf3/skins
\ No newline at end of file
diff --git a/docroot/bits/static/1.26wmf10/extensions
b/docroot/bits/static/1.26wmf10/extensions
deleted file mode 120000
index 19ccee9..0000000
--- a/docroot/bits/static/1.26wmf10/extensions
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf10/extensions
\ No newline at end of file
diff --git a/docroot/bits/static/1.26wmf10/resources
b/docroot/bits/static/1.26wmf10/resources
deleted file mode 120000
index fe049b0..0000000
--- a/docroot/bits/static/1.26wmf10/resources
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf10/resources
\ No newline at end of file
diff --git a/docroot/bits/static/1.26wmf10/skins
b/docroot/bits/static/1.26wmf10/skins
deleted file mode 120000
index a302b53..0000000
--- a/docroot/bits/static/1.26wmf10/skins
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf10/skins/
\ No newline at end of file
diff --git a/docroot/bits/static/1.26wmf11/extensions
b/docroot/bits/static/1.26wmf11/extensions
deleted file mode 120000
index 3acd7b5..0000000
--- a/docroot/bits/static/1.26wmf11/extensions
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf11/extensions
\ No newline at end of file
diff --git a/docroot/bits/static/1.26wmf11/resources
b/docroot/bits/static/1.26wmf11/resources
deleted file mode 120000
index a3a0e8c..0000000
--- a/docroot/bits/static/1.26wmf11/resources
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf11/resources
\ No newline at end of file
diff --git a/docroot/bits/static/1.26wmf11/skins
b/docroot/bits/static/1.26wmf11/skins
deleted file mode 120000
index c1f6f80..0000000
--- a/docroot/bits/static/1.26wmf11/skins
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf11/skins/
\ No newline at end of file
diff --git a/docroot/bits/static/1.26wmf12/extensions
b/docroot/bits/static/1.26wmf12/extensions
deleted file mode 120000
index 947ee23..0000000
--- a/docroot/bits/static/1.26wmf12/extensions
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf12/extensions
\ No newline at end of file
diff --git a/docroot/bits/static/1.26wmf12/resources
b/docroot/bits/static/1.26wmf12/resources
deleted file mode 120000
index 9c97f64..0000000
--- a/docroot/bits/static/1.26wmf12/resources
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf12/resources
\ No newline at end of file
diff --git a/docroot/bits/static/1.26wmf12/skins
b/docroot/bits/static/1.26wmf12/skins
deleted file mode 120000
index 5b33588..0000000
--- a/docroot/bits/static/1.26wmf12/skins
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf12/skins/
\ No newline at end of file
diff --git a/docroot/bits/static/1.26wmf13/extensions
b/docroot/bits/static/1.26wmf13/extensions
deleted file mode 120000
index 50263ce..0000000
--- a/docroot/bits/static/1.26wmf13/extensions
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf13/extensions
\ No newline at end of file
diff --git a/docroot/bits/static/1.26wmf13/resources
b/docroot/bits/static/1.26wmf13/resources
deleted file mode 120000
index c23e48f..0000000
--- a/docroot/bits/static/1.26wmf13/resources
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf13/resources
\ No newline at end of file
diff --git a/docroot/bits/static/1.26wmf13/skins
b/docroot/bits/static/1.26wmf13/skins
deleted file mode 120000
index 7e50dcf..0000000
--- a/docroot/bits/static/1.26wmf13/skins
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf13/skins/
\ No newline at end of file
diff --git a/docroot/bits/static/1.26wmf14/extensions
b/docroot/bits/static/1.26wmf14/extensions
deleted file mode 120000
index 4e65c54..0000000
--- a/docroot/bits/static/1.26wmf14/extensions
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf14/extensions
\ No newline at end of file
diff --git a/docroot/bits/static/1.26wmf14/resources
b/docroot/bits/static/1.26wmf14/resources
deleted file mode 120000
index e915146..0000000
--- a/docroot/bits/static/1.26wmf14/resources
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf14/resources
\ No newline at end of file
diff --git a/docroot/bits/static/1.26wmf14/skins
b/docroot/bits/static/1.26wmf14/skins
deleted file mode 120000
index 065be5c..0000000
--- a/docroot/bits/static/1.26wmf14/skins
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf14/skins/
\ No newline at end of file
diff --git a/docroot/bits/static/1.26wmf15/extensions
b/docroot/bits/static/1.26wmf15/extensions
deleted file mode 120000
index 25f0d12..0000000
--- a/docroot/bits/static/1.26wmf15/extensions
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf15/extensions
\ No newline at end of file
diff --git a/docroot/bits/static/1.26wmf15/resources
b/docroot/bits/static/1.26wmf15/resources
deleted file mode 120000
index 110de94..0000000
--- a/docroot/bits/static/1.26wmf15/resources
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf15/resources
\ No newline at end of file
diff --git a/docroot/bits/static/1.26wmf15/skins
b/docroot/bits/static/1.26wmf15/skins
deleted file mode 120000
index 89b4445..0000000
--- a/docroot/bits/static/1.26wmf15/skins
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf15/skins/
\ No newline at end of file
diff --git a/docroot/bits/static/1.26wmf16/extensions
b/docroot/bits/static/1.26wmf16/extensions
deleted file mode 120000
index b0af31f..0000000
--- a/docroot/bits/static/1.26wmf16/extensions
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf16/extensions
\ No newline at end of file
diff --git a/docroot/bits/static/1.26wmf16/resources
b/docroot/bits/static/1.26wmf16/resources
deleted file mode 120000
index dfe6a15..0000000
--- a/docroot/bits/static/1.26wmf16/resources
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf16/resources
\ No newline at end of file
diff --git a/docroot/bits/static/1.26wmf16/skins
b/docroot/bits/static/1.26wmf16/skins
deleted file mode 120000
index fe08631..0000000
--- a/docroot/bits/static/1.26wmf16/skins
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf16/skins/
\ No newline at end of file
diff --git a/docroot/bits/static/1.26wmf9/extensions
b/docroot/bits/static/1.26wmf9/extensions
deleted file mode 120000
index 4c41bef..0000000
--- a/docroot/bits/static/1.26wmf9/extensions
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf9/extensions
\ No newline at end of file
diff --git a/docroot/bits/static/1.26wmf9/resources
b/docroot/bits/static/1.26wmf9/resources
deleted file mode 120000
index 2e3fe2b..0000000
--- a/docroot/bits/static/1.26wmf9/resources
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf9/resources
\ No newline at end of file
diff --git a/docroot/bits/static/1.26wmf9/skins
b/docroot/bits/static/1.26wmf9/skins
deleted file mode 120000
index 7cc9c2c..0000000
--- a/docroot/bits/static/1.26wmf9/skins
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf9/skins/
\ No newline at end of file
diff --git a/docroot/bits/static/apple-touch b/docroot/bits/static/apple-touch
deleted file mode 120000
index 359b57a..0000000
--- a/docroot/bits/static/apple-touch
+++ /dev/null
@@ -1 +0,0 @@
-../../w/static/apple-touch
\ No newline at end of file
diff --git a/docroot/bits/static/current/extensions
b/docroot/bits/static/current/extensions
deleted file mode 120000
index c9b0b4b..0000000
--- a/docroot/bits/static/current/extensions
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf3/extensions
\ No newline at end of file
diff --git a/docroot/bits/static/current/resources
b/docroot/bits/static/current/resources
deleted file mode 120000
index 42132bc..0000000
--- a/docroot/bits/static/current/resources
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf3/resources
\ No newline at end of file
diff --git a/docroot/bits/static/current/skins
b/docroot/bits/static/current/skins
deleted file mode 120000
index d323e96..0000000
--- a/docroot/bits/static/current/skins
+++ /dev/null
@@ -1 +0,0 @@
-/srv/mediawiki/php-1.26wmf3/skins
\ No newline at end of file
diff --git a/docroot/bits/static/favicon b/docroot/bits/static/favicon
deleted file mode 120000
index d5f05df..0000000
--- a/docroot/bits/static/favicon
+++ /dev/null
@@ -1 +0,0 @@
-../../w/static/favicon
\ No newline at end of file
diff --git a/docroot/bits/static/master/extensions
b/docroot/bits/static/master/extensions
deleted file mode 120000
index b536524..0000000
--- a/docroot/bits/static/master/extensions
+++ /dev/null
@@ -1 +0,0 @@
-../../../../php-master/extensions
\ No newline at end of file
diff --git a/docroot/bits/static/master/resources
b/docroot/bits/static/master/resources
deleted file mode 120000
index 602fc25..0000000
--- a/docroot/bits/static/master/resources
+++ /dev/null
@@ -1 +0,0 @@
-../../../../php-master/resources
\ No newline at end of file
diff --git a/docroot/bits/static/master/skins b/docroot/bits/static/master/skins
deleted file mode 120000
index caf277d..0000000
--- a/docroot/bits/static/master/skins
+++ /dev/null
@@ -1 +0,0 @@
-../../../../php-master/skins
\ No newline at end of file
diff --git a/multiversion/checkoutMediaWiki.php
b/multiversion/checkoutMediaWiki.php
index df0be95..c871e29 100644
--- a/multiversion/checkoutMediaWiki.php
+++ b/multiversion/checkoutMediaWiki.php
@@ -171,23 +171,6 @@
$link = "../wmf-config/StartProfiler.php";
createSymlink( $path, $link, "Created StartProfiler.php symlink." );
- # Create static- symlinks for bits.wikimedia.org...
- $bitsStaticDir = MEDIAWIKI_STAGING_DIR .
"/docroot/bits/static/$dstVersionNum";
- if ( !file_exists( $bitsStaticDir ) ) {
- mkdir( $bitsStaticDir, 0775 );
- }
- $path = MEDIAWIKI_STAGING_DIR .
"/docroot/bits/static/$dstVersionNum/skins";
- $link = MEDIAWIKI_DEPLOYMENT_DIR . "/php-$dstVersionNum/skins/";
- createSymlink( $path, $link, "Created bits/static/$dstVersionNum/skins
symlink." );
-
- $path = MEDIAWIKI_STAGING_DIR .
"/docroot/bits/static/$dstVersionNum/extensions";
- $link = MEDIAWIKI_DEPLOYMENT_DIR . "/php-$dstVersionNum/extensions";
- createSymlink( $path, $link, "Created
bits/static/$dstVersionNum/extensions symlink." );
-
- $path = MEDIAWIKI_STAGING_DIR .
"/docroot/bits/static/$dstVersionNum/resources";
- $link = MEDIAWIKI_DEPLOYMENT_DIR . "/php-$dstVersionNum/resources";
- createSymlink( $path, $link, "Created
bits/static/$dstVersionNum/resources symlink." );
-
# Create static- symlinks for /w...
$liveStaticDir = MEDIAWIKI_STAGING_DIR . "/w/static/$dstVersionNum";
if ( !file_exists( $liveStaticDir ) ) {
diff --git a/multiversion/deleteMediaWiki b/multiversion/deleteMediaWiki
index 3aedd72..a315ebc 100755
--- a/multiversion/deleteMediaWiki
+++ b/multiversion/deleteMediaWiki
@@ -44,15 +44,11 @@
# Destroy symlinks created by checkoutMediaWiki outside of $destIP
$symlinks = array(
- "$commonHomeDir/docroot/bits/static/$dstVersionNum/skins",
- "$commonHomeDir/docroot/bits/static/$dstVersionNum/extensions",
- "$commonHomeDir/docroot/bits/static/$dstVersionNum/resources",
"$commonHomeDir/w/static/$dstVersionNum/skins",
"$commonHomeDir/w/static/$dstVersionNum/extensions",
"$commonHomeDir/w/static/$dstVersionNum/resources",
);
$directories = array(
- "$commonHomeDir/docroot/bits/static/$dstVersionNum",
"$commonHomeDir/w/static/$dstVersionNum",
);
foreach ( $symlinks as $path ) {
diff --git a/multiversion/updateBranchPointers
b/multiversion/updateBranchPointers
index 957bbdb..31506c3 100755
--- a/multiversion/updateBranchPointers
+++ b/multiversion/updateBranchPointers
@@ -3,9 +3,9 @@
/**
* Create/update various symlinks used in production.
*
- * docroot/bits/static-current links to the latest production branch,
respectively.
- * This provides a stable URL to large static assets that are served by
extensions
- * and which do not change frequently.
+ * w/static/current links to the latest production branch, respectively.
+ * This provides a stable URL to large static assets that are served by
+ * extensions and which do not change frequently.
*
* php links to the current primary deployed version of MediaWiki.
*
@@ -58,9 +58,6 @@
foreach( $branches as $branch => $target ) {
updateBranch($dryRun, '/w/static',$branch, $target);
- if ($branch != 'current'){
- updateBranch($dryRun, '/docroot/bits/static',$branch,
$target);
- }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/229036
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I25e753a7d6519363e2e70c3220deaa917d576baf
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: 20after4 <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: Thcipriani <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
