Merge pull request #286 from return42/patches-from-allendema
Cherry pick some fixes from @allendema
This commit is contained in:
		
						commit
						018537080c
					
				| @ -10,9 +10,9 @@ import random | |||||||
| 
 | 
 | ||||||
| # about | # about | ||||||
| about = { | about = { | ||||||
|     "website": 'https://instances.invidio.us/', |     "website": 'https://api.invidious.io/', | ||||||
|     "wikidata_id": 'Q79343316', |     "wikidata_id": 'Q79343316', | ||||||
|     "official_api_documentation": 'https://github.com/omarroth/invidious/wiki/API', |     "official_api_documentation": 'https://github.com/iv-org/documentation/blob/master/API.md', | ||||||
|     "use_official_api": True, |     "use_official_api": True, | ||||||
|     "require_api_key": False, |     "require_api_key": False, | ||||||
|     "results": 'JSON', |     "results": 'JSON', | ||||||
|  | |||||||
| @ -1,6 +1,6 @@ | |||||||
| # SPDX-License-Identifier: AGPL-3.0-or-later | # SPDX-License-Identifier: AGPL-3.0-or-later | ||||||
| """ | """ | ||||||
|  Wikipedia (Web |  Rumble (Videos) | ||||||
| """ | """ | ||||||
| from urllib.parse import urlencode | from urllib.parse import urlencode | ||||||
| from lxml import html | from lxml import html | ||||||
|  | |||||||
| @ -207,7 +207,7 @@ install_all() { | |||||||
|     wait_key |     wait_key | ||||||
|     echo |     echo | ||||||
|     if ! service_is_available "http://${FILTRON_LISTEN}" ; then |     if ! service_is_available "http://${FILTRON_LISTEN}" ; then | ||||||
|         err_msg "Filtron does not listening on: http://${FILTRON_LISTEN}" |         err_msg "Filtron is not listening on: http://${FILTRON_LISTEN}" | ||||||
|     fi |     fi | ||||||
|     if apache_is_installed; then |     if apache_is_installed; then | ||||||
|         info_msg "Apache is installed on this host." |         info_msg "Apache is installed on this host." | ||||||
| @ -375,7 +375,7 @@ EOF | |||||||
|     fi |     fi | ||||||
| 
 | 
 | ||||||
|     if ! service_is_available "http://${FILTRON_LISTEN}" ; then |     if ! service_is_available "http://${FILTRON_LISTEN}" ; then | ||||||
|         err_msg "Filtron does not listening on: http://${FILTRON_LISTEN}" |         err_msg "Filtron is not listening on: http://${FILTRON_LISTEN}" | ||||||
|     fi |     fi | ||||||
| 
 | 
 | ||||||
|     if service_is_available "http://${FILTRON_TARGET}" ; then |     if service_is_available "http://${FILTRON_TARGET}" ; then | ||||||
|  | |||||||
| @ -221,7 +221,7 @@ install_all() { | |||||||
|     systemd_install_service "${SERVICE_NAME}" "${SERVICE_SYSTEMD_UNIT}" |     systemd_install_service "${SERVICE_NAME}" "${SERVICE_SYSTEMD_UNIT}" | ||||||
|     wait_key |     wait_key | ||||||
|     if ! service_is_available "http://${MORTY_LISTEN}" ; then |     if ! service_is_available "http://${MORTY_LISTEN}" ; then | ||||||
|         err_msg "Morty does not listening on: http://${MORTY_LISTEN}" |         err_msg "Morty is not listening on: http://${MORTY_LISTEN}" | ||||||
|     fi |     fi | ||||||
|     if apache_is_installed; then |     if apache_is_installed; then | ||||||
|         info_msg "Apache is installed on this host." |         info_msg "Apache is installed on this host." | ||||||
| @ -359,7 +359,7 @@ EOF | |||||||
|     fi |     fi | ||||||
| 
 | 
 | ||||||
|     if ! service_is_available "http://${MORTY_LISTEN}" ; then |     if ! service_is_available "http://${MORTY_LISTEN}" ; then | ||||||
|         err_msg "Morty does not listening on: http://${MORTY_LISTEN}" |         err_msg "Morty is not listening on: http://${MORTY_LISTEN}" | ||||||
|         echo -e "${_Green}stop with [${_BCyan}CTRL-C${_Green}] or .." |         echo -e "${_Green}stop with [${_BCyan}CTRL-C${_Green}] or .." | ||||||
|         wait_key |         wait_key | ||||||
|     fi |     fi | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user