Replaced SearX with SearXNG

7 files changed, 71 insertions, 44 deletions

diff --git a/searx/searx/settings.yml b/searx/searx/settings.yml
deleted file mode 100644
index 351ed45..0000000
--- a/searx/searx/settings.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-use_default_settings: True
-
-general:
-    debug : False # Debug mode, only for development
-    instance_name : "Sneed Searx" # displayed name
-
-search:
-    safe_search : 0 # Filter results. 0: None, 1: Moderate, 2: Strict
-    autocomplete : "duckduckgo" # Existing autocomplete backends: "dbpedia", "duckduckgo", "google", "startpage", "swisscows", "qwant", "wikipedia" - leave blank to turn it off by default
-    default_lang : "" # Default search language - leave blank to detect from browser information or use codes from 'languages.py'
-
-server:
-    port : 8888
-    bind_address : "127.0.0.1" # address to listen on
-    secret_key : "" # change this!
-    base_url : "https://YOURHOSTNAME/searx" # Set custom base_url. Possible values: False or "https://your.custom.host/location/"
-    image_proxy : False # Proxying image results through searx
-
-ui:
-    static_path : "" # Custom static path - leave it blank if you didn't change
-    templates_path : "" # Custom templates path - leave it blank if you didn't change
-    default_theme : oscar # ui theme
-    default_locale : "" # Default interface locale - leave blank to detect from browser information or use codes from the 'locales' config section
-    theme_args :
-        oscar_style : logicodev-dark # default style of oscar
-    categories_order :
-            - general
-            - files
-            - images
-            - videos
-            - science
-            - it
-            - map
-            - music
-            - news
diff --git a/searx/README.md b/searxng/README.md
index 6062098..a8f0c0f 100644
--- a/searx/README.md
+++ b/searxng/README.md
@@ -1,5 +1,5 @@
-# SearX
-Self hosted SearX instance with default configurations.
+# SearXNG
+Self hosted SearXNG instance with default configurations.
 To install just run the script using:
 
 `bash deploy`
diff --git a/searx/deploy b/searxng/deploy
index 998b393..da076df 100755..100644
--- a/searx/deploy
+++ b/searxng/deploy
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Installing dependencies
-sudo apt install -y python3-dev python3-babel python3-venv uwsgi uwsgi-plugin-python3 git build-essential libxslt-dev zlib1g-dev libffi-dev libssl-dev shellcheck nginx
+sudo apt install -y python3-dev python3-babel python3-venv uwsgi uwsgi-plugin-python3 git build-essential libxslt1-dev zlib1g-dev libffi-dev libssl-dev shellcheck nginx
 
 # SearX
 ## Creating and setting up user
@@ -13,16 +13,17 @@ sudo -H mkdir "/usr/local/searx"
 sudo -H chown -R "searx:searx" "/usr/local/searx"
 
 ## Installing searx
-sudo -H -u searx git clone "https://github.com/searx/searx.git" "/usr/local/searx/searx-src"
+sudo -H -u searx git clone "https://github.com/searxng/searxng" "/usr/local/searx/searx-src"
 sudo -H -u searx python3 -m venv "/usr/local/searx/searx-pyenv"
-echo "export SEARX_SETTINGS_PATH=\"/etc/searx/settings.yml\"" | sudo -H -u searx tee -a "/usr/local/searx/.profile" > /dev/null
+echo "export SEARX_SETTINGS_PATH=\"/etc/searxng/settings.yml\"" | sudo -H -u searx tee -a "/usr/local/searx/.profile" > /dev/null
 echo ". /usr/local/searx/searx-pyenv/bin/activate" | sudo -H -u searx tee -a "/usr/local/searx/.profile" > /dev/null
 sudo -H -u searx /usr/local/searx/searx-pyenv/bin/pip install -U pip setuptools wheel pyyaml
 sudo -H -u searx /usr/local/searx/searx-pyenv/bin/pip install -e "/usr/local/searx/searx-src"
 
-## Configuring SearX
-sudo -H cp -rf "searx/" "/etc/"
+## Configuring SearXNG
+sudo -H cp -rf "searxng/" "/etc/"
 sudo -H sed -i s:YOURHOSTNAME:"$(hostname)":g /etc/searx/settings.yml
+sudo -H sed -i s:SERVERKEY:"$(openssl rand -hex 16)":g /etc/searx/settings.yml
 
 # uwsgi
 sudo -H cp -rf uwsgi/ /etc/
diff --git a/searx/nginx/pages/searx.conf b/searxng/nginx/pages/searxng.conf
index 1c58d41..461a6f0 100644
--- a/searx/nginx/pages/searx.conf
+++ b/searxng/nginx/pages/searxng.conf
@@ -1,4 +1,4 @@
-location /searx
+location /searxng
 {
 	include uwsgi_params;
 	uwsgi_param SCRIPT_NAME /searx;
diff --git a/searx/nginx/sites-available/server b/searxng/nginx/sites-available/server
index ba75367..ba75367 100644
--- a/searx/nginx/sites-available/server
+++ b/searxng/nginx/sites-available/server
diff --git a/searxng/searxng/settings.yml b/searxng/searxng/settings.yml
new file mode 100644
index 0000000..f925ebb
--- /dev/null
+++ b/searxng/searxng/settings.yml
@@ -0,0 +1,61 @@
+# SearXNG settings, before editing this file read:
+#
+#     https://docs.searxng.org/admin/engines/settings.html
+
+use_default_settings: true
+
+general:
+  # Debug mode, only for development
+  debug: false
+  # change displayed name
+  instance_name: "SneedNG"
+
+search:
+  # Filter results. 0: None, 1: Moderate, 2: Strict
+  safe_search: 0
+  # Existing autocomplete backends: "dbpedia", "duckduckgo", "google",
+  # "startpage", "swisscows", "qwant", "wikipedia" - leave blank to turn it off
+  # by default.
+  autocomplete: 'duckduckgo'
+  # Default search language - leave blank to detect from browser information or
+  # use codes from 'languages.py'
+  default_lang: ''
+  # remove format to deny access, use lower case.
+  formats:
+    - html
+
+server:
+  secret_key: "SERVERKEY"  # change this!
+  base_url : "https://YOURHOSTNAME/searxng"
+  # Proxying image results through SearXNG
+  image_proxy: false
+
+ui:
+  default_locale: ""
+  query_in_title: false
+  default_theme: simple
+  theme_args:
+    simple_style: dark
+
+# result_proxy:
+#   url: http://127.0.0.1:3000/
+#   key: !!binary "your_morty_proxy_key"
+
+# plugins:
+#   - only_show_green_results
+
+# engines:
+#
+#   - name: duckduckgo
+#     disabled: false
+#
+#   - name: fdroid
+#     disabled: false
+#
+#   - name: apk mirror
+#     disabled: false
+#
+#   - name: mediathekviewweb
+#     engine: mediathekviewweb
+#     shortcut: mvw
+#     categories: general
diff --git a/searx/uwsgi/apps-available/searx.ini b/searxng/uwsgi/apps-available/searx.ini
index 430a455..31e4bd6 100644
--- a/searx/uwsgi/apps-available/searx.ini
+++ b/searxng/uwsgi/apps-available/searx.ini
@@ -18,7 +18,7 @@ env = LC_ALL=C.UTF-8
 chdir = /usr/local/searx/searx-src/searx
 
 # searx configuration (settings.yml)
-env = SEARX_SETTINGS_PATH=/etc/searx/settings.yml
+env = SEARX_SETTINGS_PATH=/etc/searxng/settings.yml
 
 # disable logging for privacy
 disable-logging = true