free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Bob Mottram 2017-09-23 12:43:23 +01:00
parent fc62fe6bfd e901851d9c
commit f97728d95d
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/freedombone-app-searx
View File

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

4
src/freedombone-utils-web
View File

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