From 0248938439bba07bd596296c076c099ffdc65868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 14 Nov 2023 16:39:59 +0100 Subject: [PATCH] fix --- conf/config.php.example | 128 +++++++++++++++++++++++++++++++++++----- scripts/install | 4 +- 2 files changed, 115 insertions(+), 17 deletions(-) diff --git a/conf/config.php.example b/conf/config.php.example index 6c42f62..d53280e 100644 --- a/conf/config.php.example +++ b/conf/config.php.example @@ -5,21 +5,120 @@ "google_domain" => "com", // Google results will be in this language - "google_language" => "en", + "google_language_site" => "", + "google_language_results" => "", + "google_number_of_results" => 10, + + // You can set a language for results in wikipedia + "wikipedia_language" => "en", + + // You can use any Invidious instance here + "invidious_instance_for_video_results" => "https://invidious.snopyta.org", "disable_bittorent_search" => false, - "bittorent_trackers" => "&tr=http%3A%2F%2Fnyaa.tracker.wf%3A7777%2Fannounce&tr=udp%3A%2F%2Fopen.stealth.si%3A80%2Fannounce&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337%2Fannounce&tr=udp%3A%2F%2Fexodus.desync.com%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451%2Fannounce", + "bittorent_trackers" => "&tr=http://nyaa.tracker.wf:7777/announce&tr=udp://open.stealth.si:80/announce&tr=udp://tracker.opentrackr.org:1337/announce&tr=udp://exodus.desync.com:6969/announce&tr=udp://tracker.torrent.eu.org:451/announce", - /* - Preset privacy friendly frontends for users, these can be overwritten by users in settings - e.g.: "invidious" => "https://yewtu.be", + "disable_hidden_service_search" => false, + + /* + Preset privacy friendly frontends for users, these can be overwritten by users in the settings + e.g.: Preset the invidious instance URL: "instance_url" => "https://yewtu.be", */ - "invidious" => "", - "bibliogram" => "", - "nitter" => "", - "libreddit" => "", - "proxitok" => "", - "wikiless" => "", + + "frontends" => array( + "invidious" => array( + "instance_url" => "", + "project_url" => "https://docs.invidious.io/instances/", + "original_name" => "YouTube", + "original_url" => "youtube.com" + ), + "rimgo" => array( + "instance_url" => "", + "project_url" => "https://codeberg.org/video-prize-ranch/rimgo#instances", + "original_name" => "Imgur", + "original_url" => "imgur.com" + ), + "scribe" => array( + "instance_url" => "", + "project_url" => "https://git.sr.ht/~edwardloveall/scribe/tree/main/docs/instances.md", + "original_name" => "Medium", + "original_url" => "medium.com" + ), + "gothub" => array( + "instance_url" => "", + "project_url" => "https://codeberg.org/gothub/gothub#instances", + "original_name" => "GitHub", + "original_url" => "github.com" + ), + "librarian" => array( + "instance_url" => "", + "project_url" => "https://codeberg.org/librarian/librarian#clearnet", + "original_name" => "Odysee", + "original_url" => "odysee.com" + ), + + "nitter" => array( + "instance_url" => "", + "project_url" => "https://github.com/zedeus/nitter/wiki/Instances", + "original_name" => "Twitter", + "original_url" => "twitter.com" + ), + + "libreddit" => array( + "instance_url" => "", + "project_url" => "https://github.com/libreddit/libreddit-instances/blob/master/instances.md", + "original_name" => "Reddit", + "original_url" => "reddit.com" + ), + "proxitok" => array( + "instance_url" => "", + "project_url" => "https://github.com/pablouser1/ProxiTok/wiki/Public-instances", + "original_name" => "TikTok", + "original_url" => "tiktok.com" + ), + "wikiless" => array( + "instance_url" => "", + "project_url" => "https://github.com/Metastem/wikiless#instances", + "original_name" => "Wikipedia", + "original_url" => "wikipedia.org" + ), + "quetre" => array( + "instance_url" => "", + "project_url" => "https://github.com/zyachel/quetre#instances", + "original_name" => "Quora", + "original_url" => "quora.com" + ), + "libremdb" => array( + "instance_url" => "", + "project_url" => "https://github.com/zyachel/libremdb#instances", + "original_name" => "IMDb", + "original_url" => "imdb.com" + ), + "breezewiki" => array( + "instance_url" => "", + "project_url" => "https://docs.breezewiki.com/Links.html", + "original_name" => "Fandom", + "original_url" => "fandom.com" + ), + "anonymousoverflow" => array( + "instance_url" => "", + "project_url" => "https://github.com/httpjamesm/AnonymousOverflow#clearnet-instances", + "original_name" => "StackOverflow", + "original_url" => "stackoverflow.com" + ), + "suds" => array( + "instance_url" => "", + "project_url" => "https://git.vern.cc/cobra/Suds/src/branch/main/instances.json", + "original_name" => "Snopes", + "original_url" => "snopes.com" + ), + "biblioreads" => array( + "instance_url" => "", + "project_url" => "https://github.com/nesaku/BiblioReads#instances", + "original_name" => "Goodreads", + "original_url" => "goodreads.com" + ) + ), /* To send requests trough a proxy uncomment CURLOPT_PROXY and CURLOPT_PROXYTYPE: @@ -39,15 +138,14 @@ // CURLOPT_PROXYTYPE => CURLPROXY_HTTP, CURLOPT_RETURNTRANSFER => true, CURLOPT_ENCODING => "", - CURLOPT_USERAGENT => "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36", - CURLOPT_IPRESOLVE => CURL_IPRESOLVE_V4, + CURLOPT_USERAGENT => "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36", + CURLOPT_IPRESOLVE => CURL_IPRESOLVE_WHATEVER, CURLOPT_CUSTOMREQUEST => "GET", CURLOPT_PROTOCOLS => CURLPROTO_HTTPS | CURLPROTO_HTTP, CURLOPT_REDIR_PROTOCOLS => CURLPROTO_HTTPS | CURLPROTO_HTTP, CURLOPT_MAXREDIRS => 5, - CURLOPT_TIMEOUT => 8, + CURLOPT_TIMEOUT => 18, CURLOPT_VERBOSE => false ) - ); ?> diff --git a/scripts/install b/scripts/install index 4d9052a..6cb5c9c 100755 --- a/scripts/install +++ b/scripts/install @@ -44,8 +44,8 @@ yunohost service add $app --description="Privacy meta search engine" --log="/var #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="../conf/config.php.example" --destination="$install_dir/config.php" -ynh_add_config --template="../conf/opensearch.xml.example" --destination="$install_dir/opensearch.xml" +ynh_add_config --template="config.php.example" --destination="$install_dir/config.php" +ynh_add_config --template="opensearch.xml.example" --destination="$install_dir/opensearch.xml" chmod 400 "$install_dir/config.php" chown $app:$app "$install_dir/config.php"