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

Compare commits

base: free:stretch
Branches Tags
free:master
free:stretch
free:jessie
free:bashrc/stretch
free:stockholm
..
compare: free:master
Branches Tags
free:stretch
free:master
free:jessie
free:bashrc/stretch
free:stockholm

No commits in common. "stretch" and "master" have entirely different histories.
stretch ... master

6 changed files with 6 additions and 90 deletions
Show Stats Expand all files Collapse all files

83
src/freedombone-app-searx
View File

@ -256,7 +256,7 @@ function create_searx_config {
echo 'search:';
echo ' safe_search : 0 # Filter results. 0: None, 1: Moderate, 2: Strict';
echo ' autocomplete : "" # Existing autocomplete backends: "dbpedia", "duckduckgo", "startpage", "wikipedia" - leave blank to turn it off by default';
echo ' language : "en"';
echo ' language : "all"';
echo '';
echo 'server:';
echo " port : ${SEARX_PORT}";
@ -270,7 +270,7 @@ function create_searx_config {
echo ' static_path : "" # Custom static path - leave it blank if you didnt change';
echo ' templates_path : "" # Custom templates path - leave it blank if you didnt change';
echo ' themes_path : "" # Custom ui themes path';
echo ' default_theme : oscar # ui theme';
echo ' default_theme : courgette # ui theme';
echo ' default_locale : "" # Default interface locale - leave blank to detect from browser information or use codes from the "locales" config section';
echo '';
echo 'outgoing: # communication with search engines';
@ -286,7 +286,6 @@ function create_searx_config {
echo ' engine : archlinux';
echo ' categories : general';
echo ' shortcut : al';
echo ' disabled : True';
echo '';
echo ' - name : archive is';
echo ' engine : xpath';
@ -298,26 +297,6 @@ function create_searx_config {
echo ' timeout : 7.0';
echo ' disabled : True';
echo ' shortcut : ai';
echo '';
echo ' - name : arxiv
echo ' engine : arxiv
echo ' shortcut : arx
echo ' categories : science
echo ' timeout : 4.0
echo '';
echo ' - name : bing images
echo ' engine : bing_images
echo ' shortcut : bii
echo '';
echo ' - name : bing news
echo ' engine : bing_news
echo ' shortcut : bin
echo '';
echo ' - name : duckduckgo images
echo ' engine : duckduckgo_images
echo ' shortcut : ddi
echo ' timeout: 3.0
echo ' disabled : False
echo '';
echo ' - name : base';
echo ' engine : base';
@ -360,7 +339,6 @@ function create_searx_config {
echo ' content_query : fullCitation';
echo ' categories : science';
echo ' shortcut : cr';
echo ' disabled : True';
echo '';
echo ' - name : currency';
echo ' engine : currency_convert';
@ -426,7 +404,6 @@ function create_searx_config {
echo ' - name : 500px';
echo ' engine : www500px';
echo ' shortcut : px';
echo ' disabled : True';
echo '';
echo ' - name : 1x';
echo ' engine : www1x';
@ -471,28 +448,6 @@ function create_searx_config {
echo ' shortcut : gl';
echo ' timeout : 10.0';
echo ' disabled : False';
echo '';
echo ' - name : google videos
echo ' engine : google_videos
echo ' shortcut : gov
echo '';
echo ' - name : google news
echo ' engine : google_news
echo ' shortcut : gon
echo '';
echo ' - name : google scholar
echo ' engine : xpath
echo ' paging : True
echo ' search_url : https://scholar.google.com/scholar?start={pageno}&q={query}&hl=en&as_sdt=0,5&as_vis=1
echo ' results_xpath : //div[contains(@class, "gs_r")]/div[@class="gs_ri"]
echo ' url_xpath : .//h3/a/@href
echo ' title_xpath : .//h3/a
echo ' content_xpath : .//div[@class="gs_rs"]
echo ' suggestion_xpath : //div[@id="gs_qsuggest"]/ul/li
echo ' page_size : 10
echo ' first_page_num : 0
echo ' categories : science
echo ' shortcut : gos
echo '';
echo ' - name : github';
echo ' engine : github';
@ -580,30 +535,6 @@ function create_searx_config {
echo ' - name : openstreetmap';
echo ' engine : openstreetmap';
echo ' shortcut : osm';
echo '';
echo ' - name : openairedatasets
echo ' engine : json_engine
echo ' paging : True
echo ' search_url : http://api.openaire.eu/search/datasets?format=json&page={pageno}&size=10&title={query}
echo ' results_query : response/results/result
echo ' url_query : metadata/oaf:entity/oaf:result/children/instance/webresource/url/$
echo ' title_query : metadata/oaf:entity/oaf:result/title/$
echo ' content_query : metadata/oaf:entity/oaf:result/description/$
echo ' categories : science
echo ' shortcut : oad
echo ' timeout: 5.0
echo '';
echo ' - name : openairepublications
echo ' engine : json_engine
echo ' paging : True
echo ' search_url : http://api.openaire.eu/search/publications?format=json&page={pageno}&size=10&title={query}
echo ' results_query : response/results/result
echo ' url_query : metadata/oaf:entity/oaf:result/children/instance/webresource/url/$
echo ' title_query : metadata/oaf:entity/oaf:result/title/$
echo ' content_query : metadata/oaf:entity/oaf:result/description/$
echo ' categories : science
echo ' shortcut : oap
echo ' timeout: 5.0
echo '';
echo ' - name : openrepos';
echo ' engine : xpath';
@ -624,19 +555,12 @@ function create_searx_config {
echo ' - name : photon';
echo ' engine : photon';
echo ' shortcut : ph';
echo '';
echo ' - name : pubmed
echo ' engine : pubmed
echo ' shortcut : pub
echo ' categories: science
echo ' timeout : 3.0
echo '';
echo ' - name : piratebay';
echo ' engine : piratebay';
echo ' shortcut : tpb';
echo ' url: https://pirateproxy.red/';
echo ' timeout : 3.0';
echo ' disabled : True';
echo '';
echo ' - name : qwant';
echo ' engine : qwant';
@ -714,7 +638,6 @@ function create_searx_config {
echo '# The language is an option. You can put any language written in english';
echo '# Examples : English, French, German, Hungarian, Chinese...';
echo '# language : English';
echo ' disabled : True';
echo '';
echo ' - name : startpage';
echo ' engine : startpage';
@ -728,7 +651,6 @@ function create_searx_config {
echo " search_url : 'https://www.ixquick.eu/do/search'";
echo ' shortcut : iq';
echo ' timeout : 6.0';
echo ' disabled : True';
echo '';
echo ' - name : swisscows';
echo ' engine : swisscows';
@ -752,7 +674,6 @@ function create_searx_config {
echo ' title_xpath : //*[@class="def-header"]';
echo ' content_xpath : //*[@class="meaning"]';
echo ' shortcut : ud';
echo ' disabled : True';
echo '';
echo ' - name : yandex';
echo ' engine : yandex';

2
src/freedombone-app-xmpp
View File

@ -1146,7 +1146,7 @@ function install_xmpp {
fi
if ! grep -q "hidden_service_xmpp" "$ONION_SERVICES_FILE"; then
{ echo 'HiddenServiceDir /var/lib/tor/hidden_service_xmpp/';
echo 'HiddenServiceVersion 2';
echo 'HiddenServiceVersion 3';
echo "HiddenServicePort 5222 127.0.0.1:5222";
echo "HiddenServicePort 5269 127.0.0.1:5269"; } >> "$ONION_SERVICES_FILE"
echo $'Added onion site for xmpp chat'

2
src/freedombone-base-email
View File

@ -226,7 +226,7 @@ function create_email_onion_address {
email_hostname='/var/lib/tor/hidden_service_email/hostname'
if ! grep -q "hidden_service_email" $ONION_SERVICES_FILE; then
{ echo 'HiddenServiceDir /var/lib/tor/hidden_service_email/';
echo 'HiddenServiceVersion 2';
echo 'HiddenServiceVersion 3';
echo 'HiddenServicePort 25 127.0.0.1:25';
echo 'HiddenServicePort 587 127.0.0.1:587';
echo 'HiddenServicePort 465 127.0.0.1:465'; } >> $ONION_SERVICES_FILE

5
src/freedombone-image
View File

@ -717,11 +717,6 @@ if [[ $IMAGE_TYPE != "qemu"* ]]; then
echo ''
echo " xz --no-warn --verbose --keep --threads=0 -3 ${IMAGE_FILENAME}"
echo ''
echo $'To sign:'
echo ''
echo " gpg -ba ${IMAGE_FILENAME}.xz"
echo " mv ${IMAGE_FILENAME}.xz.asc ${IMAGE_FILENAME}.xz.sig"
echo ''
echo 'To copy to microSD, USB drive or SSD'
echo ''
echo ' sudo dd if=/dev/zero of=/dev/sdX bs=32M count=8'

2
src/freedombone-utils-go
View File

@ -30,7 +30,7 @@
# before getting to the version we want
GO_INTERMEDIATE_VERSION=1.4.2
GO_VERSION=1.10.3
GO_VERSION=1.9.4
GO_REPO="https://go.googlesource.com/go"
GO_PACKAGE_MANAGER_REPO="https://github.com/gpmgo/gopm"

2
src/freedombone-utils-onion
View File

@ -29,7 +29,7 @@
# The maximum amount of traffic per day in gigabytes
TOR_MAX_TRAFFIC_PER_MONTH_GB=10
USE_V2_ONION_ADDRESS=1
USE_V2_ONION_ADDRESS=
HIDDEN_SERVICE_PATH='/var/lib/tor/hidden_service_'
ONION_SERVICES_FILE=/etc/torrc.d/${PROJECT_NAME}