[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Standardize most of the docroots
jenkins-bot has submitted this change and it was merged. Change subject: Standardize most of the docroots .. Standardize most of the docroots Only ones that have custom files and aren't standard are: - Usability & commons belong under wikimedia.org. Doing in puppet in I810780fe, will follow up for total removal here later. - Bits is going away in I935c4c5d - Secure, search and noc are weird one offs - foundation, mediawiki, wikimedia.org, wikipedia.org all have custom content that they're serving. This should be audited and possibly cleaned up Change-Id: I351e60c7a2bed8600500142ea52c544f13474955 --- R docroot/standard-docroot/503.html R docroot/standard-docroot/images R docroot/standard-docroot/static R docroot/standard-docroot/w A docroot/wikibooks.org A docroot/wikidata D docroot/wikidata/503.html D docroot/wikidata/images D docroot/wikidata/static D docroot/wikidata/w A docroot/wikinews.org D docroot/wikinews.org/503.html D docroot/wikinews.org/images D docroot/wikinews.org/static D docroot/wikinews.org/w A docroot/wikiquote.org D docroot/wikiquote.org/503.html D docroot/wikiquote.org/images D docroot/wikiquote.org/static D docroot/wikiquote.org/w A docroot/wikisource.org D docroot/wikisource.org/503.html D docroot/wikisource.org/images D docroot/wikisource.org/static D docroot/wikisource.org/w A docroot/wikiversity.org D docroot/wikiversity.org/503.html D docroot/wikiversity.org/images D docroot/wikiversity.org/static D docroot/wikiversity.org/w A docroot/wikivoyage.org D docroot/wikivoyage.org/503.html D docroot/wikivoyage.org/images D docroot/wikivoyage.org/static D docroot/wikivoyage.org/w A docroot/wiktionary.org D docroot/wiktionary.org/503.html D docroot/wiktionary.org/images D docroot/wiktionary.org/static D docroot/wiktionary.org/w 40 files changed, 8 insertions(+), 28 deletions(-) Approvals: Krinkle: Looks good to me, but someone else must approve Chad: Looks good to me, approved 20after4: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/docroot/wikibooks.org/503.html b/docroot/standard-docroot/503.html similarity index 100% rename from docroot/wikibooks.org/503.html rename to docroot/standard-docroot/503.html diff --git a/docroot/wikibooks.org/images b/docroot/standard-docroot/images similarity index 100% rename from docroot/wikibooks.org/images rename to docroot/standard-docroot/images diff --git a/docroot/wikibooks.org/static b/docroot/standard-docroot/static similarity index 100% rename from docroot/wikibooks.org/static rename to docroot/standard-docroot/static diff --git a/docroot/wikibooks.org/w b/docroot/standard-docroot/w similarity index 100% rename from docroot/wikibooks.org/w rename to docroot/standard-docroot/w diff --git a/docroot/wikibooks.org b/docroot/wikibooks.org new file mode 12 index 000..e970be9 --- /dev/null +++ b/docroot/wikibooks.org @@ -0,0 +1 @@ +standard-docroot \ No newline at end of file diff --git a/docroot/wikidata b/docroot/wikidata new file mode 12 index 000..e970be9 --- /dev/null +++ b/docroot/wikidata @@ -0,0 +1 @@ +standard-docroot \ No newline at end of file diff --git a/docroot/wikidata/503.html b/docroot/wikidata/503.html deleted file mode 12 index 8a0c3a2..000 --- a/docroot/wikidata/503.html +++ /dev/null @@ -1 +0,0 @@ -../../errorpages/503.html \ No newline at end of file diff --git a/docroot/wikidata/images b/docroot/wikidata/images deleted file mode 12 index 2a1f364..000 --- a/docroot/wikidata/images +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/images \ No newline at end of file diff --git a/docroot/wikidata/static b/docroot/wikidata/static deleted file mode 12 index de3aae3..000 --- a/docroot/wikidata/static +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/static \ No newline at end of file diff --git a/docroot/wikidata/w b/docroot/wikidata/w deleted file mode 12 index 65de7be..000 --- a/docroot/wikidata/w +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/w \ No newline at end of file diff --git a/docroot/wikinews.org b/docroot/wikinews.org new file mode 12 index 000..e970be9 --- /dev/null +++ b/docroot/wikinews.org @@ -0,0 +1 @@ +standard-docroot \ No newline at end of file diff --git a/docroot/wikinews.org/503.html b/docroot/wikinews.org/503.html deleted file mode 12 index 8a0c3a2..000 --- a/docroot/wikinews.org/503.html +++ /dev/null @@ -1 +0,0 @@ -../../errorpages/503.html \ No newline at end of file diff --git a/docroot/wikinews.org/images b/docroot/wikinews.org/images deleted file mode 12 index 2a1f364..000 --- a/docroot/wikinews.org/images +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/images \ No newline at end of file diff --git a/docroot/wikinews.org/static b/docroot/wikinews.org/static deleted file mode 12 index de3aae3..000 --- a/docroot/wikinews.org/static +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/static \ No newline at end of file diff --git
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Standardize most of the docroots
Chad has uploaded a new change for review. https://gerrit.wikimedia.org/r/321726 Change subject: Standardize most of the docroots .. Standardize most of the docroots Only ones that have custom files and aren't standard are: - Usability should be folded into wikimedia.org, will do via puppet and later remove from here - Bits is going away in I935c4c5d - Secure, search and noc are weird one offs - foundation, mediawiki, wikimedia.org, wikipedia.org all have custom content that they're serving. This should be audited and possibly cleaned up Change-Id: I351e60c7a2bed8600500142ea52c544f13474955 --- A docroot/commons R docroot/standard-docroot/503.html R docroot/standard-docroot/images R docroot/standard-docroot/static R docroot/standard-docroot/w A docroot/wikibooks.org D docroot/wikibooks.org/503.html D docroot/wikibooks.org/images D docroot/wikibooks.org/static D docroot/wikibooks.org/w A docroot/wikidata D docroot/wikidata/503.html D docroot/wikidata/images D docroot/wikidata/static D docroot/wikidata/w A docroot/wikinews.org D docroot/wikinews.org/503.html D docroot/wikinews.org/images D docroot/wikinews.org/static D docroot/wikinews.org/w A docroot/wikiquote.org D docroot/wikiquote.org/503.html D docroot/wikiquote.org/images D docroot/wikiquote.org/static D docroot/wikiquote.org/w A docroot/wikisource.org D docroot/wikisource.org/503.html D docroot/wikisource.org/images D docroot/wikisource.org/static D docroot/wikisource.org/w A docroot/wikiversity.org D docroot/wikiversity.org/503.html D docroot/wikiversity.org/images D docroot/wikiversity.org/static D docroot/wikiversity.org/w A docroot/wikivoyage.org D docroot/wikivoyage.org/503.html D docroot/wikivoyage.org/images D docroot/wikivoyage.org/static D docroot/wikivoyage.org/w A docroot/wiktionary.org D docroot/wiktionary.org/503.html D docroot/wiktionary.org/images D docroot/wiktionary.org/static D docroot/wiktionary.org/w 45 files changed, 9 insertions(+), 32 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/26/321726/1 diff --git a/docroot/commons b/docroot/commons new file mode 12 index 000..e970be9 --- /dev/null +++ b/docroot/commons @@ -0,0 +1 @@ +standard-docroot \ No newline at end of file diff --git a/docroot/commons/503.html b/docroot/standard-docroot/503.html similarity index 100% rename from docroot/commons/503.html rename to docroot/standard-docroot/503.html diff --git a/docroot/commons/images b/docroot/standard-docroot/images similarity index 100% rename from docroot/commons/images rename to docroot/standard-docroot/images diff --git a/docroot/commons/static b/docroot/standard-docroot/static similarity index 100% rename from docroot/commons/static rename to docroot/standard-docroot/static diff --git a/docroot/commons/w b/docroot/standard-docroot/w similarity index 100% rename from docroot/commons/w rename to docroot/standard-docroot/w diff --git a/docroot/wikibooks.org b/docroot/wikibooks.org new file mode 12 index 000..e970be9 --- /dev/null +++ b/docroot/wikibooks.org @@ -0,0 +1 @@ +standard-docroot \ No newline at end of file diff --git a/docroot/wikibooks.org/503.html b/docroot/wikibooks.org/503.html deleted file mode 12 index 8a0c3a2..000 --- a/docroot/wikibooks.org/503.html +++ /dev/null @@ -1 +0,0 @@ -../../errorpages/503.html \ No newline at end of file diff --git a/docroot/wikibooks.org/images b/docroot/wikibooks.org/images deleted file mode 12 index 2a1f364..000 --- a/docroot/wikibooks.org/images +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/images \ No newline at end of file diff --git a/docroot/wikibooks.org/static b/docroot/wikibooks.org/static deleted file mode 12 index de3aae3..000 --- a/docroot/wikibooks.org/static +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/static \ No newline at end of file diff --git a/docroot/wikibooks.org/w b/docroot/wikibooks.org/w deleted file mode 12 index 65de7be..000 --- a/docroot/wikibooks.org/w +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/w \ No newline at end of file diff --git a/docroot/wikidata b/docroot/wikidata new file mode 12 index 000..e970be9 --- /dev/null +++ b/docroot/wikidata @@ -0,0 +1 @@ +standard-docroot \ No newline at end of file diff --git a/docroot/wikidata/503.html b/docroot/wikidata/503.html deleted file mode 12 index 8a0c3a2..000 --- a/docroot/wikidata/503.html +++ /dev/null @@ -1 +0,0 @@ -../../errorpages/503.html \ No newline at end of file diff --git a/docroot/wikidata/images b/docroot/wikidata/images deleted file mode 12 index 2a1f364..000 --- a/docroot/wikidata/images +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/images \ No newline at end of file diff --git a/docroot/wikidata/static b/docroot/wikidata/static deleted file mode 12 index de3aae3..000 --- a/docroot/wikidata/static +++ /dev/null @@ -1 +0,0 @@ -/srv/mediawiki/static \ No newline at end of file diff --git