Legoktm has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404989 )
Change subject: Add OOUI
......................................................................
Add OOUI
The oojs/ui Gerrit repository will be included in the "Everything" and "OOUI"
search profiles.
Bug: T185157
Change-Id: I7db07d2320ca58f549c7f84f93038f4868d5f577
---
M app.py
M enable.sh
A hound-ooui.service
M start.sh
M write_config.py
5 files changed, 28 insertions(+), 3 deletions(-)
Approvals:
Legoktm: Verified; Looks good to me, approved
diff --git a/app.py b/app.py
index cb1d7ef..d64dddc 100644
--- a/app.py
+++ b/app.py
@@ -33,6 +33,7 @@
'skins': 6082,
'things': 6083,
'core': 6084,
+ 'ooui': 6085,
}
DESCRIPTIONS = {
'search': 'Everything',
@@ -40,6 +41,7 @@
'extensions': 'Extensions',
'skins': 'Skins',
'things': 'Extensions & skins',
+ 'ooui': 'OOUI',
}
LINK_OPENSEARCH = re.compile('<link rel="search" .*?/>', flags=re.DOTALL)
@@ -97,13 +99,15 @@
{ext} ·
{skins} ·
{things}
+{ooui}
</div>
""".format(
search=index_url('search', backend),
core=index_url('core', backend),
ext=index_url('extensions', backend),
skins=index_url('skins', backend),
- things=index_url('things', backend)
+ things=index_url('things', backend),
+ ooui=index_url('ooui', backend)
)
title = '<title>MediaWiki code search</title>'
diff --git a/enable.sh b/enable.sh
index b0ec20c..2a42972 100755
--- a/enable.sh
+++ b/enable.sh
@@ -5,4 +5,5 @@
systemctl enable hound-extensions
systemctl enable hound-skins
systemctl enable hound-things
+systemctl enable hound-ooui
systemctl enable hound_proxy
diff --git a/hound-ooui.service b/hound-ooui.service
new file mode 100644
index 0000000..4c4b0ef
--- /dev/null
+++ b/hound-ooui.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=hound-ooui
+After=docker.service
+Requires=docker.service
+
+[Service]
+TimeoutStartSec=0
+ExecStartPre=-/usr/bin/docker kill hound-ooui
+ExecStartPre=-/usr/bin/docker rm -f hound-ooui
+ExecStartPre=/usr/bin/docker pull etsy/hound
+ExecStart=/usr/bin/docker run -p 6085:6080 --name hound-ooui -v
/srv/hound/hound-ooui:/data etsy/hound
+ExecStop=/usr/bin/docker stop hound-ooui
+
+[Install]
+WantedBy=multi-user.target
diff --git a/start.sh b/start.sh
index aadb733..3fe495e 100755
--- a/start.sh
+++ b/start.sh
@@ -5,4 +5,5 @@
systemctl start hound-extensions
systemctl start hound-skins
systemctl start hound-things
+systemctl start hound-ooui
systemctl start hound_proxy
diff --git a/write_config.py b/write_config.py
index b29ec7c..d943c2b 100755
--- a/write_config.py
+++ b/write_config.py
@@ -55,7 +55,7 @@
}
-def make_conf(directory, core=True, exts=True, skins=True):
+def make_conf(directory, core=True, exts=True, skins=True, ooui=False):
conf = {
'max-concurrent-indexers': 2,
'dbpath': 'data',
@@ -64,6 +64,9 @@
if core:
conf['repos']['MediaWiki core'] = repo_info('mediawiki/core')
+
+ if ooui:
+ conf['repos']['OOUI'] = repo_info('oojs/ui')
data = get_extdist_repos()
if exts:
@@ -86,11 +89,12 @@
def main():
- make_conf('hound-search')
+ make_conf('hound-search', ooui=True)
make_conf('hound-core', exts=False, skins=False)
make_conf('hound-extensions', core=False, skins=False)
make_conf('hound-skins', core=False, exts=False)
make_conf('hound-things', core=False)
+ make_conf('hound-ooui', core=False, exts=False, skins=False, ooui=True)
if __name__ == '__main__':
--
To view, visit https://gerrit.wikimedia.org/r/404989
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7db07d2320ca58f549c7f84f93038f4868d5f577
Gerrit-PatchSet: 1
Gerrit-Project: labs/codesearch
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
