git.iko.soy/searx
on master help sign in
[fix] buildprocess of docs in LXC (containers)
bfef2c3Markus Heiser
docs/admin/buildhosts.rst+2−2
compare with master
unifiedsplit
@@ -21,13 +21,13 @@ on build hosts (see :ref:`searx.sh`).::
21
21
22This will install packages needed by searx:
22This will install packages needed by searx:
23
23
24−.. include:: ../../build/docs/includes/searx.rst
24+.. kernel-include:: $DOCS_BUILD/includes/searx.rst
25 :start-after: START distro-packages
25 :start-after: START distro-packages
26 :end-before: END distro-packages
26 :end-before: END distro-packages
27
27
28and packages needed to build docuemtation and run tests:
28and packages needed to build docuemtation and run tests:
29
29
30−.. include:: ../../build/docs/includes/searx.rst
30+.. kernel-include:: $DOCS_BUILD/includes/searx.rst
31 :start-after: START build-packages
31 :start-after: START build-packages
32 :end-before: END build-packages
32 :end-before: END build-packages
33
33
docs/admin/installation-searx.rst+7−7
@@ -17,7 +17,7 @@ universe repository.
17Install packages
17Install packages
18================
18================
19
19
20−.. include:: ../../build/docs/includes/searx.rst
20+.. kernel-include:: $DOCS_BUILD/includes/searx.rst
21 :start-after: START distro-packages
21 :start-after: START distro-packages
22 :end-before: END distro-packages
22 :end-before: END distro-packages
23
23
@@ -30,7 +30,7 @@ Install packages
30Create user
30Create user
31===========
31===========
32
32
33−.. include:: ../../build/docs/includes/searx.rst
33+.. kernel-include:: $DOCS_BUILD/includes/searx.rst
34 :start-after: START create user
34 :start-after: START create user
35 :end-before: END create user
35 :end-before: END create user
36
36
@@ -41,13 +41,13 @@ install searx & dependencies
41
41
42Start a interactive shell from new created user and clone searx:
42Start a interactive shell from new created user and clone searx:
43
43
44−.. include:: ../../build/docs/includes/searx.rst
44+.. kernel-include:: $DOCS_BUILD/includes/searx.rst
45 :start-after: START clone searx
45 :start-after: START clone searx
46 :end-before: END clone searx
46 :end-before: END clone searx
47
47
48In the same shell create *virtualenv*:
48In the same shell create *virtualenv*:
49
49
50−.. include:: ../../build/docs/includes/searx.rst
50+.. kernel-include:: $DOCS_BUILD/includes/searx.rst
51 :start-after: START create virtualenv
51 :start-after: START create virtualenv
52 :end-before: END create virtualenv
52 :end-before: END create virtualenv
53
53
@@ -55,7 +55,7 @@ To install searx's dependencies, exit the searx *bash* session you opened above
55and restart a new. Before install, first check if your *virualenv* was sourced
55and restart a new. Before install, first check if your *virualenv* was sourced
56from the login (*~/.profile*):
56from the login (*~/.profile*):
57
57
58−.. include:: ../../build/docs/includes/searx.rst
58+.. kernel-include:: $DOCS_BUILD/includes/searx.rst
59 :start-after: START manage.sh update_packages
59 :start-after: START manage.sh update_packages
60 :end-before: END manage.sh update_packages
60 :end-before: END manage.sh update_packages
61
61
@@ -71,7 +71,7 @@ Create a copy of the :origin:`searx/settings.yml` configuration file in system's
71*/etc* folder. Configure like shown below -- replace ``searx@\$(uname -n)`` with
71*/etc* folder. Configure like shown below -- replace ``searx@\$(uname -n)`` with
72a name of your choice -- *and/or* edit ``/etc/searx/settings.yml`` if necessary.
72a name of your choice -- *and/or* edit ``/etc/searx/settings.yml`` if necessary.
73
73
74−.. include:: ../../build/docs/includes/searx.rst
74+.. kernel-include:: $DOCS_BUILD/includes/searx.rst
75 :start-after: START searx config
75 :start-after: START searx config
76 :end-before: END searx config
76 :end-before: END searx config
77
77
@@ -82,7 +82,7 @@ To check your searx setup, optional enable debugging and start the *webapp*.
82Searx looks at the exported environment ``$SEARX_SETTINGS_PATH`` for a
82Searx looks at the exported environment ``$SEARX_SETTINGS_PATH`` for a
83configuration file.
83configuration file.
84
84
85−.. include:: ../../build/docs/includes/searx.rst
85+.. kernel-include:: $DOCS_BUILD/includes/searx.rst
86 :start-after: START check searx installation
86 :start-after: START check searx installation
87 :end-before: END check searx installation
87 :end-before: END check searx installation
88
88
docs/admin/installation-uwsgi.rst+9−9
@@ -104,21 +104,21 @@ restart the uwsgi application.
104
104
105 .. group-tab:: Ubuntu / debian
105 .. group-tab:: Ubuntu / debian
106
106
107− .. literalinclude:: ../../build/docs/includes/searx.rst
107+ .. kernel-include:: $DOCS_BUILD/includes/searx.rst
108 :start-after: START searx uwsgi-description ubuntu-20.04
108 :start-after: START searx uwsgi-description ubuntu-20.04
109 :end-before: END searx uwsgi-description ubuntu-20.04
109 :end-before: END searx uwsgi-description ubuntu-20.04
110
110
111
111
112 .. group-tab:: Arch Linux
112 .. group-tab:: Arch Linux
113
113
114− .. literalinclude:: ../../build/docs/includes/searx.rst
114+ .. kernel-include:: $DOCS_BUILD/includes/searx.rst
115 :start-after: START searx uwsgi-description arch
115 :start-after: START searx uwsgi-description arch
116 :end-before: END searx uwsgi-description arch
116 :end-before: END searx uwsgi-description arch
117
117
118
118
119 .. group-tab:: Fedora / RHEL
119 .. group-tab:: Fedora / RHEL
120
120
121− .. literalinclude:: ../../build/docs/includes/searx.rst
121+ .. kernel-include:: $DOCS_BUILD/includes/searx.rst
122 :start-after: START searx uwsgi-description fedora
122 :start-after: START searx uwsgi-description fedora
123 :end-before: END searx uwsgi-description fedora
123 :end-before: END searx uwsgi-description fedora
124
124
@@ -127,22 +127,22 @@ restart the uwsgi application.
127
127
128 .. group-tab:: Ubuntu / debian
128 .. group-tab:: Ubuntu / debian
129
129
130− .. literalinclude:: ../../build/docs/includes/searx.rst
130+ .. kernel-include:: $DOCS_BUILD/includes/searx.rst
131− :language: ini
131+ :code: ini
132 :start-after: START searx uwsgi-appini ubuntu-20.04
132 :start-after: START searx uwsgi-appini ubuntu-20.04
133 :end-before: END searx uwsgi-appini ubuntu-20.04
133 :end-before: END searx uwsgi-appini ubuntu-20.04
134
134
135 .. group-tab:: Arch Linux
135 .. group-tab:: Arch Linux
136
136
137− .. literalinclude:: ../../build/docs/includes/searx.rst
137+ .. kernel-include:: $DOCS_BUILD/includes/searx.rst
138− :language: ini
138+ :code: ini
139 :start-after: START searx uwsgi-appini arch
139 :start-after: START searx uwsgi-appini arch
140 :end-before: END searx uwsgi-appini arch
140 :end-before: END searx uwsgi-appini arch
141
141
142 .. group-tab:: Fedora / RHEL
142 .. group-tab:: Fedora / RHEL
143
143
144− .. literalinclude:: ../../build/docs/includes/searx.rst
144+ .. kernel-include:: $DOCS_BUILD/includes/searx.rst
145− :language: ini
145+ :code: ini
146 :start-after: START searx uwsgi-appini fedora
146 :start-after: START searx uwsgi-appini fedora
147 :end-before: END searx uwsgi-appini fedora
147 :end-before: END searx uwsgi-appini fedora
148
148
docs/utils/filtron.sh.rst+4−4
@@ -41,7 +41,7 @@ into this user account:
41Create user
41Create user
42===========
42===========
43
43
44−.. include:: ../../build/docs/includes/filtron.rst
44+.. kernel-include:: $DOCS_BUILD/includes/filtron.rst
45 :start-after: START create user
45 :start-after: START create user
46 :end-before: END create user
46 :end-before: END create user
47
47
@@ -49,7 +49,7 @@ Create user
49Install go
49Install go
50==========
50==========
51
51
52−.. include:: ../../build/docs/includes/filtron.rst
52+.. kernel-include:: $DOCS_BUILD/includes/filtron.rst
53 :start-after: START install go
53 :start-after: START install go
54 :end-before: END install go
54 :end-before: END install go
55
55
@@ -61,11 +61,11 @@ Install :origin:`rules.json <utils/templates/etc/filtron/rules.json>` at
61``/etc/filtron/rules.json`` (see :ref:`Sample configuration of filtron`) and
61``/etc/filtron/rules.json`` (see :ref:`Sample configuration of filtron`) and
62install filtron software and systemd unit:
62install filtron software and systemd unit:
63
63
64−.. include:: ../../build/docs/includes/filtron.rst
64+.. kernel-include:: $DOCS_BUILD/includes/filtron.rst
65 :start-after: START install filtron
65 :start-after: START install filtron
66 :end-before: END install filtron
66 :end-before: END install filtron
67
67
68−.. include:: ../../build/docs/includes/filtron.rst
68+.. kernel-include:: $DOCS_BUILD/includes/filtron.rst
69 :start-after: START install systemd unit
69 :start-after: START install systemd unit
70 :end-before: END install systemd unit
70 :end-before: END install systemd unit
71
71
docs/utils/morty.sh.rst+4−4
@@ -42,7 +42,7 @@ into this user account:
42Create user
42Create user
43===========
43===========
44
44
45−.. include:: ../../build/docs/includes/morty.rst
45+.. kernel-include:: $DOCS_BUILD/includes/morty.rst
46 :start-after: START create user
46 :start-after: START create user
47 :end-before: END create user
47 :end-before: END create user
48
48
@@ -50,7 +50,7 @@ Create user
50Install go
50Install go
51==========
51==========
52
52
53−.. include:: ../../build/docs/includes/morty.rst
53+.. kernel-include:: $DOCS_BUILD/includes/morty.rst
54 :start-after: START install go
54 :start-after: START install go
55 :end-before: END install go
55 :end-before: END install go
56
56
@@ -60,11 +60,11 @@ Install morty
60
60
61Install morty software and systemd unit:
61Install morty software and systemd unit:
62
62
63−.. include:: ../../build/docs/includes/morty.rst
63+.. kernel-include:: $DOCS_BUILD/includes/morty.rst
64 :start-after: START install morty
64 :start-after: START install morty
65 :end-before: END install morty
65 :end-before: END install morty
66
66
67−.. include:: ../../build/docs/includes/morty.rst
67+.. kernel-include:: $DOCS_BUILD/includes/morty.rst
68 :start-after: START install systemd unit
68 :start-after: START install systemd unit
69 :end-before: END install systemd unit
69 :end-before: END install systemd unit
70
70