2 Commits

Author SHA1 Message Date
  Alexandre Flament 9740618227
Merge pull request #2226 from dalf/fix-searx-migration 3 weeks ago
  Alexandre Flament f204e4903d [fix] migration from github.com/asciimoo/searx to github.com/searx/searx : fix URLs 3 weeks ago
22 changed files with 59 additions and 59 deletions
Split View
  1. +6
    -6
      CHANGELOG.rst
  2. +2
    -2
      CONTRIBUTING.md
  3. +4
    -4
      Makefile
  4. +16
    -16
      README.rst
  5. +4
    -4
      docs/admin/arch_public.dot
  6. +1
    -1
      docs/admin/installation-docker.rst
  7. +1
    -1
      docs/admin/installation.rst
  8. +1
    -1
      docs/blog/lxcdev-202006.rst
  9. +1
    -1
      docs/blog/python3.rst
  10. +1
    -1
      docs/build-templates/searx.rst
  11. +4
    -4
      docs/conf.py
  12. +1
    -1
      docs/dev/contribution_guide.rst
  13. +1
    -1
      docs/dev/quickstart.rst
  14. +3
    -3
      searx/brand.py
  15. +2
    -2
      searx/engines/searx_engine.py
  16. +1
    -1
      searx/settings.yml
  17. +3
    -3
      searx/templates/__common__/about.html
  18. +1
    -1
      searx/templates/courgette/github_ribbon.html
  19. +1
    -1
      searx/templates/legacy/github_ribbon.html
  20. +3
    -3
      utils/brand.env
  21. +1
    -1
      utils/fabfile.py
  22. +1
    -1
      utils/lib.sh

+ 6
- 6
CHANGELOG.rst View File

@@ -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


+ 2
- 2
CONTRIBUTING.md View File

@@ -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



+ 4
- 4
Makefile View File

@@ -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


+ 16
- 16
README.rst View File

@@ -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


+ 4
- 4
docs/admin/arch_public.dot View File

@@ -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"];


+ 1
- 1
docs/admin/installation-docker.rst View File

@@ -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



+ 1
- 1
docs/admin/installation.rst View File

@@ -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 <searx.sh>`


+ 1
- 1
docs/blog/lxcdev-202006.rst View File

@@ -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


+ 1
- 1
docs/blog/python3.rst View File

@@ -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
==============


+ 1
- 1
docs/build-templates/searx.rst View File

@@ -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



+ 4
- 4
docs/conf.py View File

@@ -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"),
]


+ 1
- 1
docs/dev/contribution_guide.rst View File

@@ -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

+ 1
- 1
docs/dev/quickstart.rst View File

@@ -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


+ 3
- 3
searx/brand.py View File

@@ -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'

+ 2
- 2
searx/engines/searx_engine.py View File

@@ -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


+ 1
- 1
searx/settings.yml View File

@@ -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


+ 3
- 3
searx/templates/__common__/about.html View File

@@ -10,7 +10,7 @@
<p>More about searx...</p>

<ul>
<li><a href="https://github.com/asciimoo/searx">github</a></li>
<li><a href="https://github.com/searx/searx">github</a></li>
<li><a href="https://twitter.com/Searx_engine">twitter</a></li>
<li>IRC: #searx @ freenode (<a href="https://kiwiirc.com/client/irc.freenode.com/searx">webclient</a>)</li>
<li><a href="https://www.transifex.com/projects/p/searx/">transifex</a></li>
@@ -31,7 +31,7 @@
</li>
<li>
Searx is free software, the code is 100% open and you can help to make it
better. See more on <a href="https://github.com/asciimoo/searx">github</a>.
better. See more on <a href="https://github.com/searx/searx">github</a>.
</li>
</ul>

@@ -81,7 +81,7 @@

<p>
Searx appreciates your concern regarding logs, so take the
code from the <a href="https://github.com/asciimoo/searx">original searx project</a> and
code from the <a href="https://github.com/searx/searx">original searx project</a> and
run it yourself!
</p>
<p>


+ 1
- 1
searx/templates/courgette/github_ribbon.html View File

@@ -1,3 +1,3 @@
<a href="https://github.com/asciimoo/searx" class="github">
<a href="https://github.com/searx/searx" class="github">
<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"/>
</a>

+ 1
- 1
searx/templates/legacy/github_ribbon.html View File

@@ -1,3 +1,3 @@
<a href="https://github.com/asciimoo/searx" class="github">
<a href="https://github.com/searx/searx" class="github">
<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"/>
</a>

+ 3
- 3
utils/brand.env View File

@@ -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'

+ 1
- 1
utils/fabfile.py View File

@@ -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')


+ 1
- 1
utils/lib.sh View File

@@ -1325,7 +1325,7 @@ git_clone() {
# into <path>. If repository is allready cloned, pull from <branch> 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"


Loading…
Cancel
Save