diff --git a/.env b/.env index ba60398..f10f106 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ PROD_URL=searx.gmoker.com -IMAGEAPP=docker.io/searxng/searxng:2025.5.29-913dfbd +IMAGEAPP=docker.io/searxng/searxng:2025.7.17-e851bc1 diff --git a/config/hostnames_remove.yml b/config/hostnames_remove.yml index 82ccb10..300ed97 100644 --- a/config/hostnames_remove.yml +++ b/config/hostnames_remove.yml @@ -836,6 +836,7 @@ - '(.*\.)?ads20\.focalink\.com$' - '(.*\.)?ads21\.focalink\.com$' - '(.*\.)?ads22\.focalink\.com$' +- '(.*\.)?ads22\.host\-cdn\.net$' - '(.*\.)?ads234\.com$' - '(.*\.)?ads23\.focalink\.com$' - '(.*\.)?ads24\.focalink\.com$' @@ -2320,6 +2321,7 @@ - '(.*\.)?benimreklam\.com$' - '(.*\.)?bergeresdefrance\.fr$' - '(.*\.)?besacon\.fr$' +- '(.*\.)?bespokeshirtsmail\.com$' - '(.*\.)?best2017games\.com$' - '(.*\.)?best2019\-games\-web1\.com$' - '(.*\.)?best2020\-games\-web1\.com$' @@ -2384,6 +2386,7 @@ - '(.*\.)?bimg\.abv\.bg$' - '(.*\.)?bindedge\.com$' - '(.*\.)?bindfast\.com$' +- '(.*\.)?biomagin\.com$' - '(.*\.)?bioware\.fr$' - '(.*\.)?birth\-control\.1\.p2l\.info$' - '(.*\.)?biscuit\-taste\.net$' @@ -2534,6 +2537,7 @@ - '(.*\.)?bulktheft\.com$' - '(.*\.)?bulldog\.122\.2o7\.net$' - '(.*\.)?bullgame\.net$' +- '(.*\.)?bullionglidingscuttle\.com$' - '(.*\.)?bumerangshowsites\.hurriyet\.com\.tr$' - '(.*\.)?bundasnovinhas\.com$' - '(.*\.)?bundesanzeiger\.fr$' @@ -2661,6 +2665,7 @@ - '(.*\.)?c\.adexchangemachine\.com$' - '(.*\.)?c\.admob\.com$' - '(.*\.)?c\.adroll\.com$' +- '(.*\.)?c\.adsco\.re$' - '(.*\.)?c\.amazon\-adsystem\.com$' - '(.*\.)?c\.anytrx\.com$' - '(.*\.)?c\.ar\.msn\.com$' @@ -3293,6 +3298,7 @@ - '(.*\.)?coreglead\.co\.uk$' - '(.*\.)?corp\-downloads\.com$' - '(.*\.)?corusads\.dserv\.ca$' +- '(.*\.)?cosi\.iprive\.net$' - '(.*\.)?cosmeticscentre\.uk\.com$' - '(.*\.)?cosmopolian\.fr$' - '(.*\.)?cosmopolita\.fr$' @@ -4225,6 +4231,8 @@ - '(.*\.)?europe\.adserver\.yahoo\.com$' - '(.*\.)?europr1\.fr$' - '(.*\.)?eurospoprt\.fr$' +- '(.*\.)?eurostreaming\.myproxy\.help$' +- '(.*\.)?eurostreaming\.superproxy\.lol$' - '(.*\.)?eus\.rubiconproject\.com$' - '(.*\.)?euw\.adserver\.snapads\.com$' - '(.*\.)?events\.kiosked\.com$' @@ -5225,6 +5233,7 @@ - '(.*\.)?images\.jambocast\.com$' - '(.*\.)?images\.linkwithin\.com$' - '(.*\.)?images\.mbuyu\.nl$' +- '(.*\.)?images\.mediago\.io$' - '(.*\.)?images\.netcomvad\.com$' - '(.*\.)?images\.outbrain\.com$' - '(.*\.)?images\.outbrainimg\.com$' @@ -5370,6 +5379,7 @@ - '(.*\.)?int\.sitestat\.com$' - '(.*\.)?integer\-ms\-home\.com$' - '(.*\.)?intela\.com$' +- '(.*\.)?intelcomasfcmscta\.com$' - '(.*\.)?intelcorpcim\.112\.2o7\.net$' - '(.*\.)?intelglobal\.112\.2o7\.net$' - '(.*\.)?intelliads\.com$' @@ -6581,6 +6591,7 @@ - '(.*\.)?ms\.5\.p2l\.info$' - '(.*\.)?ms\.yandex\.ru$' - '(.*\.)?mseuppremain\.112\.2o7\.net$' +- '(.*\.)?msft\-ssp\-emea\.adnxs\.com$' - '(.*\.)?mshelp247\.weebly\.com$' - '(.*\.)?mslinks\-downloads\.com$' - '(.*\.)?msn1\.com$' @@ -6637,6 +6648,7 @@ - '(.*\.)?myanyone\.net$' - '(.*\.)?myao\.adocean\.pl$' - '(.*\.)?myasiantv\.gsspcln\.jp$' +- '(.*\.)?mybancoschiles\.gets\-it\.net$' - '(.*\.)?mybbc\-analytics\.files\.bbci\.co\.uk$' - '(.*\.)?mybinaryoptionsrobot\.com$' - '(.*\.)?mybrightidea\.co$' @@ -7236,6 +7248,7 @@ - '(.*\.)?osqa\.com$' - '(.*\.)?osqa\.net$' - '(.*\.)?ostalgie\.fr$' +- '(.*\.)?otakutee\.com$' - '(.*\.)?other\.xxxcounter\.com$' - '(.*\.)?otletdivak\.hu$' - '(.*\.)?otpercpiheno\.blogspot\.com$' @@ -7765,6 +7778,7 @@ - '(.*\.)?ps\-us\.amazon\-adsystem\.com$' - '(.*\.)?ps\.eyeota\.net$' - '(.*\.)?ps\.popcash\.net$' +- '(.*\.)?psoabojaksou\.net$' - '(.*\.)?psorias\.atspace\.com$' - '(.*\.)?pspcave\.uk\.intellitxt\.com$' - '(.*\.)?pstatic\.datafastguru\.info$' @@ -7815,6 +7829,7 @@ - '(.*\.)?qbittorrent\.com$' - '(.*\.)?qc\.5\.p2l\.info$' - '(.*\.)?qd\.admetricspro\.com$' +- '(.*\.)?qdssy\.balistrera\.sbs$' - '(.*\.)?qevia\.doubleclick\.bond$' - '(.*\.)?qfdn3gyfbs\.com$' - '(.*\.)?qfsya\.comfortykive\.xyz$' @@ -8014,6 +8029,7 @@ - '(.*\.)?retaildetail\.fr$' - '(.*\.)?retin\-a\.1\.p2l\.info$' - '(.*\.)?retrofuture\.fr$' +- '(.*\.)?return2025costco\.com$' - '(.*\.)?rev\-cvnada\-dep\.com$' - '(.*\.)?reverso\.refr\.adgtw\.orangeads\.fr$' - '(.*\.)?revoke\-dashboard\.com$' @@ -8040,6 +8056,7 @@ - '(.*\.)?rimaje\.nl$' - '(.*\.)?rimnow\.fr$' - '(.*\.)?ringtonepartner\.com$' +- '(.*\.)?riosaladohp\.com$' - '(.*\.)?riptownmedia\.122\.2o7\.net$' - '(.*\.)?rivalo\.network$' - '(.*\.)?river\-store\.com$' @@ -8172,6 +8189,7 @@ - '(.*\.)?s\.baidu\.com$' - '(.*\.)?s\.bl\-1\.com$' - '(.*\.)?s\.boom\.ro$' +- '(.*\.)?s\.click\.aliexpress\.com$' - '(.*\.)?s\.clickability\.com$' - '(.*\.)?s\.clickiocdn\.com$' - '(.*\.)?s\.clicktale\.net$' @@ -8198,7 +8216,6 @@ - '(.*\.)?s\.thebrighttag\.com$' - '(.*\.)?s\.update\.fbsbx\.com$' - '(.*\.)?s\.visilabs\.net$' -- '(.*\.)?s\.youtube\.com$' - '(.*\.)?sabafon\.info$' - '(.*\.)?sabre\.com\.tw$' - '(.*\.)?sact\.atdmt\.com$' @@ -8927,6 +8944,7 @@ - '(.*\.)?straighttangerine\.cz\.cc$' - '(.*\.)?strategies360\.fr$' - '(.*\.)?strategy\.lmobi\.net$' +- '(.*\.)?stratus\.campaign\-image\.com\.cn$' - '(.*\.)?strawpoii\.me$' - '(.*\.)?stream\-direct\.co$' - '(.*\.)?streamate\.com$' @@ -9237,6 +9255,7 @@ - '(.*\.)?tic\.filmstoon\.cam$' - '(.*\.)?ticket20\.tripod\.com$' - '(.*\.)?ticketforchange\.fr$' +- '(.*\.)?ticketpayfee\.com$' - '(.*\.)?ticketspy\.fr$' - '(.*\.)?tidebuy\.com$' - '(.*\.)?tiku\.io$' @@ -9485,6 +9504,7 @@ - '(.*\.)?tracking\.percentmobile\.com$' - '(.*\.)?tracking\.publicidees\.com$' - '(.*\.)?tracking\.quisma\.com$' +- '(.*\.)?tracking\.scientific\-meets\.com$' - '(.*\.)?tracking\.searchmarketing\.com$' - '(.*\.)?tracking\.stampready\.net$' - '(.*\.)?tracking\.summitmedia\.co\.uk$' @@ -9853,6 +9873,7 @@ - '(.*\.)?vh1com\.112\.2o7\.net$' - '(.*\.)?vhowland\.co\.uk$' - '(.*\.)?vht\.tradedoubler\.com$' +- '(.*\.)?vi\-improved\.org$' - '(.*\.)?vi\.5\.p2l\.info$' - '(.*\.)?via\.oewabox\.at$' - '(.*\.)?viaatomvideo\.112\.2o7\.net$' @@ -11296,6 +11317,7 @@ - '(.*\.)?www\.rightstats\.com$' - '(.*\.)?www\.ringtonepartner\.com$' - '(.*\.)?www\.riskybus\.f9\.co\.uk$' +- '(.*\.)?www\.ritikhush\.com$' - '(.*\.)?www\.robm674\.plus\.com$' - '(.*\.)?www\.romanticmaui\.net$' - '(.*\.)?www\.romepartners\.com$' @@ -11697,6 +11719,7 @@ - '(.*\.)?youmakeashion\.fr$' - '(.*\.)?your\-gift\-zone\.com$' - '(.*\.)?your\.dailytopdealz\.com$' +- '(.*\.)?youradexchange\.com$' - '(.*\.)?yourbestclothes\.com$' - '(.*\.)?yourdailytrailer\.yournewtab\.com$' - '(.*\.)?yourgascards\.com$' @@ -11712,7 +11735,6 @@ - '(.*\.)?ysiu\.freenation\.com$' - '(.*\.)?yt\-adblocker\.com$' - '(.*\.)?yt\.5\.p2l\.info$' -- '(.*\.)?yu\.ac\.kr$' - '(.*\.)?yumenetworks\.com$' - '(.*\.)?yummie\.fr$' - '(.*\.)?yummyfoodallover\.com$' @@ -11736,6 +11758,8 @@ - '(.*\.)?zapcdn\.space$' - '(.*\.)?zazerygu\.pro$' - '(.*\.)?zb1\.zeroredirect1\.com$' +- '(.*\.)?zc1\.campaign\-view\.com\.cn$' +- '(.*\.)?zc1\.maillist\-manage\.com\.cn$' - '(.*\.)?zc1\.zeroredirect11\.com$' - '(.*\.)?zdads\.e\-media\.com$' - '(.*\.)?zebutal\.1\.p2l\.info$' diff --git a/config/settings.yml b/config/settings.yml index 6c819f7..2fe14f8 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -34,7 +34,7 @@ search: # Filter results. 0: None, 1: Moderate, 2: Strict safe_search: 0 # Existing autocomplete backends: "360search", "baidu", "brave", "dbpedia", "duckduckgo", "google", "yandex", - # "mwmbl", "naver", "seznam", "sogou", "stract", "swisscows", "quark", "qwant", "wikipedia" - + # "mwmbl", "naver", "seznam", "sogou", "startpage", "stract", "swisscows", "quark", "qwant", "wikipedia" - # leave blank to turn it off by default. autocomplete: "" # minimun characters to type before autocompleter starts @@ -110,16 +110,15 @@ server: X-Robots-Tag: noindex, nofollow Referrer-Policy: no-referrer -redis: - # URL to connect redis database. Is overwritten by ${SEARXNG_REDIS_URL}. - # https://docs.searxng.org/admin/settings/settings_redis.html#settings-redis - url: redis://valkey +valkey: + # URL to connect valkey database. Is overwritten by ${SEARXNG_VALKEY_URL}. + # https://docs.searxng.org/admin/settings/settings_valkey.html#settings-valkey + # url: valkey://localhost:6379/0 + url: valkey://valkey/0 ui: # Custom static path - leave it blank if you didn't change static_path: "" - # Is overwritten by ${SEARXNG_STATIC_USE_HASH}. - static_use_hash: false # Custom templates path - leave it blank if you didn't change templates_path: "" # query_in_title: When true, the result page's titles contains the query @@ -245,7 +244,7 @@ plugins: active: false searx.plugins.tracker_url_remover.SXNGPlugin: - active: false + active: true # Configuration of the "Hostnames plugin": @@ -1554,6 +1553,20 @@ engines: url: https://thepiratebay.org/ timeout: 3.0 + - name: pixabay images + engine: pixabay + pixabay_type: images + categories: images + shortcut: pixi + disabled: true + + - name: pixabay videos + engine: pixabay + pixabay_type: videos + categories: videos + shortcut: pixv + disabled: true + - name: pixiv shortcut: pv engine: pixiv @@ -1766,10 +1779,10 @@ engines: shortcut: rt disabled: true - # Required dependency: redis - # - name: myredis + # Required dependency: valkey + # - name: myvalkey # shortcut : rds - # engine: redis_server + # engine: valkey_server # exact_match_only: false # host: '127.0.0.1' # port: 6379 @@ -2007,6 +2020,16 @@ engines: enable_http: true shortcut: tch + # TubeArchivist is a self-hosted Youtube archivist software. + # https://docs.searxng.org/dev/engines/online/tubearchivist.html + # + # - name: tubearchivist + # engine: tubearchivist + # shortcut: tuba + # base_url: + # ta_token: + # ta_link_to_mp4: false + # torznab engine lets you query any torznab compatible indexer. Using this # engine in combination with Jackett opens the possibility to query a lot of # public and private indexers directly from SearXNG. More details at: @@ -2648,6 +2671,18 @@ engines: timeout: 4.0 disabled: true + - name: minecraft wiki + engine: mediawiki + shortcut: mcw + categories: ["software wikis"] + base_url: https://minecraft.wiki/ + api_path: "api.php" + search_type: text + disabled: true + about: + website: https://minecraft.wiki/ + wikidata_id: Q105533483 + # Doku engine lets you access to any Doku wiki instance: # A public one or a privete/corporate one. # - name: ubuntuwiki @@ -2729,7 +2764,6 @@ engines: doi_resolvers: oadoi.org: 'https://oadoi.org/' doi.org: 'https://doi.org/' - doai.io: 'https://dissem.in/' sci-hub.se: 'https://sci-hub.se/' sci-hub.st: 'https://sci-hub.st/' sci-hub.ru: 'https://sci-hub.ru/' diff --git a/generate_hostnames_remove.py b/generate_hostnames_remove.py index 15a8131..5b4badf 100644 --- a/generate_hostnames_remove.py +++ b/generate_hostnames_remove.py @@ -3,12 +3,14 @@ import urllib.request as request import re -HOSTS = "https://someonewhocares.org/hosts/zero/hosts" +URL = "https://someonewhocares.org/hosts/zero/hosts" OUTPUT = "config/hostnames_remove.yml" def main(): - with request.urlopen(HOSTS) as i: + with request.urlopen( + request.Request(URL, headers={"User-Agent": "curl/8.15.0"}) + ) as i: with open(OUTPUT, "w+") as o: print( *sorted( diff --git a/manifests/bin/deploy.sh b/manifests/bin/deploy.sh index 9ef8b2f..a5e2ee6 100755 --- a/manifests/bin/deploy.sh +++ b/manifests/bin/deploy.sh @@ -1,31 +1,31 @@ #!/bin/bash -e set -o pipefail -function kapply() { +kapply() { for f in "$@"; do kubectl apply --server-side \ -f<(envsubst "$(env | sed 's/^/$/')" < "manifests/$f") done }; export -f kapply -function kcreatesec() { +kcreatesec() { kubectl apply --server-side \ -f<(kubectl create secret generic --dry-run=client -oyaml "$@") }; export -f kcreatesec -function kcreatecm() { +kcreatecm() { kubectl apply --server-side \ -f<(kubectl create configmap --dry-run=client -oyaml "$@") }; export -f kcreatecm -function kgseckey() { +kgseckey() { local sec="$1"; shift local key="$1"; shift kubectl get secret "$sec" -ojson | jq -re ".data.\"$key\"" | base64 -d }; export -f kgseckey -function kgcmkey() { +kgcmkey() { local cm="$1"; shift local key="$1"; shift