Browse Source

Merge pull request #769 from kvch/gh-pages

fix nginx section of installation page
Adam Tauber 8 years ago
parent
commit
f4b418175c

+ 10
- 9
_sources/dev/install/installation.txt View File

3
 Installation
3
 Installation
4
 ============
4
 ============
5
 
5
 
6
-Step by step installation for Debian/Ubuntu with virtualenv.
7
-
8
-Source: https://about.okhin.fr/posts/Searx/ with some additions
9
-
10
-How to: `Setup searx in a couple of hours with a free SSL
11
-certificate <https://www.reddit.com/r/privacytoolsIO/comments/366kvn/how_to_setup_your_own_privacy_respecting_search/>`__
12
-
13
 .. contents::
6
 .. contents::
14
    :depth: 3
7
    :depth: 3
15
 
8
 
16
 Basic installation
9
 Basic installation
17
 ------------------
10
 ------------------
18
 
11
 
19
-For Ubuntu, be sure to have enable universe repository.
12
+Step by step installation for Debian/Ubuntu with virtualenv. For Ubuntu, be sure to have enable universe repository.
20
 
13
 
21
 Install packages:
14
 Install packages:
22
 
15
 
166
 """"""""""""""""""""""""""""""
159
 """"""""""""""""""""""""""""""
167
 
160
 
168
 Add this configuration in the server config file
161
 Add this configuration in the server config file
169
-/etc/nginx/sites-available/default:
162
+/etc/nginx/sites-enabled/default:
170
 
163
 
171
 .. code:: nginx
164
 .. code:: nginx
172
 
165
 
318
     git clone https://github.com/asciimoo/searx.git
311
     git clone https://github.com/asciimoo/searx.git
319
     cd searx
312
     cd searx
320
     docker build -t whatever/searx .
313
     docker build -t whatever/searx .
314
+
315
+References
316
+==========
317
+
318
+    * https://about.okhin.fr/posts/Searx/ with some additions
319
+
320
+    * How to: `Setup searx in a couple of hours with a free SSL certificate <https://www.reddit.com/r/privacytoolsIO/comments/366kvn/how_to_setup_your_own_privacy_respecting_search/>`__
321
+

+ 13
- 7
dev/install/installation.html View File

27
     <link rel="search" title="Search" href="../../search.html" />
27
     <link rel="search" title="Search" href="../../search.html" />
28
     <link rel="top" title="searx 0.10.0 documentation" href="../../index.html" />
28
     <link rel="top" title="searx 0.10.0 documentation" href="../../index.html" />
29
     <link rel="next" title="Administration API" href="../../admin/api.html" />
29
     <link rel="next" title="Administration API" href="../../admin/api.html" />
30
-    <link rel="prev" title="Search syntax" href="../../user/search_syntax.html" />
30
+    <link rel="prev" title="Why use a private instance?" href="../../user/own-instance.html" />
31
    
31
    
32
   
32
   
33
   <link media="only screen and (max-device-width: 480px)" href="../../_static/small_flask.css" type= "text/css" rel="stylesheet" />
33
   <link media="only screen and (max-device-width: 480px)" href="../../_static/small_flask.css" type= "text/css" rel="stylesheet" />
43
             
43
             
44
   <div class="section" id="installation">
44
   <div class="section" id="installation">
45
 <span id="id1"></span><h1><a class="toc-backref" href="#id3">Installation</a><a class="headerlink" href="#installation" title="Permalink to this headline">¶</a></h1>
45
 <span id="id1"></span><h1><a class="toc-backref" href="#id3">Installation</a><a class="headerlink" href="#installation" title="Permalink to this headline">¶</a></h1>
46
-<p>Step by step installation for Debian/Ubuntu with virtualenv.</p>
47
-<p>Source: <a class="reference external" href="https://about.okhin.fr/posts/Searx/">https://about.okhin.fr/posts/Searx/</a> with some additions</p>
48
-<p>How to: <a class="reference external" href="https://www.reddit.com/r/privacytoolsIO/comments/366kvn/how_to_setup_your_own_privacy_respecting_search/">Setup searx in a couple of hours with a free SSL
49
-certificate</a></p>
50
 <div class="contents topic" id="contents">
