summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Heiser <markus.heiser@darmarit.de>2020-06-24 15:15:15 +0200
committerMarkus Heiser <markus.heiser@darmarit.de>2020-06-24 15:15:15 +0200
commit18805ee35296e6e34be59f37083190990f4afcbb (patch)
tree5c260a27c7d300d84efd8f00c8dafc522857fb28
parenta984afd6a32ec3bd5011659362afaf81a4bc787e (diff)
[fix] markup of auto generated installation instruction (uWSGI part)
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
-rw-r--r--docs/admin/installation-uwsgi.rst11
-rwxr-xr-xutils/searx.sh70
2 files changed, 48 insertions, 33 deletions
diff --git a/docs/admin/installation-uwsgi.rst b/docs/admin/installation-uwsgi.rst
index ac4c463b9..7b482975d 100644
--- a/docs/admin/installation-uwsgi.rst
+++ b/docs/admin/installation-uwsgi.rst
@@ -108,6 +108,7 @@ restart the uwsgi application.
:start-after: START searx uwsgi-description ubuntu-20.04
:end-before: END searx uwsgi-description ubuntu-20.04
+ .. hotfix: a bug group-tab need this comment
.. group-tab:: Arch Linux
@@ -115,6 +116,7 @@ restart the uwsgi application.
:start-after: START searx uwsgi-description arch
:end-before: END searx uwsgi-description arch
+ .. hotfix: a bug group-tab need this comment
.. group-tab:: Fedora / RHEL
@@ -128,22 +130,21 @@ restart the uwsgi application.
.. group-tab:: Ubuntu / debian
.. kernel-include:: $DOCS_BUILD/includes/searx.rst
- :code: ini
:start-after: START searx uwsgi-appini ubuntu-20.04
:end-before: END searx uwsgi-appini ubuntu-20.04
+ .. hotfix: a bug group-tab need this comment
+
.. group-tab:: Arch Linux
.. kernel-include:: $DOCS_BUILD/includes/searx.rst
- :code: ini
:start-after: START searx uwsgi-appini arch
:end-before: END searx uwsgi-appini arch
+ .. hotfix: a bug group-tab need this comment
+
.. group-tab:: Fedora / RHEL
.. kernel-include:: $DOCS_BUILD/includes/searx.rst
- :code: ini
:start-after: START searx uwsgi-appini fedora
:end-before: END searx uwsgi-appini fedora
-
-
diff --git a/utils/searx.sh b/utils/searx.sh
index 4009fddb0..886b38f8c 100755
--- a/utils/searx.sh
+++ b/utils/searx.sh
@@ -816,47 +816,61 @@ rst-doc() {
case $DIST_ID-$DIST_VERS in
ubuntu-*|debian-*) cat <<EOF
-# init.d --> /usr/share/doc/uwsgi/README.Debian.gz
-# For uWSGI debian uses the LSB init process, this might be changed
-# one day, see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=833067
-
-create ${uWSGI_APPS_AVAILABLE}/${SEARX_UWSGI_APP}
-enable: sudo -H ln -s ${uWSGI_APPS_AVAILABLE}/${SEARX_UWSGI_APP} ${uWSGI_APPS_ENABLED}/
-start: sudo -H service uwsgi start ${SEARX_UWSGI_APP%.*}
-restart: sudo -H service uwsgi restart ${SEARX_UWSGI_APP%.*}
-stop: sudo -H service uwsgi stop ${SEARX_UWSGI_APP%.*}
-disable: sudo -H rm ${uWSGI_APPS_ENABLED}/${SEARX_UWSGI_APP}
+
+.. code:: bash
+
+ # init.d --> /usr/share/doc/uwsgi/README.Debian.gz
+ # For uWSGI debian uses the LSB init process, this might be changed
+ # one day, see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=833067
+
+ create ${uWSGI_APPS_AVAILABLE}/${SEARX_UWSGI_APP}
+ enable: sudo -H ln -s ${uWSGI_APPS_AVAILABLE}/${SEARX_UWSGI_APP} ${uWSGI_APPS_ENABLED}/
+ start: sudo -H service uwsgi start ${SEARX_UWSGI_APP%.*}
+ restart: sudo -H service uwsgi restart ${SEARX_UWSGI_APP%.*}
+ stop: sudo -H service uwsgi stop ${SEARX_UWSGI_APP%.*}
+ disable: sudo -H rm ${uWSGI_APPS_ENABLED}/${SEARX_UWSGI_APP}
+
EOF
;;
arch-*) cat <<EOF
-# systemd --> /usr/lib/systemd/system/uwsgi@.service
-# For uWSGI archlinux uses systemd template units, see
-# - http://0pointer.de/blog/projects/instances.html
-# - https://uwsgi-docs.readthedocs.io/en/latest/Systemd.html#one-service-per-app-in-systemd
-
-create: ${uWSGI_APPS_ENABLED}/${SEARX_UWSGI_APP}
-enable: sudo -H systemctl enable uwsgi@${SEARX_UWSGI_APP%.*}
-start: sudo -H systemctl start uwsgi@${SEARX_UWSGI_APP%.*}
-restart: sudo -H systemctl restart uwsgi@${SEARX_UWSGI_APP%.*}
-stop: sudo -H systemctl stop uwsgi@${SEARX_UWSGI_APP%.*}
-disable: sudo -H systemctl disable uwsgi@${SEARX_UWSGI_APP%.*}
+
+.. code:: bash
+
+ # systemd --> /usr/lib/systemd/system/uwsgi@.service
+ # For uWSGI archlinux uses systemd template units, see
+ # - http://0pointer.de/blog/projects/instances.html
+ # - https://uwsgi-docs.readthedocs.io/en/latest/Systemd.html#one-service-per-app-in-systemd
+
+ create: ${uWSGI_APPS_ENABLED}/${SEARX_UWSGI_APP}
+ enable: sudo -H systemctl enable uwsgi@${SEARX_UWSGI_APP%.*}
+ start: sudo -H systemctl start uwsgi@${SEARX_UWSGI_APP%.*}
+ restart: sudo -H systemctl restart uwsgi@${SEARX_UWSGI_APP%.*}
+ stop: sudo -H systemctl stop uwsgi@${SEARX_UWSGI_APP%.*}
+ disable: sudo -H systemctl disable uwsgi@${SEARX_UWSGI_APP%.*}
+
EOF
;;
fedora-*) cat <<EOF
-# systemd --> /usr/lib/systemd/system/uwsgi.service
-# The unit file starts uWSGI in emperor mode (/etc/uwsgi.ini), see
-# - https://uwsgi-docs.readthedocs.io/en/latest/Emperor.html
-create: ${uWSGI_APPS_ENABLED}/${SEARX_UWSGI_APP}
-restart: sudo -H touch ${uWSGI_APPS_ENABLED}/${SEARX_UWSGI_APP}
-disable: sudo -H rm ${uWSGI_APPS_ENABLED}/${SEARX_UWSGI_APP}
+.. code:: bash
+
+ # systemd --> /usr/lib/systemd/system/uwsgi.service
+ # The unit file starts uWSGI in emperor mode (/etc/uwsgi.ini), see
+ # - https://uwsgi-docs.readthedocs.io/en/latest/Emperor.html
+
+ create: ${uWSGI_APPS_ENABLED}/${SEARX_UWSGI_APP}
+ restart: sudo -H touch ${uWSGI_APPS_ENABLED}/${SEARX_UWSGI_APP}
+ disable: sudo -H rm ${uWSGI_APPS_ENABLED}/${SEARX_UWSGI_APP}
+
EOF
;;
esac
echo -e ".. END searx uwsgi-description $DIST_NAME"
echo -e "\n.. START searx uwsgi-appini $DIST_NAME"
- eval "echo \"$(< "${TEMPLATES}/${uWSGI_APPS_AVAILABLE}/${SEARX_UWSGI_APP}")\""
+ echo ".. code:: bash"
+ echo
+ eval "echo \"$(< "${TEMPLATES}/${uWSGI_APPS_AVAILABLE}/${SEARX_UWSGI_APP}")\"" | prefix_stdout " "
echo -e "\n.. END searx uwsgi-appini $DIST_NAME"
)