git.iko.soy/searx
on master help sign in
[fix] migration from github.com/asciimoo/searx to github.com/searx/searx : fix URLs
commitf204e4903da3e97629bbf37c74e1b603b2e12830 authorAlexandre Flament <alex@al-f.net> dateMon 28 Sep 2020, 16:44 (6 years ago) parent8d47142
22 files changed+59−59
compare with master
unifiedsplit
CHANGELOG.rst+6−6 CONTRIBUTING.md+2−2 Makefile+4−4 README.rst+16−16 docs/admin/arch_public.dot+4−4 docs/admin/installation-docker.rst+1−1 docs/admin/installation.rst+1−1 docs/blog/lxcdev-202006.rst+1−1 docs/blog/python3.rst+1−1 docs/build-templates/searx.rst+1−1 docs/conf.py+4−4 docs/dev/contribution_guide.rst+1−1 docs/dev/quickstart.rst+1−1 searx/brand.py+3−3 searx/engines/searx_engine.py+2−2 searx/settings.yml+1−1 searx/templates/__common__/about.html+3−3 searx/templates/courgette/github_ribbon.html+1−1 searx/templates/legacy/github_ribbon.html+1−1 utils/brand.env+3−3 utils/fabfile.py+1−1 utils/lib.sh+1−1
CHANGELOG.rst+6−6
@@ -13,12 +13,12 @@
1313 - Wikivoyage
1414 - Rubygems
1515 - Engine fixes (google, google images, startpage, gigablast, yacy)
16− - Private engines introduced - more details: https://asciimoo.github.io/searx/blog/private-engines.html
17− - Greatly improved documentation - check it at https://asciimoo.github.io/searx
16+ - Private engines introduced - more details: https://searx.github.io/searx/blog/private-engines.html
17+ - Greatly improved documentation - check it at https://searx.github.io/searx
1818 - Added autofocus to all search inputs
1919 - CSP friendly oscar theme
2020 - Added option to hide engine errors with `display_error_messages` engine option (true/false values, default is true)
21− - Tons of accessibility fixes - see https://github.com/asciimoo/searx/issues/350 for details
21+ - Tons of accessibility fixes - see https://github.com/searx/searx/issues/350 for details
2222 - More flexible branding options: configurable vcs/issue tracker links
2323 - Added "disable all" & "allow all" options to preferences engine select
2424 - Autocomplete keyboard navigation fixes
@@ -142,8 +142,8 @@ News
142142
143143- Bug fixes
144144
145− - https://github.com/asciimoo/searx/issues/1088
146− - https://github.com/asciimoo/searx/issues/1089
145+ - https://github.com/searx/searx/issues/1088
146+ - https://github.com/searx/searx/issues/1089
147147
148148- Dependency updates
149149
@@ -312,7 +312,7 @@ News
312312News
313313~~~~
314314
315−New documentation page is available: https://asciimoo.github.io/searx
315+New documentation page is available: https://searx.github.io/searx
316316
317317
3183180.8.0 2015.09.08
CONTRIBUTING.md+2−2
@@ -2,8 +2,8 @@
22
33## Resources in the documentation
44
5−* [Development quickstart](http://asciimoo.github.io/searx/dev/contribution_guide.html)
6−* [Contribution guide](http://asciimoo.github.io/searx/dev/contribution_guide.html)
5+* [Development quickstart](http://searx.github.io/searx/dev/contribution_guide.html)
6+* [Contribution guide](http://searx.github.io/searx/dev/contribution_guide.html)
77
88## Submitting PRs
99
Makefile+4−4
@@ -2,10 +2,10 @@
22.DEFAULT_GOAL=help
33
44# START Makefile setup
5−export GIT_URL=https://github.com/asciimoo/searx
5+export GIT_URL=https://github.com/searx/searx
66export GIT_BRANCH=master
77export SEARX_URL=https://searx.me
8−export DOCS_URL=https://asciimoo.github.io/searx
8+export DOCS_URL=https://searx.github.io/searx
99# END Makefile setup
1010
1111include utils/makefile.include
@@ -121,14 +121,14 @@ buildenv:
121121 $(Q)echo "build searx/brand.py"
122122 $(Q)echo "GIT_URL = '$(GIT_URL)'" > searx/brand.py
123123 $(Q)echo "GIT_BRANCH = '$(GIT_BRANCH)'" >> searx/brand.py
124− $(Q)echo "ISSUE_URL = 'https://github.com/asciimoo/searx/issues'" >> searx/brand.py
124+ $(Q)echo "ISSUE_URL = 'https://github.com/searx/searx/issues'" >> searx/brand.py
125125 $(Q)echo "SEARX_URL = '$(SEARX_URL)'" >> searx/brand.py
126126 $(Q)echo "DOCS_URL = '$(DOCS_URL)'" >> searx/brand.py
127127 $(Q)echo "PUBLIC_INSTANCES = 'https://searx.space'" >> searx/brand.py
128128 $(Q)echo "build utils/brand.env"
129129 $(Q)echo "export GIT_URL='$(GIT_URL)'" > utils/brand.env
130130 $(Q)echo "export GIT_BRANCH='$(GIT_BRANCH)'" >> utils/brand.env
131− $(Q)echo "export ISSUE_URL='https://github.com/asciimoo/searx/issues'" >> utils/brand.env
131+ $(Q)echo "export ISSUE_URL='https://github.com/searx/searx/issues'" >> utils/brand.env
132132 $(Q)echo "export SEARX_URL='$(SEARX_URL)'" >> utils/brand.env
133133 $(Q)echo "export DOCS_URL='$(DOCS_URL)'" >> utils/brand.env
134134 $(Q)echo "export PUBLIC_INSTANCES='https://searx.space'" >> utils/brand.env
README.rst+16−16
@@ -1,7 +1,7 @@
11.. SPDX-License-Identifier: AGPL-3.0-or-later
22
3−.. figure:: https://raw.githubusercontent.com/asciimoo/searx/master/searx/static/themes/oscar/img/logo_searx_a.png
4− :target: https://asciimoo.github.io/searx/
3+.. figure:: https://raw.githubusercontent.com/searx/searx/master/searx/static/themes/oscar/img/logo_searx_a.png
4+ :target: https://searx.github.io/searx/
55 :alt: searX
66 :width: 100%
77 :align: center
@@ -22,25 +22,25 @@ Privacy-respecting, hackable `metasearch engine`_ / *pronunciation* **səːks**.
2222.. _metasearch engine: https://en.wikipedia.org/wiki/Metasearch_engine
2323
2424.. |searx install| image:: https://img.shields.io/badge/-install-blue
25− :target: https://asciimoo.github.io/searx/admin/installation.html
25+ :target: https://searx.github.io/searx/admin/installation.html
2626
2727.. |searx homepage| image:: https://img.shields.io/badge/-homepage-blue
28− :target: https://asciimoo.github.io/searx
28+ :target: https://searx.github.io/searx
2929
3030.. |searx wiki| image:: https://img.shields.io/badge/-wiki-blue
31− :target: https://github.com/asciimoo/searx/wiki
31+ :target: https://github.com/searx/searx/wiki
3232
3333.. |AGPL License| image:: https://img.shields.io/badge/license-AGPL-blue.svg
34− :target: https://github.com/asciimoo/searx/blob/master/LICENSE
34+ :target: https://github.com/searx/searx/blob/master/LICENSE
3535
36−.. |Issues| image:: https://img.shields.io/github/issues/asciimoo/searx?color=yellow&label=issues
37− :target: https://github.com/asciimoo/searx/issues
36+.. |Issues| image:: https://img.shields.io/github/issues/searx/searx?color=yellow&label=issues
37+ :target: https://github.com/searx/searx/issues
3838
39−.. |PR| image:: https://img.shields.io/github/issues-pr-raw/asciimoo/searx?color=yellow&label=PR
40− :target: https://github.com/asciimoo/searx/pulls
39+.. |PR| image:: https://img.shields.io/github/issues-pr-raw/searx/searx?color=yellow&label=PR
40+ :target: https://github.com/searx/searx/pulls
4141
42−.. |commits| image:: https://img.shields.io/github/commit-activity/y/asciimoo/searx?color=yellow&label=commits
43− :target: https://github.com/asciimoo/searx/commits/master
42+.. |commits| image:: https://img.shields.io/github/commit-activity/y/searx/searx?color=yellow&label=commits
43+ :target: https://github.com/searx/searx/commits/master
4444
4545.. |OpenCollective searx backers| image:: https://opencollective.com/searx/backers/badge.svg
4646 :target: https://opencollective.com/searx#backer
@@ -55,10 +55,10 @@ Otherwise jump to the user_, admin_ and developer_ handbooks you will find on
5555our homepage_.
5656
5757.. _searx.space: https://searx.space
58−.. _user: https://asciimoo.github.io/searx/user
59−.. _admin: https://asciimoo.github.io/searx/admin
60−.. _developer: https://asciimoo.github.io/searx/dev
61−.. _homepage: https://asciimoo.github.io/searx
58+.. _user: https://searx.github.io/searx/user
59+.. _admin: https://searx.github.io/searx/admin
60+.. _developer: https://searx.github.io/searx/dev
61+.. _homepage: https://searx.github.io/searx
6262
6363contact:
6464 openhub_ // twitter_ // IRC: #searx @ freenode
docs/admin/arch_public.dot+4−4
@@ -4,11 +4,11 @@ digraph G {
44 edge [fontname="Sans"];
55
66 browser [label="Browser", shape=Mdiamond];
7− rp [label="Reverse Proxy", href="https://asciimoo.github.io/searx/utils/filtron.sh.html#public-reverse-proxy"];
8− filtron [label="Filtron", href="https://asciimoo.github.io/searx/utils/filtron.sh.html"];
9− morty [label="Morty", href="https://asciimoo.github.io/searx/utils/morty.sh.html"];
7+ rp [label="Reverse Proxy", href="https://searx.github.io/searx/utils/filtron.sh.html#public-reverse-proxy"];
8+ filtron [label="Filtron", href="https://searx.github.io/searx/utils/filtron.sh.html"];
9+ morty [label="Morty", href="https://searx.github.io/searx/utils/morty.sh.html"];
1010 static [label="Static files", href="url to configure static files"];
11− uwsgi [label="uwsgi", href="https://asciimoo.github.io/searx/utils/searx.sh.html"]
11+ uwsgi [label="uwsgi", href="https://searx.github.io/searx/utils/searx.sh.html"]
1212 searx1 [label="Searx #1"];
1313 searx2 [label="Searx #2"];
1414 searx3 [label="Searx #3"];
docs/admin/installation-docker.rst+1−1
@@ -49,7 +49,7 @@ It's also possible to build searx from the embedded Dockerfile.
4949
5050.. code:: sh
5151
52− git clone https://github.com/asciimoo/searx.git
52+ git clone https://github.com/searx/searx.git
5353 cd searx
5454 make docker
5555
docs/admin/installation.rst+1−1
@@ -36,7 +36,7 @@ and some maintenance tasks (alternatively you can create your own fork).
3636.. code:: bash
3737
3838 $ cd ~/Downloads
39− $ git clone https://github.com/asciimoo/searx searx
39+ $ git clone https://github.com/searx/searx searx
4040 $ cd searx
4141
4242**Install** :ref:`searx service <searx.sh>`
docs/blog/lxcdev-202006.rst+1−1
@@ -81,7 +81,7 @@ fork:
8181 .. code:: sh
8282
8383 $ cd ~/Downloads
84− $ git clone https://github.com/asciimoo/searx.git
84+ $ git clone https://github.com/searx/searx.git
8585 $ cd searx
8686
8787The :ref:`lxc-searx.env` consists of several images, see ``export
docs/blog/python3.rst+1−1
@@ -54,7 +54,7 @@ If you found bugs
5454Please open an issue on `GitHub`_. Make sure that you mention your Python
5555version in your issue, so we can investigate it properly.
5656
57−.. _GitHub: https://github.com/asciimoo/searx/issues
57+.. _GitHub: https://github.com/searx/searx/issues
5858
5959Acknowledgment
6060==============
docs/build-templates/searx.rst+1−1
@@ -81,7 +81,7 @@ ${fedora_build}
8181 .. code-block:: sh
8282
8383 $ sudo -H -u ${SERVICE_USER} -i
84− (${SERVICE_USER})$ git clone "https://github.com/asciimoo/searx.git" "$SEARX_SRC"
84+ (${SERVICE_USER})$ git clone "https://github.com/searx/searx.git" "$SEARX_SRC"
8585
8686.. END clone searx
8787
docs/conf.py+4−4
@@ -35,8 +35,8 @@ jinja_contexts = {
3535extlinks = {}
3636
3737# upstream links
38−extlinks['wiki'] = ('https://github.com/asciimoo/searx/wiki/%s', ' ')
39−extlinks['pull'] = ('https://github.com/asciimoo/searx/pull/%s', 'PR ')
38+extlinks['wiki'] = ('https://github.com/searx/searx/wiki/%s', ' ')
39+extlinks['pull'] = ('https://github.com/searx/searx/pull/%s', 'PR ')
4040
4141# links to custom brand
4242extlinks['origin'] = (GIT_URL + '/blob/' + GIT_BRANCH + '/%s', 'git://')
@@ -81,7 +81,7 @@ intersphinx_mapping = {
8181 "sphinx" : ("https://www.sphinx-doc.org/en/master/", None),
8282}
8383
84−issues_github_path = "asciimoo/searx"
84+issues_github_path = "searx/searx"
8585
8686# HTML -----------------------------------------------------------------
8787
@@ -99,7 +99,7 @@ html_theme_options = {"index_sidebar_logo": True}
9999html_context = {
100100 "project_links": [
101101 ProjectLink("Source", GIT_URL),
102− ProjectLink("Wiki", "https://github.com/asciimoo/searx/wiki"),
102+ ProjectLink("Wiki", "https://github.com/searx/searx/wiki"),
103103 ProjectLink("Public instances", "https://searx.space/"),
104104 ProjectLink("Twitter", "https://twitter.com/Searx_engine"),
105105 ]
docs/dev/contribution_guide.rst+1−1
@@ -182,4 +182,4 @@ needed git add, commit and push:
182182 cd gh-pages; git checkout gh-pages >/dev/null
183183 Switched to a new branch 'gh-pages'
184184 ...
185− doc available at --> https://asciimoo.github.io/searx
185+ doc available at --> https://searx.github.io/searx
docs/dev/quickstart.rst+1−1
@@ -25,7 +25,7 @@ searx-ve virtualenv and install the required packages using ``manage.sh``.
2525.. code:: sh
2626
2727 cd ~/myprojects
28− git clone https://github.com/asciimoo/searx.git
28+ git clone https://github.com/searx/searx.git
2929 cd searx
3030 python3 -m venv searx-ve
3131 . ./searx-ve/bin/activate
searx/brand.py+3−3
@@ -1,6 +1,6 @@
1−GIT_URL = 'https://github.com/asciimoo/searx'
1+GIT_URL = 'https://github.com/searx/searx'
22GIT_BRANCH = 'master'
3−ISSUE_URL = 'https://github.com/asciimoo/searx/issues'
3+ISSUE_URL = 'https://github.com/searx/searx/issues'
44SEARX_URL = 'https://searx.me'
5−DOCS_URL = 'https://asciimoo.github.io/searx'
5+DOCS_URL = 'https://searx.github.io/searx'
66PUBLIC_INSTANCES = 'https://searx.space'
searx/engines/searx_engine.py+2−2
@@ -1,8 +1,8 @@
11"""
22 Searx (all)
33
4− @website https://github.com/asciimoo/searx
5− @provide-api yes (https://asciimoo.github.io/searx/dev/search_api.html)
4+ @website https://github.com/searx/searx
5+ @provide-api yes (https://searx.github.io/searx/dev/search_api.html)
66
77 @using-api yes
88 @results JSON
searx/settings.yml+1−1
@@ -60,7 +60,7 @@ outgoing: # communication with search engines
6060# - 1.1.1.2
6161
6262# External plugin configuration
63−# See http://asciimoo.github.io/searx/dev/plugins.html for more details
63+# See http://searx.github.io/searx/dev/plugins.html for more details
6464#
6565# plugins:
6666# - plugin1
searx/templates/__common__/about.html+3−3
@@ -10,7 +10,7 @@
1010 <p>More about searx ...</p>
1111
1212 <ul>
13− <li><a href="https://github.com/asciimoo/searx">github</a></li>
13+ <li><a href="https://github.com/searx/searx">github</a></li>
1414 <li><a href="https://twitter.com/Searx_engine">twitter</a></li>
1515 <li>IRC: #searx @ freenode (<a href="https://kiwiirc.com/client/irc.freenode.com/searx">webclient</a>)</li>
1616 <li><a href="https://www.transifex.com/projects/p/searx/">transifex</a></li>
@@ -31,7 +31,7 @@
3131 </li>
3232 <li>
3333 Searx is free software, the code is 100% open and you can help to make it
34− better. See more on <a href="https://github.com/asciimoo/searx">github</a>.
34+ better. See more on <a href="https://github.com/searx/searx">github</a>.
3535 </li>
3636 </ul>
3737
@@ -80,7 +80,7 @@
8080
8181 <p>
8282 Searx appreciates your concern regarding logs, so take the
83− code from the <a href="https://github.com/asciimoo/searx">original searx project</a> and
83+ code from the <a href="https://github.com/searx/searx">original searx project</a> and
8484 run it yourself!
8585 </p>
8686 <p>
searx/templates/courgette/github_ribbon.html+1−1
@@ -1,3 +1,3 @@
1−<a href="https://github.com/asciimoo/searx" class="github">
1+<a href="https://github.com/searx/searx" class="github">
22 <img style="position: absolute; top: 0; right: 0; border: 0;" src="{{ url_for('static', filename='img/github_ribbon.png') }}" alt="Fork me on GitHub" class="github"/>
33</a>
searx/templates/legacy/github_ribbon.html+1−1
@@ -1,3 +1,3 @@
1−<a href="https://github.com/asciimoo/searx" class="github">
1+<a href="https://github.com/searx/searx" class="github">
22 <img style="position: absolute; top: 0; right: 0; border: 0;" src="{{ url_for('static', filename='img/github_ribbon.png') }}" alt="Fork me on GitHub" class="github"/>
33</a>
utils/brand.env+3−3
@@ -1,6 +1,6 @@
1−export GIT_URL='https://github.com/asciimoo/searx'
1+export GIT_URL='https://github.com/searx/searx'
22export GIT_BRANCH='master'
3−export ISSUE_URL='https://github.com/asciimoo/searx/issues'
3+export ISSUE_URL='https://github.com/searx/searx/issues'
44export SEARX_URL='https://searx.me'
5−export DOCS_URL='https://asciimoo.github.io/searx'
5+export DOCS_URL='https://searx.github.io/searx'
66export PUBLIC_INSTANCES='https://searx.space'
utils/fabfile.py+1−1
@@ -86,7 +86,7 @@ def init():
8686 sudo('/etc/init.d/nginx restart')
8787
8888 with cd(base_dir):
89− sudo('git clone https://github.com/asciimoo/searx')
89+ sudo('git clone https://github.com/searx/searx')
9090
9191 sudo('chown -R {user}:{user} {searx_dir}'.format(user=current_user, searx_dir=searx_dir))
9292 put(StringIO(uwsgi_file), searx_dir + '/uwsgi.ini')
utils/lib.sh+1−1
@@ -1325,7 +1325,7 @@ git_clone() {
13251325 # into <path>. If repository is allready cloned, pull from <branch> and
13261326 # update working tree (if needed, the caller has to stash local changes).
13271327 #
1328− # git clone https://github.com/asciimoo/searx searx-src origin/master searxlogin
1328+ # git clone https://github.com/searx/searx searx-src origin/master searxlogin
13291329 #
13301330
13311331 local url="$1"