46
 <div class="contents topic" id="contents">
51
 <p class="topic-title first">Contents</p>
47
 <p class="topic-title first">Contents</p>
52
 <ul class="simple">
48
 <ul class="simple">
64
 <li><a class="reference internal" href="#docker" id="id12">Docker</a></li>
60
 <li><a class="reference internal" href="#docker" id="id12">Docker</a></li>
65
 </ul>
61
 </ul>
66
 </li>
62
 </li>
63
+<li><a class="reference internal" href="#references" id="id13">References</a></li>
67
 </ul>
64
 </ul>
68
 </div>
65
 </div>
69
 <div class="section" id="basic-installation">
66
 <div class="section" id="basic-installation">
70
 <h2><a class="toc-backref" href="#id4">Basic installation</a><a class="headerlink" href="#basic-installation" title="Permalink to this headline">¶</a></h2>
67
 <h2><a class="toc-backref" href="#id4">Basic installation</a><a class="headerlink" href="#basic-installation" title="Permalink to this headline">¶</a></h2>
71
-<p>For Ubuntu, be sure to have enable universe repository.</p>
68
+<p>Step by step installation for Debian/Ubuntu with virtualenv. For Ubuntu, be sure to have enable universe repository.</p>
72
 <p>Install packages:</p>
69
 <p>Install packages:</p>
73
 <div class="code sh highlight-default"><div class="highlight"><pre><span></span><span class="n">sudo</span> <span class="n">apt</span><span class="o">-</span><span class="n">get</span> <span class="n">install</span> <span class="n">git</span> <span class="n">build</span><span class="o">-</span><span class="n">essential</span> <span class="n">libxslt</span><span class="o">-</span><span class="n">dev</span> <span class="n">python</span><span class="o">-</span><span class="n">dev</span> <span class="n">python</span><span class="o">-</span><span class="n">virtualenv</span> <span class="n">python</span><span class="o">-</span><span class="n">pybabel</span> <span class="n">zlib1g</span><span class="o">-</span><span class="n">dev</span> <span class="n">libffi</span><span class="o">-</span><span class="n">dev</span> <span class="n">libssl</span><span class="o">-</span><span class="n">dev</span>
70
 <div class="code sh highlight-default"><div class="highlight"><pre><span></span><span class="n">sudo</span> <span class="n">apt</span><span class="o">-</span><span class="n">get</span> <span class="n">install</span> <span class="n">git</span> <span class="n">build</span><span class="o">-</span><span class="n">essential</span> <span class="n">libxslt</span><span class="o">-</span><span class="n">dev</span> <span class="n">python</span><span class="o">-</span><span class="n">dev</span> <span class="n">python</span><span class="o">-</span><span class="n">virtualenv</span> <span class="n">python</span><span class="o">-</span><span class="n">pybabel</span> <span class="n">zlib1g</span><span class="o">-</span><span class="n">dev</span> <span class="n">libffi</span><span class="o">-</span><span class="n">dev</span> <span class="n">libssl</span><span class="o">-</span><span class="n">dev</span>
74
 </pre></div>
71
 </pre></div>
188
 <div class="section" id="from-subdirectory-url-searx">
185
 <div class="section" id="from-subdirectory-url-searx">
189
 <h4>from subdirectory URL (/searx)<a class="headerlink" href="#from-subdirectory-url-searx" title="Permalink to this headline">¶</a></h4>
186
 <h4>from subdirectory URL (/searx)<a class="headerlink" href="#from-subdirectory-url-searx" title="Permalink to this headline">¶</a></h4>
190
 <p>Add this configuration in the server config file
187
 <p>Add this configuration in the server config file
191
-/etc/nginx/sites-available/default:</p>
188
+/etc/nginx/sites-enabled/default:</p>
192
 <div class="code nginx highlight-default"><div class="highlight"><pre><span></span>location = /searx { rewrite ^ /searx/; }
189
 <div class="code nginx highlight-default"><div class="highlight"><pre><span></span>location = /searx { rewrite ^ /searx/; }
