jenkins-bot has submitted this change and it was merged.
Change subject: noc: Bring back langlist and wikiversions.dat as non-txt
......................................................................
noc: Bring back langlist and wikiversions.dat as non-txt
Also fixes symlink path for the txt versions to point to /
instead of /wmf-config.
Follows-up I2d8a2a0ca8da.
Change-Id: I107c550738b3914b986872f2d7480bae7a338631
---
A docroot/noc/conf/langlist
M docroot/noc/conf/langlist.txt
M docroot/noc/conf/wikiversions.dat
M docroot/noc/conf/wikiversions.dat.txt
M docroot/noc/createTxtFileSymlinks.sh
5 files changed, 26 insertions(+), 8 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docroot/noc/conf/langlist b/docroot/noc/conf/langlist
new file mode 120000
index 0000000..0f1785c
--- /dev/null
+++ b/docroot/noc/conf/langlist
@@ -0,0 +1 @@
+../../../langlist
\ No newline at end of file
diff --git a/docroot/noc/conf/langlist.txt b/docroot/noc/conf/langlist.txt
index b4e7a45..0f1785c 120000
--- a/docroot/noc/conf/langlist.txt
+++ b/docroot/noc/conf/langlist.txt
@@ -1 +1 @@
-../../../wmf-config/langlist
\ No newline at end of file
+../../../langlist
\ No newline at end of file
diff --git a/docroot/noc/conf/wikiversions.dat
b/docroot/noc/conf/wikiversions.dat
index 2efdd22..a66fc67 120000
--- a/docroot/noc/conf/wikiversions.dat
+++ b/docroot/noc/conf/wikiversions.dat
@@ -1 +1 @@
-/home/wikipedia/common/wikiversions.dat
\ No newline at end of file
+../../../wikiversions.dat
\ No newline at end of file
diff --git a/docroot/noc/conf/wikiversions.dat.txt
b/docroot/noc/conf/wikiversions.dat.txt
index 0465e33..a66fc67 120000
--- a/docroot/noc/conf/wikiversions.dat.txt
+++ b/docroot/noc/conf/wikiversions.dat.txt
@@ -1 +1 @@
-../../../wmf-config/wikiversions.dat
\ No newline at end of file
+../../../wikiversions.dat
\ No newline at end of file
diff --git a/docroot/noc/createTxtFileSymlinks.sh
b/docroot/noc/createTxtFileSymlinks.sh
index 963e04a..2da6dfd 100755
--- a/docroot/noc/createTxtFileSymlinks.sh
+++ b/docroot/noc/createTxtFileSymlinks.sh
@@ -1,8 +1,8 @@
#!/bin/bash
cd $(dirname $0)/conf
-files_array=(
- # wmf-config/*.php
+# [mediawiki-config]/wmf-config/
+wmf_config_files=(
CommonSettings-labs.php
CommonSettings.php
InitialiseSettings-labs.php
@@ -37,18 +37,35 @@
proofreadpage.php
throttle.php
wgConf.php
+)
+# [mediawiki-config]/
+misc_files=(
wikiversions.dat
langlist
)
-# if -e returns false if there is a symlink but target does not exist locally
if ls ./*.txt >/dev/null 2>&1
then
rm ./*.txt
fi
-for i in "${files_array[@]}"
+for i in "${wmf_config_files[@]}"
do
- ln -s ../../../wmf-config/$i ./$i.txt
+ ln -s ../../../wmf-config/$i ./$i.txt
+done
+
+for i in "${misc_files[@]}"
+do
+ ln -s ../../../$i ./$i.txt
+
+ # backwards compatibity: Though non-txt sometimes triggers
+ # a download in browsers (so we use .txt for everything now)
+ # some users (RT-4927) still have links to /langlist or
+ # /wikiversions.dat
+ if [[ -e ./$i || -L ./$i ]]
+ then
+ rm ./$i
+ fi
+ ln -s ../../../$i ./$i
done
--
To view, visit https://gerrit.wikimedia.org/r/59017
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I107c550738b3914b986872f2d7480bae7a338631
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
