git.iko.soy/searx
on master help sign in
utils/serx.sh: make uWSGI installation available for all distros (WIP)
f17b287Markus Heiser
utils/lib.sh+95−21
compare with master
unifiedsplit
@@ -693,12 +693,46 @@ apache_dissable_site() {
693
693
694uWSGI_SETUP="${uWSGI_SETUP:=/etc/uwsgi}"
694uWSGI_SETUP="${uWSGI_SETUP:=/etc/uwsgi}"
695
695
696+case $DIST_ID-$DIST_VERS in
697+ ubuntu-*|debian-*)
698+ # init.d --> /usr/share/doc/uwsgi/README.Debian.gz
699+ uWSGI_APPS_AVAILABLE="${uWSGI_SETUP}/apps-available"
700+ uWSGI_APPS_ENABLED="${uWSGI_SETUP}/apps-enabled"
701+ ;;
702+ arch-*)
703+ # systemd --> /usr/lib/systemd/system/uwsgi@.service
704+ uWSGI_APPS_AVAILABLE="${uWSGI_SETUP}"
705+ uWSGI_APPS_ENABLED="${uWSGI_SETUP}"
706+ ;;
707+ *)
708+ info_msg "$DIST_ID-$DIST_VERS: uWSGI not yet implemented"
709+ ;;
710+esac
711+
696uWSGI_restart() {
712uWSGI_restart() {
697
713
698− # usage: uWSGI_restart()
714+ # usage: uWSGI_restart() <myapp.ini>
715+
716+ local CONF="$1"
717+ if [[ -z $CONF ]]; then
718+ err_msg "uWSGI_restart: missing arguments"
719+ return 42
720+ fi
699
721
700 info_msg "restart uWSGI service"
722 info_msg "restart uWSGI service"
723+
724+ case $DIST_ID-$DIST_VERS in
725+ ubuntu-*|debian-*)
726+ service uwsgi restart "${CONF%.*}"
727+ ;;
728+ arch-*)
701− systemctl restart uwsgi
729+ systemctl restart "uwsgi@${CONF%.*}"
730+ ;;
731+ *)
732+ err_msg "$DIST_ID-$DIST_VERS: uWSGI not yet implemented"
733+ return 42
734+ ;;
735+ esac
702}
736}
703
737
704uWSGI_app_available() {
738uWSGI_app_available() {
@@ -708,7 +742,7 @@ uWSGI_app_available() {
708 err_msg "uWSGI_app_available: missing arguments"
742 err_msg "uWSGI_app_available: missing arguments"
709 return 42
743 return 42
710 fi
744 fi
711− [[ -f "${uWSGI_SETUP}/apps-available/${CONF}" ]]
745+ [[ -f "${uWSGI_APPS_AVAILABLE}/${CONF}" ]]
712}
746}
713
747
714uWSGI_install_app() {
748uWSGI_install_app() {
@@ -725,13 +759,12 @@ uWSGI_install_app() {
725 *) pos_args+=("$i");;
759 *) pos_args+=("$i");;
726 esac
760 esac
727 done
761 done
728−
762+ mkdir -p "${uWSGI_APPS_AVAILABLE}"
729 install_template "${template_opts[@]}" \
763 install_template "${template_opts[@]}" \
730− "${uWSGI_SETUP}/apps-available/${pos_args[1]}" \
764+ "${uWSGI_APPS_AVAILABLE}/${pos_args[1]}" \
731 root root 644
765 root root 644
732−
733 uWSGI_enable_app "${pos_args[1]}"
766 uWSGI_enable_app "${pos_args[1]}"
734− uWSGI_restart
767+ uWSGI_restart "${pos_args[1]}"
735 info_msg "installed uWSGI app: ${pos_args[1]}"
768 info_msg "installed uWSGI app: ${pos_args[1]}"
736}
769}
737
770
@@ -742,18 +775,35 @@ uWSGI_remove_app() {
742 local CONF="$1"
775 local CONF="$1"
743 info_msg "remove uWSGI app: ${CONF}"
776 info_msg "remove uWSGI app: ${CONF}"
744 uWSGI_disable_app "${CONF}"
777 uWSGI_disable_app "${CONF}"
745− uWSGI_restart
778+ uWSGI_restart "${CONF}"
746− rm -f "${uWSGI_SETUP}/apps-available/${CONF}"
779+ rm -f "${uWSGI_APPS_AVAILABLE}/${CONF}"
747}
780}
748
781
749uWSGI_app_enabled() {
782uWSGI_app_enabled() {
750 # usage: uWSGI_app_enabled <myapp.ini>
783 # usage: uWSGI_app_enabled <myapp.ini>
784+
751 local CONF="$1"
785 local CONF="$1"
786+ local exit_val=0
752 if [[ -z $CONF ]]; then
787 if [[ -z $CONF ]]; then
753 err_msg "uWSGI_app_enabled: missing arguments"
788 err_msg "uWSGI_app_enabled: missing arguments"
754 return 42
789 return 42
755 fi
790 fi
791+ case $DIST_ID-$DIST_VERS in
792+ ubuntu-*|debian-*)
793+ [[ -f "${uWSGI_APPS_ENABLED}/${CONF}" ]]
794+ exit_val=$?
795+ ;;
796+ arch-*)
756− [[ -f "${uWSGI_SETUP}/apps-enabled/${CONF}" ]]
797+ systemctl -q is-enabled "uwsgi@${CONF%.*}"
798+ exit_val=$?
799+ ;;
800+ *)
801+ # FIXME
802+ err_msg "$DIST_ID-$DIST_VERS: uWSGI not yet implemented"
803+ exit_val=1
804+ ;;
805+ esac
806+ return $exit_val
757}
807}
758
808
759# shellcheck disable=SC2164
809# shellcheck disable=SC2164
@@ -762,16 +812,29 @@ uWSGI_enable_app() {
762 # usage: uWSGI_enable_app <myapp.ini>
812 # usage: uWSGI_enable_app <myapp.ini>
763
813
764 local CONF="$1"
814 local CONF="$1"
815+
765 if [[ -z $CONF ]]; then
816 if [[ -z $CONF ]]; then
766 err_msg "uWSGI_enable_app: missing arguments"
817 err_msg "uWSGI_enable_app: missing arguments"
767 return 42
818 return 42
768 fi
819 fi
769− pushd "${uWSGI_SETUP}/apps-enabled" >/dev/null
820+
821+ case $DIST_ID-$DIST_VERS in
822+ ubuntu-*|debian-*)
823+ mkdir -p "${uWSGI_APPS_ENABLED}"
824+ pushd "${uWSGI_APPS_ENABLED}" >/dev/null
770− rm -f "$CONF"
825+ rm -f "$CONF"
771− # shellcheck disable=SC2226
826+ ln -s "${uWSGI_APPS_AVAILABLE}/${CONF}" .
772− ln -s "../apps-available/${CONF}"
827+ popd >/dev/null
773− info_msg "enabled uWSGI app: ${CONF} (restart uWSGI required)"
828+ info_msg "enabled uWSGI app: ${CONF} (restart required)"
774− popd >/dev/null
829+ ;;
830+ arch-*)
831+ systemctl enable "uwsgi@${CONF%.*}"
832+ ;;
833+ *)
834+ # FIXME
835+ err_msg "$DIST_ID-$DIST_VERS: uWSGI not yet implemented"
836+ ;;
837+ esac
775}
838}
776
839
777uWSGI_disable_app() {
840uWSGI_disable_app() {
@@ -783,11 +846,22 @@ uWSGI_disable_app() {
783 err_msg "uWSGI_enable_app: missing arguments"
846 err_msg "uWSGI_enable_app: missing arguments"
784 return 42
847 return 42
785 fi
848 fi
786− rm -f "${uWSGI_SETUP}/apps-enabled/${CONF}"
849+
787− # FIXME: restart uwsgi service won't stop wsgi forked processes of user searx.
850+ case $DIST_ID-$DIST_VERS in
788− # I had to kill them manually here ...
851+ ubuntu-*|debian-*)
789− pkill -f "${uWSGI_SETUP}/apps-enabled/${CONF}" -9
852+ service uwsgi stop "${CONF%.*}"
853+ rm -f "${uWSGI_APPS_ENABLED}/${CONF}"
790− info_msg "disabled uWSGI app: ${CONF} (restart uWSGI required)"
854+ info_msg "disabled uWSGI app: ${CONF} (restart uWSGI required)"
855+ ;;
856+ arch-*)
857+ systemctl stop "uwsgi@${CONF%.*}"
858+ systemctl disable "uwsgi@${CONF%.*}"
859+ ;;
860+ *)
861+ # FIXME
862+ err_msg "$DIST_ID-$DIST_VERS: uWSGI not yet implemented"
863+ ;;
864+ esac
791}
865}
792
866
793# distro's package manager
867# distro's package manager
utils/searx.sh+6−6
@@ -66,7 +66,7 @@ APACHE_SEARX_SITE="searx.conf"
66
66
67# shellcheck disable=SC2034
67# shellcheck disable=SC2034
68CONFIG_FILES=(
68CONFIG_FILES=(
69− "${uWSGI_SETUP}/apps-available/${SEARX_UWSGI_APP}"
69+ "${uWSGI_APPS_AVAILABLE}/${SEARX_UWSGI_APP}"
70)
70)
71
71
72# shellcheck disable=SC2034
72# shellcheck disable=SC2034
@@ -246,7 +246,7 @@ git pull
246${SEARX_SRC}/manage.sh update_packages
246${SEARX_SRC}/manage.sh update_packages
247EOF
247EOF
248 install_settings
248 install_settings
249− uWSGI_restart
249+ uWSGI_restart "$SEARX_UWSGI_APP"
250}
250}
251
251
252remove_all() {
252remove_all() {
@@ -458,14 +458,14 @@ activate_service() {
458 rst_title "Activate $SEARX_INSTANCE_NAME (service)" section
458 rst_title "Activate $SEARX_INSTANCE_NAME (service)" section
459 echo
459 echo
460 uWSGI_enable_app "$SEARX_UWSGI_APP"
460 uWSGI_enable_app "$SEARX_UWSGI_APP"
461− uWSGI_restart
461+ uWSGI_restart "$SEARX_UWSGI_APP"
462}
462}
463
463
464deactivate_service() {
464deactivate_service() {
465 rst_title "De-Activate $SEARX_INSTANCE_NAME (service)" section
465 rst_title "De-Activate $SEARX_INSTANCE_NAME (service)" section
466 echo
466 echo
467 uWSGI_disable_app "$SEARX_UWSGI_APP"
467 uWSGI_disable_app "$SEARX_UWSGI_APP"
468− uWSGI_restart
468+ uWSGI_restart "$SEARX_UWSGI_APP"
469}
469}
470
470
471enable_debug() {
471enable_debug() {
@@ -475,7 +475,7 @@ enable_debug() {
475cd ${SEARX_SRC}
475cd ${SEARX_SRC}
476sed -i -e "s/debug : False/debug : True/g" "$SEARX_SETTINGS_PATH"
476sed -i -e "s/debug : False/debug : True/g" "$SEARX_SETTINGS_PATH"
477EOF
477EOF
478− uWSGI_restart
478+ uWSGI_restart "$SEARX_UWSGI_APP"
479}
479}
480
480
481disable_debug() {
481disable_debug() {
@@ -484,7 +484,7 @@ disable_debug() {
484cd ${SEARX_SRC}
484cd ${SEARX_SRC}
485sed -i -e "s/debug : True/debug : False/g" "$SEARX_SETTINGS_PATH"
485sed -i -e "s/debug : True/debug : False/g" "$SEARX_SETTINGS_PATH"
486EOF
486EOF
487− uWSGI_restart
487+ uWSGI_restart "$SEARX_UWSGI_APP"
488}
488}
489
489
490inspect_service() {
490inspect_service() {