Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ef845fb authored by Nivesh Krishna's avatar Nivesh Krishna
Browse files

Merge branch 'fix-calculator' of gitlab.e.foundation:e/infra/spot into fix-calculator

parents 955413c3 c3be36fa

searx/settings.yml

+1 −1
Original line number Original line Diff line number Diff line 
general:

general:

    debug : False # Debug mode, only for development

    debug : False # Debug mode, only for development

    instance_name : "/e/ spot" # displayed name

    instance_name : "Spot" # displayed name

    contact_url: False # mailto:contact@example.com

    contact_url: False # mailto:contact@example.com

    enable_stats: False # activate /stats page - note: it may leak usage data

    enable_stats: False # activate /stats page - note: it may leak usage data

searx/templates/__common__/about.html

+21 −37
Original line number Original line Diff line number Diff line 
<div{% if rtl %} dir="ltr"{% endif %}>

<div{% if rtl %} dir="ltr"{% endif %}>

  <h1>About <a href="{{ url_for('index') }}">searx</a></h1>

  <h1>About <a href="{{ url_for('index') }}">Spot</a></h1>





  <p>

  <p>

    Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>,

    Spot is a fork of <a href="https://github.com/searx/searx">searx</a> which is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>,

    aggregating the results of other <a href="{{ url_for('preferences') }}">search engines</a>

    aggregating the results of other <a href="{{ url_for('preferences') }}">search engines</a>

    while not storing information about its users.

    while not storing information about its users.

  </p>

  </p>





  <p>More about searx...</p>

  <p>More about Spot...</p>





  <ul>

  <ul>

    <li><a href="https://github.com/searx/searx">github</a></li>

    <li><a href="https://gitlab.e.foundation/e/infra/spot">Gitlab</a></li>

    <li><a href="https://twitter.com/Searx_engine">twitter</a></li>

    <li><a href="https://twitter.com/e_mydata">twitter</a></li>

    <li>IRC: #searx @ freenode (<a href="https://kiwiirc.com/client/irc.freenode.com/searx">webclient</a>)</li>

    <li><a href="https://mastodon.social/@e_mydata">mastodon</a></li>

    <li><a href="https://www.transifex.com/projects/p/searx/">transifex</a></li>

    <li><a href="https://t.me/mydataismydata">Telegram</a></li>

  </ul>

  </ul>





  <hr />

  <hr />





  <h2>Why use searx?</h2>

  <h2>Why use Spot?</h2>





  <ul>

  <ul>

    <li>

    <li>

      Searx may not offer you as personalised results as Google, but it doesn't

      Spot may not offer you as personalised results as Google, but it doesn't

      generate a profile about you.

      generate a profile about you.

    </li>

    </li>

    <li>

    <li>

      Searx doesn't care about what you search for, never shares anything with a

      Spot doesn't care about what you search for, never shares anything with a

      third party, and it can't be used to compromise you.

      third party, and it can't be used to compromise you.

    </li>

    </li>

    <li>

    <li>

      Searx is free software, the code is 100% open and you can help to make it

      Spot is free software, the code is 100% open and you can help to make it

      better.  See more on <a href="https://github.com/searx/searx">github</a>.

      better.  See more on <a href="https://gitlab.e.foundation/e/infra/spot">gitlab</a>.

    </li>

    </li>

  </ul>

  </ul>





  <p>

  <p>

    If you do care about privacy, want to be a conscious user, or otherwise

    If you do care about privacy, want to be a conscious user, or otherwise

    believe in digital freedom, make searx your default search engine or run it

    believe in digital freedom, make Spot your default search engine or run it

    on your own server

    on your own server

  </p>

  </p>





  <h2>Technical details - How does it work?</h2>

  <h2>Technical details - How does it work?</h2>





  <p>

  <p>

    Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>,

    Spot is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>,

    inspired by the <a href="https://beniz.github.io/seeks/">seeks project</a>.

    inspired by the <a href="https://beniz.github.io/seeks/">seeks project</a>.





    It provides basic privacy by mixing your queries with searches on other

    It provides basic privacy by mixing your queries with searches on other

    platforms without storing search data. Queries are made using a POST request

    platforms without storing search data. Queries are made using a POST request

    on every browser (except Chromium-based browsers*).  Therefore they show up 

    on every browser (except Chromium-based browsers*).  Therefore they show up 

    in neither our logs, nor your url history. In the case of Chromium-based

    in neither our logs, nor your url history. In the case of Chromium-based

    browser users there is an exception: searx uses the search bar to perform GET

    browser users there is an exception: Spot uses the search bar to perform GET

    requests.

    requests.

    

    

    Searx can be added to your browser's search bar; moreover, it can be set as

    Spot can be added to your browser's search bar; moreover, it can be set as

    the default search engine.

    the default search engine.

  </p>

  </p>





  <h2 id='add to browser'>How to set as the default search engine?</h2>

  <h2 id='add to browser'>How to set as the default search engine?</h2>





  <p>

  <p>

    Searx supports <a href="https://github.com/dewitt/opensearch/blob/master/opensearch-1-1-draft-6.md">OpenSearch</a>.

    Spot supports <a href="https://github.com/dewitt/opensearch/blob/master/opensearch-1-1-draft-6.md">OpenSearch</a>.

    For more information on changing your default search engine, see your browser's documentation:

    For more information on changing your default search engine, see your browser's documentation:

  </p>

  </p>
