From f204e4903da3e97629bbf37c74e1b603b2e12830 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Mon, 28 Sep 2020 16:44:14 +0200 Subject: [PATCH] [fix] migration from github.com/asciimoo/searx to github.com/searx/searx : fix URLs --- CHANGELOG.rst | 12 ++++---- CONTRIBUTING.md | 4 +-- Makefile | 8 ++--- README.rst | 32 ++++++++++---------- docs/admin/arch_public.dot | 8 ++--- docs/admin/installation-docker.rst | 2 +- docs/admin/installation.rst | 2 +- docs/blog/lxcdev-202006.rst | 2 +- docs/blog/python3.rst | 2 +- docs/build-templates/searx.rst | 2 +- docs/conf.py | 8 ++--- docs/dev/contribution_guide.rst | 2 +- docs/dev/quickstart.rst | 2 +- searx/brand.py | 6 ++-- searx/engines/searx_engine.py | 4 +-- searx/settings.yml | 2 +- searx/templates/__common__/about.html | 6 ++-- searx/templates/courgette/github_ribbon.html | 2 +- searx/templates/legacy/github_ribbon.html | 2 +- utils/brand.env | 6 ++-- utils/fabfile.py | 2 +- utils/lib.sh | 2 +- 22 files changed, 59 insertions(+), 59 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c6656026..1f78ffac 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -13,12 +13,12 @@ - Wikivoyage - Rubygems - Engine fixes (google, google images, startpage, gigablast, yacy) - - Private engines introduced - more details: https://asciimoo.github.io/searx/blog/private-engines.html - - Greatly improved documentation - check it at https://asciimoo.github.io/searx + - Private engines introduced - more details: https://searx.github.io/searx/blog/private-engines.html + - Greatly improved documentation - check it at https://searx.github.io/searx - Added autofocus to all search inputs - CSP friendly oscar theme - Added option to hide engine errors with `display_error_messages` engine option (true/false values, default is true) - - Tons of accessibility fixes - see https://github.com/asciimoo/searx/issues/350 for details + - Tons of accessibility fixes - see https://github.com/searx/searx/issues/350 for details - More flexible branding options: configurable vcs/issue tracker links - Added "disable all" & "allow all" options to preferences engine select - Autocomplete keyboard navigation fixes @@ -142,8 +142,8 @@ News - Bug fixes - - https://github.com/asciimoo/searx/issues/1088 - - https://github.com/asciimoo/searx/issues/1089 + - https://github.com/searx/searx/issues/1088 + - https://github.com/searx/searx/issues/1089 - Dependency updates @@ -312,7 +312,7 @@ News News ~~~~ -New documentation page is available: https://asciimoo.github.io/searx +New documentation page is available: https://searx.github.io/searx 0.8.0 2015.09.08 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 814ff64a..6850ab40 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,8 +2,8 @@ ## Resources in the documentation -* [Development quickstart](http://asciimoo.github.io/searx/dev/contribution_guide.html) -* [Contribution guide](http://asciimoo.github.io/searx/dev/contribution_guide.html) +* [Development quickstart](http://searx.github.io/searx/dev/contribution_guide.html) +* [Contribution guide](http://searx.github.io/searx/dev/contribution_guide.html) ## Submitting PRs diff --git a/Makefile b/Makefile index 520e05ad..a64c5ec8 100644 --- a/Makefile +++ b/Makefile @@ -2,10 +2,10 @@ .DEFAULT_GOAL=help # START Makefile setup -export GIT_URL=https://github.com/asciimoo/searx +export GIT_URL=https://github.com/searx/searx export GIT_BRANCH=master export SEARX_URL=https://searx.me -export DOCS_URL=https://asciimoo.github.io/searx +export DOCS_URL=https://searx.github.io/searx # END Makefile setup include utils/makefile.include @@ -121,14 +121,14 @@ buildenv: $(Q)echo "build searx/brand.py" $(Q)echo "GIT_URL = '$(GIT_URL)'" > searx/brand.py $(Q)echo "GIT_BRANCH = '$(GIT_BRANCH)'" >> searx/brand.py - $(Q)echo "ISSUE_URL = 'https://github.com/asciimoo/searx/issues'" >> searx/brand.py + $(Q)echo "ISSUE_URL = 'https://github.com/searx/searx/issues'" >> searx/brand.py $(Q)echo "SEARX_URL = '$(SEARX_URL)'" >> searx/brand.py $(Q)echo "DOCS_URL = '$(DOCS_URL)'" >> searx/brand.py $(Q)echo "PUBLIC_INSTANCES = 'https://searx.space'" >> searx/brand.py $(Q)echo "build utils/brand.env" $(Q)echo "export GIT_URL='$(GIT_URL)'" > utils/brand.env $(Q)echo "export GIT_BRANCH='$(GIT_BRANCH)'" >> utils/brand.env - $(Q)echo "export ISSUE_URL='https://github.com/asciimoo/searx/issues'" >> utils/brand.env + $(Q)echo "export ISSUE_URL='https://github.com/searx/searx/issues'" >> utils/brand.env $(Q)echo "export SEARX_URL='$(SEARX_URL)'" >> utils/brand.env $(Q)echo "export DOCS_URL='$(DOCS_URL)'" >> utils/brand.env $(Q)echo "export PUBLIC_INSTANCES='https://searx.space'" >> utils/brand.env diff --git a/README.rst b/README.rst index 55deb674..318def9b 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ .. SPDX-License-Identifier: AGPL-3.0-or-later -.. figure:: https://raw.githubusercontent.com/asciimoo/searx/master/searx/static/themes/oscar/img/logo_searx_a.png - :target: https://asciimoo.github.io/searx/ +.. figure:: https://raw.githubusercontent.com/searx/searx/master/searx/static/themes/oscar/img/logo_searx_a.png + :target: https://searx.github.io/searx/ :alt: searX :width: 100% :align: center @@ -22,25 +22,25 @@ Privacy-respecting, hackable `metasearch engine`_ / *pronunciation* **səːks**. .. _metasearch engine: https://en.wikipedia.org/wiki/Metasearch_engine .. |searx install| image:: https://img.shields.io/badge/-install-blue - :target: https://asciimoo.github.io/searx/admin/installation.html + :target: https://searx.github.io/searx/admin/installation.html .. |searx homepage| image:: https://img.shields.io/badge/-homepage-blue - :target: https://asciimoo.github.io/searx + :target: https://searx.github.io/searx .. |searx wiki| image:: https://img.shields.io/badge/-wiki-blue - :target: https://github.com/asciimoo/searx/wiki + :target: https://github.com/searx/searx/wiki .. |AGPL License| image:: https://img.shields.io/badge/license-AGPL-blue.svg - :target: https://github.com/asciimoo/searx/blob/master/LICENSE + :target: https://github.com/searx/searx/blob/master/LICENSE -.. |Issues| image:: https://img.shields.io/github/issues/asciimoo/searx?color=yellow&label=issues - :target: https://github.com/asciimoo/searx/issues +.. |Issues| image:: https://img.shields.io/github/issues/searx/searx?color=yellow&label=issues + :target: https://github.com/searx/searx/issues -.. |PR| image:: https://img.shields.io/github/issues-pr-raw/asciimoo/searx?color=yellow&label=PR - :target: https://github.com/asciimoo/searx/pulls +.. |PR| image:: https://img.shields.io/github/issues-pr-raw/searx/searx?color=yellow&label=PR + :target: https://github.com/searx/searx/pulls -.. |commits| image:: https://img.shields.io/github/commit-activity/y/asciimoo/searx?color=yellow&label=commits - :target: https://github.com/asciimoo/searx/commits/master +.. |commits| image:: https://img.shields.io/github/commit-activity/y/searx/searx?color=yellow&label=commits + :target: https://github.com/searx/searx/commits/master .. |OpenCollective searx backers| image:: https://opencollective.com/searx/backers/badge.svg :target: https://opencollective.com/searx#backer @@ -55,10 +55,10 @@ Otherwise jump to the user_, admin_ and developer_ handbooks you will find on our homepage_. .. _searx.space: https://searx.space -.. _user: https://asciimoo.github.io/searx/user -.. _admin: https://asciimoo.github.io/searx/admin -.. _developer: https://asciimoo.github.io/searx/dev -.. _homepage: https://asciimoo.github.io/searx +.. _user: https://searx.github.io/searx/user +.. _admin: https://searx.github.io/searx/admin +.. _developer: https://searx.github.io/searx/dev +.. _homepage: https://searx.github.io/searx contact: openhub_ // twitter_ // IRC: #searx @ freenode diff --git a/docs/admin/arch_public.dot b/docs/admin/arch_public.dot index 5018225c..0d826078 100644 --- a/docs/admin/arch_public.dot +++ b/docs/admin/arch_public.dot @@ -4,11 +4,11 @@ digraph G { edge [fontname="Sans"]; browser [label="Browser", shape=Mdiamond]; - rp [label="Reverse Proxy", href="https://asciimoo.github.io/searx/utils/filtron.sh.html#public-reverse-proxy"]; - filtron [label="Filtron", href="https://asciimoo.github.io/searx/utils/filtron.sh.html"]; - morty [label="Morty", href="https://asciimoo.github.io/searx/utils/morty.sh.html"]; + rp [label="Reverse Proxy", href="https://searx.github.io/searx/utils/filtron.sh.html#public-reverse-proxy"]; + filtron [label="Filtron", href="https://searx.github.io/searx/utils/filtron.sh.html"]; + morty [label="Morty", href="https://searx.github.io/searx/utils/morty.sh.html"]; static [label="Static files", href="url to configure static files"]; - uwsgi [label="uwsgi", href="https://asciimoo.github.io/searx/utils/searx.sh.html"] + uwsgi [label="uwsgi", href="https://searx.github.io/searx/utils/searx.sh.html"] searx1 [label="Searx #1"]; searx2 [label="Searx #2"]; searx3 [label="Searx #3"]; diff --git a/docs/admin/installation-docker.rst b/docs/admin/installation-docker.rst index b30cdcbd..c5f54b49 100644 --- a/docs/admin/installation-docker.rst +++ b/docs/admin/installation-docker.rst @@ -49,7 +49,7 @@ It's also possible to build searx from the embedded Dockerfile. .. code:: sh - git clone https://github.com/asciimoo/searx.git + git clone https://github.com/searx/searx.git cd searx make docker diff --git a/docs/admin/installation.rst b/docs/admin/installation.rst index 167c300f..2e5e4821 100644 --- a/docs/admin/installation.rst +++ b/docs/admin/installation.rst @@ -36,7 +36,7 @@ and some maintenance tasks (alternatively you can create your own fork). .. code:: bash $ cd ~/Downloads - $ git clone https://github.com/asciimoo/searx searx + $ git clone https://github.com/searx/searx searx $ cd searx **Install** :ref:`searx service ` diff --git a/docs/blog/lxcdev-202006.rst b/docs/blog/lxcdev-202006.rst index f9ca3c2c..b8d470d4 100644 --- a/docs/blog/lxcdev-202006.rst +++ b/docs/blog/lxcdev-202006.rst @@ -81,7 +81,7 @@ fork: .. code:: sh $ cd ~/Downloads - $ git clone https://github.com/asciimoo/searx.git + $ git clone https://github.com/searx/searx.git $ cd searx The :ref:`lxc-searx.env` consists of several images, see ``export diff --git a/docs/blog/python3.rst b/docs/blog/python3.rst index 5bb7f1c8..1d2cfc81 100644 --- a/docs/blog/python3.rst +++ b/docs/blog/python3.rst @@ -54,7 +54,7 @@ If you found bugs Please open an issue on `GitHub`_. Make sure that you mention your Python version in your issue, so we can investigate it properly. -.. _GitHub: https://github.com/asciimoo/searx/issues +.. _GitHub: https://github.com/searx/searx/issues Acknowledgment ============== diff --git a/docs/build-templates/searx.rst b/docs/build-templates/searx.rst index 27ebf8d0..f3004ed0 100644 --- a/docs/build-templates/searx.rst +++ b/docs/build-templates/searx.rst @@ -81,7 +81,7 @@ ${fedora_build} .. code-block:: sh $ sudo -H -u ${SERVICE_USER} -i - (${SERVICE_USER})$ git clone "https://github.com/asciimoo/searx.git" "$SEARX_SRC" + (${SERVICE_USER})$ git clone "https://github.com/searx/searx.git" "$SEARX_SRC" .. END clone searx diff --git a/docs/conf.py b/docs/conf.py index 1f79e4c1..6cbcdfa6 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -35,8 +35,8 @@ jinja_contexts = { extlinks = {} # upstream links -extlinks['wiki'] = ('https://github.com/asciimoo/searx/wiki/%s', ' ') -extlinks['pull'] = ('https://github.com/asciimoo/searx/pull/%s', 'PR ') +extlinks['wiki'] = ('https://github.com/searx/searx/wiki/%s', ' ') +extlinks['pull'] = ('https://github.com/searx/searx/pull/%s', 'PR ') # links to custom brand extlinks['origin'] = (GIT_URL + '/blob/' + GIT_BRANCH + '/%s', 'git://') @@ -81,7 +81,7 @@ intersphinx_mapping = { "sphinx" : ("https://www.sphinx-doc.org/en/master/", None), } -issues_github_path = "asciimoo/searx" +issues_github_path = "searx/searx" # HTML ----------------------------------------------------------------- @@ -99,7 +99,7 @@ html_theme_options = {"index_sidebar_logo": True} html_context = { "project_links": [ ProjectLink("Source", GIT_URL), - ProjectLink("Wiki", "https://github.com/asciimoo/searx/wiki"), + ProjectLink("Wiki", "https://github.com/searx/searx/wiki"), ProjectLink("Public instances", "https://searx.space/"), ProjectLink("Twitter", "https://twitter.com/Searx_engine"), ] diff --git a/docs/dev/contribution_guide.rst b/docs/dev/contribution_guide.rst index f9e9569f..5012dea2 100644 --- a/docs/dev/contribution_guide.rst +++ b/docs/dev/contribution_guide.rst @@ -182,4 +182,4 @@ needed git add, commit and push: cd gh-pages; git checkout gh-pages >/dev/null Switched to a new branch 'gh-pages' ... - doc available at --> https://asciimoo.github.io/searx + doc available at --> https://searx.github.io/searx diff --git a/docs/dev/quickstart.rst b/docs/dev/quickstart.rst index a4fc897c..3e1a5e34 100644 --- a/docs/dev/quickstart.rst +++ b/docs/dev/quickstart.rst @@ -25,7 +25,7 @@ searx-ve virtualenv and install the required packages using ``manage.sh``. .. code:: sh cd ~/myprojects - git clone https://github.com/asciimoo/searx.git + git clone https://github.com/searx/searx.git cd searx python3 -m venv searx-ve . ./searx-ve/bin/activate diff --git a/searx/brand.py b/searx/brand.py index 91d2ab32..d71c57db 100644 --- a/searx/brand.py +++ b/searx/brand.py @@ -1,6 +1,6 @@ -GIT_URL = 'https://github.com/asciimoo/searx' +GIT_URL = 'https://github.com/searx/searx' GIT_BRANCH = 'master' -ISSUE_URL = 'https://github.com/asciimoo/searx/issues' +ISSUE_URL = 'https://github.com/searx/searx/issues' SEARX_URL = 'https://searx.me' -DOCS_URL = 'https://asciimoo.github.io/searx' +DOCS_URL = 'https://searx.github.io/searx' PUBLIC_INSTANCES = 'https://searx.space' diff --git a/searx/engines/searx_engine.py b/searx/engines/searx_engine.py index d4c85bdc..87e5e05c 100644 --- a/searx/engines/searx_engine.py +++ b/searx/engines/searx_engine.py @@ -1,8 +1,8 @@ """ Searx (all) - @website https://github.com/asciimoo/searx - @provide-api yes (https://asciimoo.github.io/searx/dev/search_api.html) + @website https://github.com/searx/searx + @provide-api yes (https://searx.github.io/searx/dev/search_api.html) @using-api yes @results JSON diff --git a/searx/settings.yml b/searx/settings.yml index 9140522c..492d4058 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -60,7 +60,7 @@ outgoing: # communication with search engines # - 1.1.1.2 # External plugin configuration -# See http://asciimoo.github.io/searx/dev/plugins.html for more details +# See http://searx.github.io/searx/dev/plugins.html for more details # # plugins: # - plugin1 diff --git a/searx/templates/__common__/about.html b/searx/templates/__common__/about.html index 9b34251a..e1a545c3 100644 --- a/searx/templates/__common__/about.html +++ b/searx/templates/__common__/about.html @@ -10,7 +10,7 @@

