Преглед на файлове

Merge branch 'stretch' of https://github.com/bashrc/freedombone

Bob Mottram преди 7 години
родител
ревизия
f97728d95d
променени са 2 файла, в които са добавени 0 реда и са изтрити 7 реда
  1. 0
    3
      src/freedombone-app-searx
  2. 0
    4
      src/freedombone-utils-web

+ 0
- 3
src/freedombone-app-searx Целия файл

@@ -846,7 +846,6 @@ function remove_searx {
846 846
     remove_completion_param install_searx
847 847
     sed -i '/Search engine /d' $COMPLETION_FILE
848 848
     sed -i '/searx /d' $COMPLETION_FILE
849
-    update_default_search_engine
850 849
 }
851 850
 
852 851
 function install_searx {
@@ -1012,8 +1011,6 @@ function install_searx {
1012 1011
     systemctl daemon-reload
1013 1012
     systemctl start searx.service
1014 1013
 
1015
-    update_default_search_engine
1016
-
1017 1014
     SEARX_PASSWORD="$(create_password ${MINIMUM_PASSWORD_LENGTH})"
1018 1015
     ${PROJECT_NAME}-pass -u $MY_USERNAME -a searx -p "$SEARX_PASSWORD"
1019 1016
     if grep -q "$MY_USERNAME:" /etc/nginx/.htpasswd; then

+ 0
- 4
src/freedombone-utils-web Целия файл

@@ -535,10 +535,6 @@ function install_dynamicdns {
535 535
 }
536 536
 
537 537
 function update_default_search_engine {
538
-    if [ -f /var/lib/tor/hidden_service_searx/hostname ]; then
539
-        DEFAULT_SEARCH="http://$(cat /var/lib/tor/hidden_service_searx/hostname)"
540
-    fi
541
-
542 538
     for d in /home/*/ ; do
543 539
         USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
544 540
         if [[ $(is_valid_user "$USERNAME") == "1" ]]; then