@@ -71,32 +71,16 @@ 
    <li>Chromium-based browsers <a href="https://www.chromium.org/tab-to-search">only add websites that the user navigates to without a path.</a>

    <li>Chromium-based browsers <a href="https://www.chromium.org/tab-to-search">only add websites that the user navigates to without a path.</a>

  </ul>

  </ul>





  <h2>Where to find anonymous usage statistics of this instance ?</h2>



  <p>

    <a href="{{ url_for('stats') }}">Stats page</a> contains some useful data about the engines used.

  </p>





  <h2>How can I make it my own?</h2>

  <h2>How can I make it my own?</h2>





  <p>

  <p>

    Searx appreciates your concern regarding logs, so take the

    Spot appreciates your concern regarding logs, so take the

    code from the <a href="https://github.com/searx/searx">original searx project</a> and

    code from the <a href="https://gitlab.e.foundation/e/infra/spot">original Spot project</a> and

    run it yourself!

    run it yourself!

  </p>

  </p>

  <p>

    Add your searx instance to this <a href="{{ brand.PUBLIC_INSTANCES }}"> list

    of public searx instances</a> to help other people reclaim their privacy and

    make the Internet freer! The more decentralized the Internet is, the more

    freedom we have!

  </p>

 

 

  <h2>Where are the docs & code of this instance?</h2>





  <p>

    See the <a href="{{ brand.DOCS_URL }}">{{ brand.DOCS_URL }}</a>

    and <a href="{{ brand.GIT_URL }}">{{ brand.GIT_URL }}</a>

  </p>

 

 

</div>

</div>

{% include "__common__/aboutextend.html" ignore missing %}
 
{% include "__common__/aboutextend.html" ignore missing %}

searx/templates/__common__/opensearch.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,7 @@ 
  <Description>a privacy-respecting, hackable metasearch engine</Description>

  <Description>a privacy-respecting, hackable metasearch engine</Description>

  <InputEncoding>UTF-8</InputEncoding>

  <InputEncoding>UTF-8</InputEncoding>

  <Image>{{ url_for('static', filename='img/favicon.png', _external=True) }}</Image>

  <Image>{{ url_for('static', filename='img/favicon.png', _external=True) }}</Image>

  <LongName>searx metasearch</LongName>

  <LongName>Spot</LongName>

  {% if opensearch_method == 'get' %}

  {% if opensearch_method == 'get' %}

    <Url rel="results" type="text/html" method="get" template="{{ url_for('search', _external=True) }}?q={searchTerms}"/>

    <Url rel="results" type="text/html" method="get" template="{{ url_for('search', _external=True) }}?q={searchTerms}"/>

  {% else %}

  {% else %}

searx/templates/__common__/opensearch_response_rss.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ 
     xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"

     xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"

     xmlns:atom="http://www.w3.org/2005/Atom">

     xmlns:atom="http://www.w3.org/2005/Atom">

  <channel>

  <channel>

    <title>Searx search: {{ q|e }}</title>

    <title>Spot search: {{ q|e }}</title>

    <link>{{ url_for('search', _external=True) }}?q={{ q|e }}</link>

    <link>{{ url_for('search', _external=True) }}?q={{ q|e }}</link>

    <description>Search results for "{{ q|e }}" - searx</description>

    <description>Search results for "{{ q|e }}" - searx</description>

    <opensearch:totalResults>{{ number_of_results }}</opensearch:totalResults>

    <opensearch:totalResults>{{ number_of_results }}</opensearch:totalResults>

searx/templates/etheme/base.html

+1 −1
Original line number Original line Diff line number Diff line
@@ -94,7 +94,7 @@ 
                {{ _('Powered by') }} <a href="{{ repo_url }}">Spot</a> {{ version[1] }}<br/>

                {{ _('Powered by') }} <a href="{{ repo_url }}">Spot</a> {{ version[1] }}<br/>

                An open-source metasearch engine forked from <a href="https://searx.github.io/searx/">Searx</a> {{ version[0] }}.

                An open-source metasearch engine forked from <a href="https://searx.github.io/searx/">Searx</a> {{ version[0] }}.

                <span class="links">

                <span class="links">

                    <a href="https://e.foundation">{{ _('About') }}</a>

                    <a href="{{url_for('about')}}">{{ _('About') }}</a>

                    <a href="https://e.foundation/legal-notice-privacy">{{ _('Privacy') }}</a>

                    <a href="https://e.foundation/legal-notice-privacy">{{ _('Privacy') }}</a>

                </span>

                </span>

            </small>

            </small>