Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59033
Change subject: noc: Add missing entries to createTxtFileSymlinks.sh
......................................................................
noc: Add missing entries to createTxtFileSymlinks.sh
The apache-config and dblist files were still manually created.
These are now tracked in createTxtFileSymlinks.sh as well to
avoid links from going stale or being forgotten about.
Also moved fc-list to not be exclusively in docroot/conf.
Change-Id: I246a6e2b71a1b3bfac710666b40e1fc25acbfa05
---
M docroot/noc/conf/all.dblist
M docroot/noc/conf/closed.dblist
M docroot/noc/conf/deleted.dblist
A docroot/noc/conf/fc-list
M docroot/noc/conf/fishbowl.dblist
M docroot/noc/conf/flaggedrevs.dblist
M docroot/noc/conf/interwiki.cdb
M docroot/noc/conf/large.dblist
M docroot/noc/conf/medium.dblist
M docroot/noc/conf/private.dblist
M docroot/noc/conf/s1.dblist
M docroot/noc/conf/s2.dblist
M docroot/noc/conf/s3.dblist
M docroot/noc/conf/s4.dblist
M docroot/noc/conf/s5.dblist
M docroot/noc/conf/s6.dblist
M docroot/noc/conf/s7.dblist
M docroot/noc/conf/small.dblist
M docroot/noc/conf/special.dblist
M docroot/noc/conf/trusted-xff.cdb
M docroot/noc/conf/wikibooks.dblist
M docroot/noc/conf/wikidataclient.dblist
M docroot/noc/conf/wikimania.dblist
M docroot/noc/conf/wikimedia.conf
M docroot/noc/conf/wikimedia.dblist
M docroot/noc/conf/wikinews.dblist
M docroot/noc/conf/wikipedia.dblist
M docroot/noc/conf/wikiquote.dblist
M docroot/noc/conf/wikisource.dblist
M docroot/noc/conf/wikiversity.dblist
M docroot/noc/conf/wikivoyage.dblist
M docroot/noc/conf/wiktionary.dblist
M docroot/noc/createTxtFileSymlinks.sh
R fc-list
34 files changed, 139 insertions(+), 89 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/33/59033/1
diff --git a/docroot/noc/conf/all.dblist b/docroot/noc/conf/all.dblist
index 1531ce6..ea189b6 120000
--- a/docroot/noc/conf/all.dblist
+++ b/docroot/noc/conf/all.dblist
@@ -1 +1 @@
-/home/wikipedia/common/all.dblist
\ No newline at end of file
+../../../all.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/closed.dblist b/docroot/noc/conf/closed.dblist
index d7c56f9..1916239 120000
--- a/docroot/noc/conf/closed.dblist
+++ b/docroot/noc/conf/closed.dblist
@@ -1 +1 @@
-/home/wikipedia/common/closed.dblist
\ No newline at end of file
+../../../closed.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/deleted.dblist b/docroot/noc/conf/deleted.dblist
index 1b48c58..422eb6f 120000
--- a/docroot/noc/conf/deleted.dblist
+++ b/docroot/noc/conf/deleted.dblist
@@ -1 +1 @@
-/home/wikipedia/common/deleted.dblist
\ No newline at end of file
+../../../deleted.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/fc-list b/docroot/noc/conf/fc-list
new file mode 120000
index 0000000..1700f9e
--- /dev/null
+++ b/docroot/noc/conf/fc-list
@@ -0,0 +1 @@
+../../../fc-list
\ No newline at end of file
diff --git a/docroot/noc/conf/fishbowl.dblist b/docroot/noc/conf/fishbowl.dblist
index eb8869e..e5974aa 120000
--- a/docroot/noc/conf/fishbowl.dblist
+++ b/docroot/noc/conf/fishbowl.dblist
@@ -1 +1 @@
-/home/wikipedia/common/fishbowl.dblist
\ No newline at end of file
+../../../fishbowl.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/flaggedrevs.dblist
b/docroot/noc/conf/flaggedrevs.dblist
index a4ae926..8d9bee1 120000
--- a/docroot/noc/conf/flaggedrevs.dblist
+++ b/docroot/noc/conf/flaggedrevs.dblist
@@ -1 +1 @@
-/home/wikipedia/common/flaggedrevs.dblist
\ No newline at end of file
+../../../flaggedrevs.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/interwiki.cdb b/docroot/noc/conf/interwiki.cdb
index 2d45fb6..ded6d62 120000
--- a/docroot/noc/conf/interwiki.cdb
+++ b/docroot/noc/conf/interwiki.cdb
@@ -1 +1 @@
-/home/wikipedia/common/wmf-config/interwiki.cdb
\ No newline at end of file
+../../../wmf-config/interwiki.cdb
\ No newline at end of file
diff --git a/docroot/noc/conf/large.dblist b/docroot/noc/conf/large.dblist
index 2f5773b..0c7dd4b 120000
--- a/docroot/noc/conf/large.dblist
+++ b/docroot/noc/conf/large.dblist
@@ -1 +1 @@
-/home/wikipedia/common/large.dblist
\ No newline at end of file
+../../../large.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/medium.dblist b/docroot/noc/conf/medium.dblist
index 4179ca7..11154fa 120000
--- a/docroot/noc/conf/medium.dblist
+++ b/docroot/noc/conf/medium.dblist
@@ -1 +1 @@
-/home/wikipedia/common/medium.dblist
\ No newline at end of file
+../../../medium.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/private.dblist b/docroot/noc/conf/private.dblist
index c1769ef..1abe1c7 120000
--- a/docroot/noc/conf/private.dblist
+++ b/docroot/noc/conf/private.dblist
@@ -1 +1 @@
-/home/wikipedia/common/private.dblist
\ No newline at end of file
+../../../private.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/s1.dblist b/docroot/noc/conf/s1.dblist
index af59bb8..6fd6dfe 120000
--- a/docroot/noc/conf/s1.dblist
+++ b/docroot/noc/conf/s1.dblist
@@ -1 +1 @@
-/home/wikipedia/common/s1.dblist
\ No newline at end of file
+../../../s1.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/s2.dblist b/docroot/noc/conf/s2.dblist
index d2ebb8c..2155525 120000
--- a/docroot/noc/conf/s2.dblist
+++ b/docroot/noc/conf/s2.dblist
@@ -1 +1 @@
-/home/wikipedia/common/s2.dblist
\ No newline at end of file
+../../../s2.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/s3.dblist b/docroot/noc/conf/s3.dblist
index a0d4e08..4b1abb0 120000
--- a/docroot/noc/conf/s3.dblist
+++ b/docroot/noc/conf/s3.dblist
@@ -1 +1 @@
-/home/wikipedia/common/s3.dblist
\ No newline at end of file
+../../../s3.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/s4.dblist b/docroot/noc/conf/s4.dblist
index ec250e5..1f2dd47 120000
--- a/docroot/noc/conf/s4.dblist
+++ b/docroot/noc/conf/s4.dblist
@@ -1 +1 @@
-/home/wikipedia/common/s4.dblist
\ No newline at end of file
+../../../s4.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/s5.dblist b/docroot/noc/conf/s5.dblist
index 5cc9d11..791d06c 120000
--- a/docroot/noc/conf/s5.dblist
+++ b/docroot/noc/conf/s5.dblist
@@ -1 +1 @@
-/home/wikipedia/common/s5.dblist
\ No newline at end of file
+../../../s5.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/s6.dblist b/docroot/noc/conf/s6.dblist
index 093c774..4d99383 120000
--- a/docroot/noc/conf/s6.dblist
+++ b/docroot/noc/conf/s6.dblist
@@ -1 +1 @@
-/home/wikipedia/common/s6.dblist
\ No newline at end of file
+../../../s6.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/s7.dblist b/docroot/noc/conf/s7.dblist
index b059b4b..6b32a4d 120000
--- a/docroot/noc/conf/s7.dblist
+++ b/docroot/noc/conf/s7.dblist
@@ -1 +1 @@
-/home/wikipedia/common/s7.dblist
\ No newline at end of file
+../../../s7.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/small.dblist b/docroot/noc/conf/small.dblist
index 0e6f81b..7494b07 120000
--- a/docroot/noc/conf/small.dblist
+++ b/docroot/noc/conf/small.dblist
@@ -1 +1 @@
-/home/wikipedia/common/small.dblist
\ No newline at end of file
+../../../small.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/special.dblist b/docroot/noc/conf/special.dblist
index 99a8947..b60a321 120000
--- a/docroot/noc/conf/special.dblist
+++ b/docroot/noc/conf/special.dblist
@@ -1 +1 @@
-/home/wikipedia/common/special.dblist
\ No newline at end of file
+../../../special.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/trusted-xff.cdb b/docroot/noc/conf/trusted-xff.cdb
index 8cba9ab..4e10554 120000
--- a/docroot/noc/conf/trusted-xff.cdb
+++ b/docroot/noc/conf/trusted-xff.cdb
@@ -1 +1 @@
-/home/wikipedia/common/wmf-config/trusted-xff.cdb
\ No newline at end of file
+../../../trusted-xff.cdb
\ No newline at end of file
diff --git a/docroot/noc/conf/wikibooks.dblist
b/docroot/noc/conf/wikibooks.dblist
index d29c72d..9f8bfb8 120000
--- a/docroot/noc/conf/wikibooks.dblist
+++ b/docroot/noc/conf/wikibooks.dblist
@@ -1 +1 @@
-/home/wikipedia/common/wikibooks.dblist
\ No newline at end of file
+../../../wikibooks.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/wikidataclient.dblist
b/docroot/noc/conf/wikidataclient.dblist
index 0b22fca..6a03d2f 120000
--- a/docroot/noc/conf/wikidataclient.dblist
+++ b/docroot/noc/conf/wikidataclient.dblist
@@ -1 +1 @@
-/home/wikipedia/common/wikidataclient.dblist
\ No newline at end of file
+../../../wikidataclient.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/wikimania.dblist
b/docroot/noc/conf/wikimania.dblist
index 5eb136e..b13462a 120000
--- a/docroot/noc/conf/wikimania.dblist
+++ b/docroot/noc/conf/wikimania.dblist
@@ -1 +1 @@
-/home/wikipedia/common/wikimania.dblist
\ No newline at end of file
+../../../wikimania.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/wikimedia.conf b/docroot/noc/conf/wikimedia.conf
index cb19200..fbd50ec 120000
--- a/docroot/noc/conf/wikimedia.conf
+++ b/docroot/noc/conf/wikimedia.conf
@@ -1 +1 @@
-/home/wikipedia/conf/httpd/wikimedia.conf
\ No newline at end of file
+../../../wikimedia.conf
\ No newline at end of file
diff --git a/docroot/noc/conf/wikimedia.dblist
b/docroot/noc/conf/wikimedia.dblist
index fc6c92a..cfd15d9 120000
--- a/docroot/noc/conf/wikimedia.dblist
+++ b/docroot/noc/conf/wikimedia.dblist
@@ -1 +1 @@
-/home/wikipedia/common/wikimedia.dblist
\ No newline at end of file
+../../../wikimedia.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/wikinews.dblist b/docroot/noc/conf/wikinews.dblist
index e540676..df57613 120000
--- a/docroot/noc/conf/wikinews.dblist
+++ b/docroot/noc/conf/wikinews.dblist
@@ -1 +1 @@
-/home/wikipedia/common/wikinews.dblist
\ No newline at end of file
+../../../wikinews.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/wikipedia.dblist
b/docroot/noc/conf/wikipedia.dblist
index 8853569..96ca060 120000
--- a/docroot/noc/conf/wikipedia.dblist
+++ b/docroot/noc/conf/wikipedia.dblist
@@ -1 +1 @@
-/home/wikipedia/common/wikipedia.dblist
\ No newline at end of file
+../../../wikipedia.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/wikiquote.dblist
b/docroot/noc/conf/wikiquote.dblist
index 4e45d46..21e245b 120000
--- a/docroot/noc/conf/wikiquote.dblist
+++ b/docroot/noc/conf/wikiquote.dblist
@@ -1 +1 @@
-/home/wikipedia/common/wikiquote.dblist
\ No newline at end of file
+../../../wikiquote.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/wikisource.dblist
b/docroot/noc/conf/wikisource.dblist
index 2a1c651..6848d7d 120000
--- a/docroot/noc/conf/wikisource.dblist
+++ b/docroot/noc/conf/wikisource.dblist
@@ -1 +1 @@
-/home/wikipedia/common/wikisource.dblist
\ No newline at end of file
+../../../wikisource.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/wikiversity.dblist
b/docroot/noc/conf/wikiversity.dblist
index e875b25..9804ed0 120000
--- a/docroot/noc/conf/wikiversity.dblist
+++ b/docroot/noc/conf/wikiversity.dblist
@@ -1 +1 @@
-/home/wikipedia/common/wikiversity.dblist
\ No newline at end of file
+../../../wikiversity.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/wikivoyage.dblist
b/docroot/noc/conf/wikivoyage.dblist
index 9bf3b8a..ce6d9ee 120000
--- a/docroot/noc/conf/wikivoyage.dblist
+++ b/docroot/noc/conf/wikivoyage.dblist
@@ -1 +1 @@
-/home/wikipedia/common/wikivoyage.dblist
\ No newline at end of file
+../../../wikivoyage.dblist
\ No newline at end of file
diff --git a/docroot/noc/conf/wiktionary.dblist
b/docroot/noc/conf/wiktionary.dblist
index cbd34a4..6fe1921 120000
--- a/docroot/noc/conf/wiktionary.dblist
+++ b/docroot/noc/conf/wiktionary.dblist
@@ -1 +1 @@
-/home/wikipedia/common/wiktionary.dblist
\ No newline at end of file
+../../../wiktionary.dblist
\ No newline at end of file
diff --git a/docroot/noc/createTxtFileSymlinks.sh
b/docroot/noc/createTxtFileSymlinks.sh
index 2da6dfd..496b390 100755
--- a/docroot/noc/createTxtFileSymlinks.sh
+++ b/docroot/noc/createTxtFileSymlinks.sh
@@ -1,71 +1,120 @@
#!/bin/bash
cd $(dirname $0)/conf
-# [mediawiki-config]/wmf-config/
-wmf_config_files=(
- CommonSettings-labs.php
- CommonSettings.php
- InitialiseSettings-labs.php
- InitialiseSettings.php
- PoolCounterSettings-eqiad.php
- PoolCounterSettings-pmtpa.php
- StartProfiler.php
- abusefilter.php
- codereview.php
- db-eqiad.php
- db-labs.php
- db-pmtpa.php
- db-secondary.php
- ext-labs.php
- ext-production.php
- filebackend-labs.php
- filebackend.php
- flaggedrevs.php
- jobqueue-eqiad.php
- jobqueue-pmtpa.php
- liquidthreads.php
- logging-labs.php
- lucene-common.php
- lucene-labs.php
- lucene-production.php
- mc-eqiad.php
- mc-labs.php
- mc-pmtpa.php
- missing.php
- mobile-labs.php
- mobile.php
- proofreadpage.php
- throttle.php
- wgConf.php
-)
-
-# [mediawiki-config]/
-misc_files=(
- wikiversions.dat
+# Create .txt symlink from mediawiki-config
+mwconfig_files_txt=(
langlist
+ wikiversions.dat
+ wmf-config/CommonSettings-labs.php
+ wmf-config/CommonSettings.php
+ wmf-config/InitialiseSettings-labs.php
+ wmf-config/InitialiseSettings.php
+ wmf-config/PoolCounterSettings-eqiad.php
+ wmf-config/PoolCounterSettings-pmtpa.php
+ wmf-config/StartProfiler.php
+ wmf-config/abusefilter.php
+ wmf-config/codereview.php
+ wmf-config/db-eqiad.php
+ wmf-config/db-labs.php
+ wmf-config/db-pmtpa.php
+ wmf-config/db-secondary.php
+ wmf-config/ext-labs.php
+ wmf-config/ext-production.php
+ wmf-config/filebackend-labs.php
+ wmf-config/filebackend.php
+ wmf-config/flaggedrevs.php
+ wmf-config/jobqueue-eqiad.php
+ wmf-config/jobqueue-pmtpa.php
+ wmf-config/liquidthreads.php
+ wmf-config/logging-labs.php
+ wmf-config/lucene-common.php
+ wmf-config/lucene-labs.php
+ wmf-config/lucene-production.php
+ wmf-config/mc-eqiad.php
+ wmf-config/mc-labs.php
+ wmf-config/mc-pmtpa.php
+ wmf-config/missing.php
+ wmf-config/mobile-labs.php
+ wmf-config/mobile.php
+ wmf-config/proofreadpage.php
+ wmf-config/throttle.php
+ wmf-config/wgConf.php
)
-if ls ./*.txt >/dev/null 2>&1
-then
- rm ./*.txt
-fi
+# Create non-txt symlink from mediawiki-config
+# Mostly for backwards compatibility.
+# Raw views should use txt for consistent behaviour in browsers.
+mwconfig_files=(
+ all.dblist
+ closed.dblist
+ deleted.dblist
+ fc-list
+ fishbowl.dblist
+ flaggedrevs.dblist
+ langlist
+ large.dblist
+ medium.dblist
+ private.dblist
+ s1.dblist
+ s2.dblist
+ s3.dblist
+ s4.dblist
+ s5.dblist
+ s6.dblist
+ s7.dblist
+ small.dblist
+ special.dblist
+ trusted-xff.cdb
+ wikibooks.dblist
+ wikidataclient.dblist
+ wikimania.dblist
+ wikimedia.conf
+ wikimedia.dblist
+ wikinews.dblist
+ wikipedia.dblist
+ wikiquote.dblist
+ wikisource.dblist
+ wikiversions.dat
+ wikiversity.dblist
+ wikivoyage.dblist
+ wiktionary.dblist
+ wmf-config/interwiki.cdb
+)
-for i in "${wmf_config_files[@]}"
+# Create non-txt symlink from /home/wikipedia/conf
+other_config_file=(
+ httpd/en2.conf
+ httpd/foundation.conf
+ httpd/ganglia.conf
+ lucene/lsearch-global-2.1.conf
+ httpd/main.conf
+ httpd/nagios.conf
+ httpd/nonexistent.conf
+ httpd/postrewrites.conf
+ httpd/redirects.conf
+ httpd/remnant.conf
+ httpd/www.wikipedia.conf
+)
+
+for i in ./*
do
- ln -s ../../../wmf-config/$i ./$i.txt
+ if [[ $i != "./index.php" && $i != "./highlight.php" && $i !=
"./images" ]]
+ then
+ rm $i
+ fi
done
-for i in "${misc_files[@]}"
+for i in "${mwconfig_files_txt[@]}"
do
- ln -s ../../../$i ./$i.txt
+ ln -s ../../../$i "./$(basename $i).txt"
+done
- # 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
+for i in "${mwconfig_files[@]}"
+do
+ ln -s ../../../$i "./$(basename $i)"
+done
+
+for i in "${other_config_file[@]}"
+do
+ ln -s /home/wikipedia/conf/$i "./$(basename $i)"
done
diff --git a/docroot/noc/conf/fc-list b/fc-list
similarity index 100%
rename from docroot/noc/conf/fc-list
rename to fc-list
--
To view, visit https://gerrit.wikimedia.org/r/59033
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I246a6e2b71a1b3bfac710666b40e1fc25acbfa05
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