193
 location /searx {
190
 location /searx {
194
         try_files $uri @searx;
191
         try_files $uri @searx;
308
 </div>
305
 </div>
309
 </div>
306
 </div>
310
 </div>
307
 </div>
308
+<div class="section" id="references">
309
+<h1><a class="toc-backref" href="#id13">References</a><a class="headerlink" href="#references" title="Permalink to this headline">¶</a></h1>
310
+<blockquote>
311
+<div><ul class="simple">
312
+<li><a class="reference external" href="https://about.okhin.fr/posts/Searx/">https://about.okhin.fr/posts/Searx/</a> with some additions</li>
313
+<li>How to: <a class="reference external" href="https://www.reddit.com/r/privacytoolsIO/comments/366kvn/how_to_setup_your_own_privacy_respecting_search/">Setup searx in a couple of hours with a free SSL certificate</a></li>
314
+</ul>
315
+</div></blockquote>
316
+</div>
311
 
317
 
312
 
318
 
313
           </div>
319
           </div>

+ 10
- 9
docs/dev/install/installation.rst View File

3
 Installation
3
 Installation
4
 ============
4
 ============
5
 
5
 
6
-Step by step installation for Debian/Ubuntu with virtualenv.
7
-
8
-Source: https://about.okhin.fr/posts/Searx/ with some additions
9
-
10
-How to: `Setup searx in a couple of hours with a free SSL
11
-certificate <https://www.reddit.com/r/privacytoolsIO/comments/366kvn/how_to_setup_your_own_privacy_respecting_search/>`__
12
-
13
 .. contents::
6
 .. contents::
14
    :depth: 3
7
    :depth: 3
15
 
8
 
16
 Basic installation
9
 Basic installation
17
 ------------------
10
 ------------------
18
 
11
 
19
-For Ubuntu, be sure to have enable universe repository.
12
+Step by step installation for Debian/Ubuntu with virtualenv. For Ubuntu, be sure to have enable universe repository.
20
 
13
 
21
 Install packages:
14
 Install packages:
22
 
15
 
166
 """"""""""""""""""""""""""""""
159
 """"""""""""""""""""""""""""""
167
 
160
 
168
 Add this configuration in the server config file
161
 Add this configuration in the server config file
169
-/etc/nginx/sites-available/default:
162
+/etc/nginx/sites-enabled/default:
170
 
163
 
171
 .. code:: nginx
164
 .. code:: nginx
172
 
165
 
318
     git clone https://github.com/asciimoo/searx.git
311
     git clone https://github.com/asciimoo/searx.git
319
     cd searx
312
     cd searx
320
     docker build -t whatever/searx .
313
     docker build -t whatever/searx .
314
+
315
+References
316
+==========
317
+
318
+    * https://about.okhin.fr/posts/Searx/ with some additions
319
+
320
+    * How to: `Setup searx in a couple of hours with a free SSL certificate <https://www.reddit.com/r/privacytoolsIO/comments/366kvn/how_to_setup_your_own_privacy_respecting_search/>`__
321
+

+ 1
- 0
index.html View File

74
 <div class="toctree-wrapper compound">
74
 <div class="toctree-wrapper compound">
75
 <ul>
75
 <ul>
76
 <li class="toctree-l1"><a class="reference internal" href="dev/install/installation.html">Installation</a></li>
76
 <li class="toctree-l1"><a class="reference internal" href="dev/install/installation.html">Installation</a></li>
77
+<li class="toctree-l1"><a class="reference internal" href="dev/install/installation.html#references">References</a></li>
77
 <li class="toctree-l1"><a class="reference internal" href="admin/api.html">Administration API</a></li>
78
 <li class="toctree-l1"><a class="reference internal" href="admin/api.html">Administration API</a></li>
78
 <li class="toctree-l1"><a class="reference internal" href="admin/api.html#embed-search-bar">Embed search bar</a></li>
79
 <li class="toctree-l1"><a class="reference internal" href="admin/api.html#embed-search-bar">Embed search bar</a></li>
79
 <li class="toctree-l1"><a class="reference internal" href="admin/filtron.html">How to protect an instance</a></li>
80
 <li class="toctree-l1"><a class="reference internal" href="admin/filtron.html">How to protect an instance</a></li>

+ 1
- 1
searchindex.js
File diff suppressed because it is too large
View File