More about searx ...

@@ -80,7 +80,7 @@

Searx appreciates your concern regarding logs, so take the - code from the original searx project and + code from the original searx project and run it yourself!

diff --git a/searx/templates/courgette/github_ribbon.html b/searx/templates/courgette/github_ribbon.html index bdd9cf18..fb38a205 100644 --- a/searx/templates/courgette/github_ribbon.html +++ b/searx/templates/courgette/github_ribbon.html @@ -1,3 +1,3 @@ - + Fork me on GitHub diff --git a/searx/templates/legacy/github_ribbon.html b/searx/templates/legacy/github_ribbon.html index bdd9cf18..fb38a205 100644 --- a/searx/templates/legacy/github_ribbon.html +++ b/searx/templates/legacy/github_ribbon.html @@ -1,3 +1,3 @@ - + Fork me on GitHub diff --git a/utils/brand.env b/utils/brand.env index 5d5b3951..55244bd7 100644 --- a/utils/brand.env +++ b/utils/brand.env @@ -1,6 +1,6 @@ -export GIT_URL='https://github.com/asciimoo/searx' +export GIT_URL='https://github.com/searx/searx' export GIT_BRANCH='master' -export ISSUE_URL='https://github.com/asciimoo/searx/issues' +export ISSUE_URL='https://github.com/searx/searx/issues' export SEARX_URL='https://searx.me' -export DOCS_URL='https://asciimoo.github.io/searx' +export DOCS_URL='https://searx.github.io/searx' export PUBLIC_INSTANCES='https://searx.space' diff --git a/utils/fabfile.py b/utils/fabfile.py index 93f7fc53..136ef629 100644 --- a/utils/fabfile.py +++ b/utils/fabfile.py @@ -86,7 +86,7 @@ def init(): sudo('/etc/init.d/nginx restart') with cd(base_dir): - sudo('git clone https://github.com/asciimoo/searx') + sudo('git clone https://github.com/searx/searx') sudo('chown -R {user}:{user} {searx_dir}'.format(user=current_user, searx_dir=searx_dir)) put(StringIO(uwsgi_file), searx_dir + '/uwsgi.ini') diff --git a/utils/lib.sh b/utils/lib.sh index 800bbf01..aa49da5b 100755 --- a/utils/lib.sh +++ b/utils/lib.sh @@ -1325,7 +1325,7 @@ git_clone() { # into . If repository is allready cloned, pull from and # update working tree (if needed, the caller has to stash local changes). # - # git clone https://github.com/asciimoo/searx searx-src origin/master searxlogin + # git clone https://github.com/searx/searx searx-src origin/master searxlogin # local url="$1"