From 3c279881e01e922bf2bfcef64302017f31739819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorben=20G=C3=BCnther?= Date: Wed, 22 Feb 2023 18:40:01 +0100 Subject: [PATCH] searx: Remove Got succeeded by searxng. --- playbooks/avalon.yml | 1 - roles/searx/files/search.conf | 25 --- roles/searx/handlers/main.yml | 5 - roles/searx/tasks/main.yml | 44 ----- roles/searx/templates/settings.yml.j2 | 255 -------------------------- 5 files changed, 330 deletions(-) delete mode 100644 roles/searx/files/search.conf delete mode 100644 roles/searx/handlers/main.yml delete mode 100644 roles/searx/tasks/main.yml delete mode 100644 roles/searx/templates/settings.yml.j2 diff --git a/playbooks/avalon.yml b/playbooks/avalon.yml index 728b6cc..edfbeeb 100644 --- a/playbooks/avalon.yml +++ b/playbooks/avalon.yml @@ -25,7 +25,6 @@ - { role: vaultwarden } # - { role: sinusbot } # docker # - { role: faceit } # docker - - { role: searx } - { role: searxng } - { role: prometheus } - { role: alertmanager } diff --git a/roles/searx/files/search.conf b/roles/searx/files/search.conf deleted file mode 100644 index f55b4f4..0000000 --- a/roles/searx/files/search.conf +++ /dev/null @@ -1,25 +0,0 @@ -server { - include /etc/nginx/snippets/http.conf; - server_name search.xenrox.net; - - access_log /dev/null; - error_log /dev/null; -} - -server { - include /etc/nginx/snippets/https.conf; - server_name search.xenrox.net; - - access_log /dev/null; - error_log /dev/null; - - location / { - proxy_pass http://127.0.0.1:8888; - - proxy_set_header Host $host; - proxy_set_header Connection $http_connection; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Scheme $scheme; - proxy_buffering off; - } -} diff --git a/roles/searx/handlers/main.yml b/roles/searx/handlers/main.yml deleted file mode 100644 index 3b3fe36..0000000 --- a/roles/searx/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: Restart searx - ansible.builtin.systemd: - name: uwsgi@searx - state: restarted diff --git a/roles/searx/tasks/main.yml b/roles/searx/tasks/main.yml deleted file mode 100644 index fb1b7a8..0000000 --- a/roles/searx/tasks/main.yml +++ /dev/null @@ -1,44 +0,0 @@ ---- -- name: Get secrets - ansible.builtin.set_fact: - searx_secrets: "{{ lookup('community.hashi_vault.hashi_vault', 'ansible/data/searx') }}" - -- name: Install - community.general.pacman: - name: searx - state: present - -- name: Configure uwsgi - ansible.builtin.lineinfile: - path: /etc/uwsgi/searx.ini - state: present - regexp: disable-logging - line: disable-logging = true - owner: root - group: root - mode: "0644" - notify: Restart searx - -- name: Configure - ansible.builtin.template: - src: settings.yml.j2 - dest: /etc/searx/settings.yml - owner: root - group: root - mode: "0644" - notify: Restart searx - -- name: Start and enable - ansible.builtin.systemd: - name: uwsgi@searx - enabled: true - state: started - -- name: Copy nginx conf - ansible.builtin.copy: - src: search.conf - dest: /etc/nginx/nginx.d/search.conf - owner: root - group: root - mode: "0644" - notify: Restart nginx diff --git a/roles/searx/templates/settings.yml.j2 b/roles/searx/templates/settings.yml.j2 deleted file mode 100644 index d85f35c..0000000 --- a/roles/searx/templates/settings.yml.j2 +++ /dev/null @@ -1,255 +0,0 @@ -general: - debug: False # Debug mode, only for development - instance_name: "searx" # displayed name - contact_url: False # mailto:contact@example.com - enable_stats: False # activate /stats page - note: it may leak usage data - -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' - ban_time_on_fail: 5 # ban time in seconds after engine errors - max_ban_time_on_fail: 120 # max ban time in seconds after engine errors - prefer_configured_language: False # increase weight of results in confiugred language in ranking - -server: - port: 8888 - bind_address: "127.0.0.1" # address to listen on - secret_key: "{{ searx_secrets['secret_key'] }}" - base_url: "https://search.xenrox.net" # Set custom base_url. Possible values: False or "https://your.custom.host/location/" - image_proxy: True # Proxying image results through searx - http_protocol_version: "1.0" # 1.0 and 1.1 are supported - method: "POST" # POST queries are more secure as they don't show up in history but may cause problems when using Firefox containers - default_http_headers: - X-Content-Type-Options: nosniff - X-XSS-Protection: 1; mode=block - X-Download-Options: noopen - X-Robots-Tag: noindex, nofollow - Referrer-Policy: no-referrer - -ui: - autofocus: True # Autofocus search input - archive_today: False # show archive.today links - 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 -# results_on_new_tab: False # Open result links in a new tab by default - categories_order: - - general - - videos - - images - - it - - news - -# Lock arbitrary settings on the preferences page. -# To find the ID of the user setting you want to lock, check -# the ID of the form on the page "preferences". -#preferences: -# lock: -# - language -# - autocomplete -# - method - -# searx supports result proxification using an external service: https://github.com/asciimoo/morty -# uncomment below section if you have running morty proxy -# the key is base64 encoded (keep the !!binary notation) -# Note: since commit af77ec3, morty accepts a base64 encoded key. -#result_proxy: -# url : http://127.0.0.1:3000/ -# key : !!binary "your_morty_proxy_key" - -outgoing: # communication with search engines - request_timeout: 2.0 # default timeout in seconds, can be override by engine - # max_request_timeout: 10.0 # the maximum timeout in seconds - useragent_suffix: "" # suffix of searx_useragent, could contain informations like an email address to the administrator - pool_connections: 100 # Number of different hosts - pool_maxsize: 10 # Number of simultaneous requests by host -# uncomment below section if you want to use a proxy -# see https://2.python-requests.org/en/latest/user/advanced/#proxies -# SOCKS proxies are also supported: see https://2.python-requests.org/en/latest/user/advanced/#socks -# proxies: -# http: -# - http://proxy1:8080 -# - http://proxy2:8080 -# https: -# - http://proxy1:8080 -# - http://proxy2:8080 -# using_tor_proxy : True -# extra_proxy_timeout : 10.0 # Extra seconds to add in order to account for the time taken by the proxy -# uncomment below section only if you have more than one network interface -# which can be the source of outgoing search requests -# source_ips: -# - 1.1.1.1 -# - 1.1.1.2 - -# External plugin configuration -# See https://searx.github.io/searx/dev/plugins.html for more details -# -# plugins: -# - plugin1 -# - plugin2 -# - ... - -# uncomment below section if you want to configure which plugin is enabled by default -# -# enabled_plugins: -# - "HTTPS rewrite" -# - ... - -# Example to rewrite hostnames in external links -# -enabled_plugins: - - 'Hostname replace' -hostname_replace: - '(www\.)?twitter\.com$': 'nitter.net' -# '(.*\.)?youtube\.com$': 'invidious.example.com' -# '(.*\.)?youtu\.be$': 'invidious.example.com' -# '(.*\.)?youtube-noocookie\.com$': 'yotter.example.com' -# '(.*\.)?reddit\.com$': 'teddit.example.com' -# '(.*\.)?redd\.it$': 'teddit.example.com' - -checker: - # disable checker when in debug mode - off_when_debug: True - - # scheduling: interval or int - # use "scheduling: False" to disable scheduling - # to activate the scheduler: - # * uncomment "scheduling" section - # * add "cache2 = name=searxcache,items=2000,blocks=2000,blocksize=4096,bitmap=1" to your uwsgi.ini - - # scheduling: - # start_after: [300, 1800] # delay to start the first run of the checker - # every: [86400, 90000] # how often the checker runs - - # additional tests: only for the YAML anchors (see the engines section) - - additional_tests: - rosebud: &test_rosebud - matrix: - query: rosebud - lang: en - result_container: - - not_empty - - ["one_title_contains", "citizen kane"] - test: - - unique_results - - android: &test_android - matrix: - query: ["android"] - lang: ["en", "de", "fr", "zh-CN"] - result_container: - - not_empty - - ["one_title_contains", "google"] - test: - - unique_results - - # tests: only for the YAML anchors (see the engines section) - tests: - infobox: &tests_infobox - infobox: - matrix: - query: ["linux", "new york", "bbc"] - result_container: - - has_infobox - -engines: - - name: arch linux wiki - engine: archlinux - shortcut: al - - - name: wikipedia - engine: wikipedia - shortcut: wp - base_url: "https://{language}.wikipedia.org/" - - - name: bing - engine: bing - shortcut: bi - - - name: bing images - engine: bing_images - shortcut: bii - - - name: bing news - engine: bing_news - shortcut: bin - - - name: currency - engine: currency_convert - categories: general - shortcut: cc - - - name: wikidata - engine: wikidata - shortcut: wd - timeout: 3.0 - weight: 2 - - - name: duckduckgo - engine: duckduckgo - shortcut: ddg - - - name: github - engine: github - shortcut: gh - - - name: google images - engine: google_images - shortcut: goi - - - name: google news - engine: google_news - shortcut: gon - - - name: qwant - engine: qwant - shortcut: qw - categories: general - - - name: qwant images - engine: qwant - shortcut: qwi - categories: images - - - name: qwant news - engine: qwant - shortcut: qwn - categories: news - - - name: startpage - engine: startpage - shortcut: sp - timeout: 6.0 - - - name: yahoo news - engine: yahoo_news - shortcut: yhn - - - name: dictzone - engine: dictzone - shortcut: dc - - - name: peertube - engine: peertube - language: A # FIXME: Without this no videos are shown, unless video language is set in peertube - shortcut: ptb - paging: True - base_url: https://tube.xenrox.net - categories: videos - -locales: - en: English - de: Deutsch (German) - -doi_resolvers: - oadoi.org: "https://oadoi.org/" - doi.org: "https://doi.org/" - doai.io: "https://dissem.in/" - sci-hub.tw: "https://sci-hub.tw/" - -default_doi_resolver: "sci-hub.tw" -- 2.44.0