Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/58267
Change subject: docroot/noc: Update and re-run createTxtFileSymlinks.sh
......................................................................
docroot/noc: Update and re-run createTxtFileSymlinks.sh
Change-Id: I2b80945d63c3def0fa96dda0f9765ac2923fac6e
---
M docroot/noc/conf/CommonSettings.php.txt
M docroot/noc/conf/InitialiseSettings.php.txt
M docroot/noc/conf/PoolCounterSettings-eqiad.php.txt
M docroot/noc/conf/PoolCounterSettings-pmtpa.php.txt
M docroot/noc/conf/StartProfiler.php.txt
M docroot/noc/conf/abusefilter.php.txt
M docroot/noc/conf/codereview.php.txt
M docroot/noc/conf/db-eqiad.php.txt
M docroot/noc/conf/db-labs.php.txt
M docroot/noc/conf/db-pmtpa.php.txt
M docroot/noc/conf/filebackend.php.txt
M docroot/noc/conf/flaggedrevs.php.txt
M docroot/noc/conf/index.php
M docroot/noc/conf/liquidthreads.php.txt
M docroot/noc/conf/lucene-common.php.txt
M docroot/noc/conf/lucene-labs.php.txt
M docroot/noc/conf/lucene-production.php.txt
M docroot/noc/conf/mc-eqiad.php.txt
M docroot/noc/conf/mc-labs.php.txt
M docroot/noc/conf/mc-pmtpa.php.txt
M docroot/noc/conf/mobile.php.txt
M docroot/noc/conf/proofreadpage.php.txt
M docroot/noc/conf/throttle.php.txt
M docroot/noc/conf/wgConf.php.txt
M docroot/noc/createTxtFileSymlinks.sh
25 files changed, 44 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/67/58267/1
diff --git a/docroot/noc/conf/CommonSettings.php.txt
b/docroot/noc/conf/CommonSettings.php.txt
index 3f0b4f1..e7cc2fb 120000
--- a/docroot/noc/conf/CommonSettings.php.txt
+++ b/docroot/noc/conf/CommonSettings.php.txt
@@ -1 +1 @@
-/home/wikipedia/common/wmf-config/CommonSettings.php
\ No newline at end of file
+../../wmf-config/CommonSettings.php
\ No newline at end of file
diff --git a/docroot/noc/conf/InitialiseSettings.php.txt
b/docroot/noc/conf/InitialiseSettings.php.txt
index 914dfa2..9f6dab3 120000
--- a/docroot/noc/conf/InitialiseSettings.php.txt
+++ b/docroot/noc/conf/InitialiseSettings.php.txt
@@ -1 +1 @@
-/home/wikipedia/common/wmf-config/InitialiseSettings.php
\ No newline at end of file
+../../wmf-config/InitialiseSettings.php
\ No newline at end of file
diff --git a/docroot/noc/conf/PoolCounterSettings-eqiad.php.txt
b/docroot/noc/conf/PoolCounterSettings-eqiad.php.txt
index 8148c20..b224ba2 120000
--- a/docroot/noc/conf/PoolCounterSettings-eqiad.php.txt
+++ b/docroot/noc/conf/PoolCounterSettings-eqiad.php.txt
@@ -1 +1 @@
-/home/wikipedia/common/wmf-config/PoolCounterSettings-eqiad.php
\ No newline at end of file
+../../wmf-config/PoolCounterSettings-eqiad.php
\ No newline at end of file
diff --git a/docroot/noc/conf/PoolCounterSettings-pmtpa.php.txt
b/docroot/noc/conf/PoolCounterSettings-pmtpa.php.txt
index 06733b9..f4d4791 120000
--- a/docroot/noc/conf/PoolCounterSettings-pmtpa.php.txt
+++ b/docroot/noc/conf/PoolCounterSettings-pmtpa.php.txt
@@ -1 +1 @@
-/home/wikipedia/common/wmf-config/PoolCounterSettings-pmtpa.php
\ No newline at end of file
+../../wmf-config/PoolCounterSettings-pmtpa.php
\ No newline at end of file
diff --git a/docroot/noc/conf/StartProfiler.php.txt
b/docroot/noc/conf/StartProfiler.php.txt
index 89af128..c5e7ebb 120000
--- a/docroot/noc/conf/StartProfiler.php.txt
+++ b/docroot/noc/conf/StartProfiler.php.txt
@@ -1 +1 @@
-/home/wikipedia/common/wmf-config/StartProfiler.php
\ No newline at end of file
+../../wmf-config/StartProfiler.php
\ No newline at end of file
diff --git a/docroot/noc/conf/abusefilter.php.txt
b/docroot/noc/conf/abusefilter.php.txt
index 946c503..c96bfca 120000
--- a/docroot/noc/conf/abusefilter.php.txt
+++ b/docroot/noc/conf/abusefilter.php.txt
@@ -1 +1 @@
-/home/wikipedia/common/wmf-config/abusefilter.php
\ No newline at end of file
+../../wmf-config/abusefilter.php
\ No newline at end of file
diff --git a/docroot/noc/conf/codereview.php.txt
b/docroot/noc/conf/codereview.php.txt
index 1a8cdf4..a12b4d5 120000
--- a/docroot/noc/conf/codereview.php.txt
+++ b/docroot/noc/conf/codereview.php.txt
@@ -1 +1 @@
-/home/wikipedia/common/wmf-config/codereview.php
\ No newline at end of file
+../../wmf-config/codereview.php
\ No newline at end of file
diff --git a/docroot/noc/conf/db-eqiad.php.txt
b/docroot/noc/conf/db-eqiad.php.txt
index a276138..50738f4 120000
--- a/docroot/noc/conf/db-eqiad.php.txt
+++ b/docroot/noc/conf/db-eqiad.php.txt
@@ -1 +1 @@
-/home/wikipedia/common/wmf-config/db-eqiad.php
\ No newline at end of file
+../../wmf-config/db-eqiad.php
\ No newline at end of file
diff --git a/docroot/noc/conf/db-labs.php.txt b/docroot/noc/conf/db-labs.php.txt
index 4c40d1c..9d08049 120000
--- a/docroot/noc/conf/db-labs.php.txt
+++ b/docroot/noc/conf/db-labs.php.txt
@@ -1 +1 @@
-/home/wikipedia/common/wmf-config/db-labs.php
\ No newline at end of file
+../../wmf-config/db-labs.php
\ No newline at end of file
diff --git a/docroot/noc/conf/db-pmtpa.php.txt
b/docroot/noc/conf/db-pmtpa.php.txt
index 5ca0881..c54bb66 120000
--- a/docroot/noc/conf/db-pmtpa.php.txt
+++ b/docroot/noc/conf/db-pmtpa.php.txt
@@ -1 +1 @@
-/home/wikipedia/common/wmf-config/db-pmtpa.php
\ No newline at end of file
+../../wmf-config/db-pmtpa.php
\ No newline at end of file
diff --git a/docroot/noc/conf/filebackend.php.txt
b/docroot/noc/conf/filebackend.php.txt
index a2d5545..782d74a 120000
--- a/docroot/noc/conf/filebackend.php.txt
+++ b/docroot/noc/conf/filebackend.php.txt
@@ -1 +1 @@
-/home/wikipedia/common/wmf-config/filebackend.php
\ No newline at end of file
+../../wmf-config/filebackend.php
\ No newline at end of file
diff --git a/docroot/noc/conf/flaggedrevs.php.txt
b/docroot/noc/conf/flaggedrevs.php.txt
index e277447..0508300 120000
--- a/docroot/noc/conf/flaggedrevs.php.txt
+++ b/docroot/noc/conf/flaggedrevs.php.txt
@@ -1 +1 @@
-/home/wikipedia/common/wmf-config/flaggedrevs.php
\ No newline at end of file
+../../wmf-config/flaggedrevs.php
\ No newline at end of file
diff --git a/docroot/noc/conf/index.php b/docroot/noc/conf/index.php
index b854ac4..4258a62 100644
--- a/docroot/noc/conf/index.php
+++ b/docroot/noc/conf/index.php
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<title>Wikimedia configuration files</title>
- <link rel="stylesheet" href="/base.css">
+ <link rel="stylesheet" href="../base.css">
</head>
<body>
diff --git a/docroot/noc/conf/liquidthreads.php.txt
b/docroot/noc/conf/liquidthreads.php.txt
index 27f59fc..a1ee016 120000
--- a/docroot/noc/conf/liquidthreads.php.txt
+++ b/docroot/noc/conf/liquidthreads.php.txt
@@ -1 +1 @@
-/home/wikipedia/common/wmf-config/liquidthreads.php
\ No newline at end of file
+../../wmf-config/liquidthreads.php
\ No newline at end of file
diff --git a/docroot/noc/conf/lucene-common.php.txt
b/docroot/noc/conf/lucene-common.php.txt
index 6427144..1c74e0e 120000
--- a/docroot/noc/conf/lucene-common.php.txt
+++ b/docroot/noc/conf/lucene-common.php.txt
@@ -1 +1 @@
-/home/wikipedia/common/wmf-config/lucene-common.php
\ No newline at end of file
+../../wmf-config/lucene-common.php
\ No newline at end of file
diff --git a/docroot/noc/conf/lucene-labs.php.txt
b/docroot/noc/conf/lucene-labs.php.txt
index b52a988..0b697dc 120000
--- a/docroot/noc/conf/lucene-labs.php.txt
+++ b/docroot/noc/conf/lucene-labs.php.txt
@@ -1 +1 @@
-/home/wikipedia/common/wmf-config/lucene-labs.php
\ No newline at end of file
+../../wmf-config/lucene-labs.php
\ No newline at end of file
diff --git a/docroot/noc/conf/lucene-production.php.txt
b/docroot/noc/conf/lucene-production.php.txt
index fc2aab7..914e82d 120000
--- a/docroot/noc/conf/lucene-production.php.txt
+++ b/docroot/noc/conf/lucene-production.php.txt
@@ -1 +1 @@
-/home/wikipedia/common/wmf-config/lucene-production.php
\ No newline at end of file
+../../wmf-config/lucene-production.php
\ No newline at end of file
diff --git a/docroot/noc/conf/mc-eqiad.php.txt
b/docroot/noc/conf/mc-eqiad.php.txt
index b38a107..2bef006 120000
--- a/docroot/noc/conf/mc-eqiad.php.txt
+++ b/docroot/noc/conf/mc-eqiad.php.txt
@@ -1 +1 @@
-/home/wikipedia/common/wmf-config/mc-eqiad.php
\ No newline at end of file
+../../wmf-config/mc-eqiad.php
\ No newline at end of file
diff --git a/docroot/noc/conf/mc-labs.php.txt b/docroot/noc/conf/mc-labs.php.txt
index 13cbcd0..bc7564b 120000
--- a/docroot/noc/conf/mc-labs.php.txt
+++ b/docroot/noc/conf/mc-labs.php.txt
@@ -1 +1 @@
-/home/wikipedia/common/wmf-config/mc-labs.php
\ No newline at end of file
+../../wmf-config/mc-labs.php
\ No newline at end of file
diff --git a/docroot/noc/conf/mc-pmtpa.php.txt
b/docroot/noc/conf/mc-pmtpa.php.txt
index 5bdba4a..068cf56 120000
--- a/docroot/noc/conf/mc-pmtpa.php.txt
+++ b/docroot/noc/conf/mc-pmtpa.php.txt
@@ -1 +1 @@
-/home/wikipedia/common/wmf-config/mc-pmtpa.php
\ No newline at end of file
+../../wmf-config/mc-pmtpa.php
\ No newline at end of file
diff --git a/docroot/noc/conf/mobile.php.txt b/docroot/noc/conf/mobile.php.txt
index 0e15fd5..b883fae 120000
--- a/docroot/noc/conf/mobile.php.txt
+++ b/docroot/noc/conf/mobile.php.txt
@@ -1 +1 @@
-/home/wikipedia/common/wmf-config/mobile.php
\ No newline at end of file
+../../wmf-config/mobile.php
\ No newline at end of file
diff --git a/docroot/noc/conf/proofreadpage.php.txt
b/docroot/noc/conf/proofreadpage.php.txt
index d7c52bd..a1c6589 120000
--- a/docroot/noc/conf/proofreadpage.php.txt
+++ b/docroot/noc/conf/proofreadpage.php.txt
@@ -1 +1 @@
-/home/wikipedia/common/wmf-config/proofreadpage.php
\ No newline at end of file
+../../wmf-config/proofreadpage.php
\ No newline at end of file
diff --git a/docroot/noc/conf/throttle.php.txt
b/docroot/noc/conf/throttle.php.txt
index d87e105..9c20dac 120000
--- a/docroot/noc/conf/throttle.php.txt
+++ b/docroot/noc/conf/throttle.php.txt
@@ -1 +1 @@
-/home/wikipedia/common/wmf-config/throttle.php
\ No newline at end of file
+../../wmf-config/throttle.php
\ No newline at end of file
diff --git a/docroot/noc/conf/wgConf.php.txt b/docroot/noc/conf/wgConf.php.txt
index 337d846..e1fc6a9 120000
--- a/docroot/noc/conf/wgConf.php.txt
+++ b/docroot/noc/conf/wgConf.php.txt
@@ -1 +1 @@
-/home/wikipedia/common/wmf-config/wgConf.php
\ No newline at end of file
+../../wmf-config/wgConf.php
\ No newline at end of file
diff --git a/docroot/noc/createTxtFileSymlinks.sh
b/docroot/noc/createTxtFileSymlinks.sh
index cf58906..0c7d088 100755
--- a/docroot/noc/createTxtFileSymlinks.sh
+++ b/docroot/noc/createTxtFileSymlinks.sh
@@ -1,29 +1,39 @@
#!/bin/bash
+cd $(dirname $0)
+
files_array=(
CommonSettings.php
InitialiseSettings.php
- PoolCounterSettings.php
+ PoolCounterSettings-eqiad.php
+ PoolCounterSettings-pmtpa.php
StartProfiler.php
abusefilter.php
codereview.php
- db.php
+ db-eqiad.php
+ db-labs.php
+ db-pmtpa.php
+ filebackend.php
flaggedrevs.php
liquidthreads.php
- lucene.php
- mc.php
+ lucene-common.php
+ lucene-labs.php
+ lucene-production.php
+ mc-eqiad.php
+ mc-labs.php
+ mc-pmtpa.php
mobile.php
proofreadpage.php
- secure.php
+ throttle.php
wgConf.php
)
-cleanup_pattern=/home/wikipedia/htdocs/noc/conf/*.txt
-
-if [ -a cleanup_pattern ]
- then rm cleanup_pattern
+# if -e returns false if there is a symlink but target does not exist locally
+if ls ./conf/*.txt >/dev/null 2>&1
+then
+ rm ./conf/*.txt
fi
for i in "${files_array[@]}"
do
- ln -f -s /home/wikipedia/common/wmf-config/$i
/home/wikipedia/htdocs/noc/conf/$i.txt
+ ln -s ../../wmf-config/$i conf/$i.txt
done
--
To view, visit https://gerrit.wikimedia.org/r/58267
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b80945d63c3def0fa96dda0f9765ac2923fac6e
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
