From 3bce373847bcb012f72da704047591e3af53e99d Mon Sep 17 00:00:00 2001 From: anmol26s Date: Tue, 9 Feb 2021 00:24:55 +0530 Subject: [PATCH] Added geventwebsocket module --- README.md | 6 +++--- check_process | 24 +++++++++++------------- scripts/install | 6 +++--- scripts/remove | 2 +- scripts/restore | 10 +--------- scripts/upgrade | 10 +--------- 6 files changed, 20 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index 8c98979..b4eb840 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ZeroNet for YunoHost -[![Integration level](https://dash.yunohost.org/integration/zeronet.svg)](https://dash.yunohost.org/appci/app/zeronet) ![](https://ci-apps.yunohost.org/ci/badges/zeronet.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/zeronet.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/zeronet.svg)](https://dash.yunohost.org/appci/app/zeronet) ![](https://ci-apps.yunohost.org/ci/badges/zeronet.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/zeronet.maintain.svg) [![Install ZeroNet with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=zeronet) *[Lire ce readme en français.](./README_fr.md)* @@ -44,8 +44,8 @@ Are LDAP and HTTP auth supported? No #### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/REPLACEBYYOURAPP%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/REPLACEBYYOURAPP/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/REPLACEBYYOURAPP%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/REPLACEBYYOURAPP/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/zeronet%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/zeronet/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/zeronet%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/zeronet/) ## Limitations diff --git a/check_process b/check_process index e1028e4..25c2bab 100644 --- a/check_process +++ b/check_process @@ -1,6 +1,5 @@ -;; Nom du test - auto_remove=1 -# Commentaire ignoré +;; Complete Test +# Comment ignored ; Manifest domain="sub.domain.tld" (DOMAIN) # path="/" (PATH) @@ -19,13 +18,12 @@ # setup_private=0 test disabled because app is always installed as private setup_public=0 upgrade=1 - backup_restore=1 - multi_instance=0 -# multi_instance=1 test disabled because it requires installation on sub-path which is not available. successfully conducted test manually - wrong_user=1 - wrong_path=0 - incorrect_path=0 -# corrupt_source=0 - fail_download_source=0 - port_already_use=1 (66) - final_path_already_use=1 + backup_restore=1 + multi_instance=q +;;; Options +Email= +Notification=none +;;; Upgrade options + ; commit=CommitHash + name=Name and date of the commit. + manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1&password=pass& \ No newline at end of file diff --git a/scripts/install b/scripts/install index 676cc94..b594621 100755 --- a/scripts/install +++ b/scripts/install @@ -74,7 +74,7 @@ ynh_script_progression --message="Installing dependencies..." ynh_install_app_dependencies $pkg_dependencies -pip3 install msgpack-python gevent base58 merkletools rsa PySocks pyasn1 websocket_client gevent-ws coincurve maxminddb +pip3 install gevent-websocket msgpack-python gevent base58 merkletools rsa PySocks pyasn1 websocket_client gevent-ws coincurve maxminddb #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -142,10 +142,10 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="$datadir/log #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring SSOwat..." +ynh_script_progression --message="Configuring permissions..." # Allow the app to be public -ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" +ynh_permission_update --permission="main" --add="visitors" #================================================= # RELOAD NGINX diff --git a/scripts/remove b/scripts/remove index a4ff691..3e6e221 100755 --- a/scripts/remove +++ b/scripts/remove @@ -49,7 +49,7 @@ ynh_remove_systemd_config ynh_script_progression --message="Removing dependencies..." # Remove metapackage and its dependencies -pip3 uninstall -y msgpack-python gevent base58 merkletools rsa PySocks pyasn1 websocket_client gevent-ws coincurve maxminddb +pip3 uninstall -y gevent-websocket msgpack-python gevent base58 merkletools rsa PySocks pyasn1 websocket_client gevent-ws coincurve maxminddb ynh_remove_app_dependencies #================================================= diff --git a/scripts/restore b/scripts/restore index 6e07ce6..9ba2eaa 100755 --- a/scripts/restore +++ b/scripts/restore @@ -84,7 +84,7 @@ ynh_script_progression --message="Reinstalling dependencies..." # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies -pip3 install msgpack-python gevent base58 merkletools rsa PySocks pyasn1 websocket_client gevent-ws coincurve maxminddb +pip3 install gevent-websocket msgpack-python gevent base58 merkletools rsa PySocks pyasn1 websocket_client gevent-ws coincurve maxminddb #================================================= # RESTORE SYSTEMD @@ -108,14 +108,6 @@ ynh_script_progression --message="Starting a systemd service..." ynh_systemd_action --service_name=$app --action="start" --log_path="$datadir/log/debug-last.log" --line_match="Ui.UiServer Web interface" --timeout=120 -#================================================= -# SETUP SSOWAT -#================================================= -ynh_script_progression --message="Upgrading SSOwat configuration..." - -# Allow the app to be public -ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 4e3f6ad..e72b2a3 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -92,7 +92,7 @@ ynh_script_progression --message="Upgrading dependencies..." ynh_install_app_dependencies $pkg_dependencies -pip3 install msgpack-python gevent base58 merkletools rsa PySocks pyasn1 websocket_client gevent-ws coincurve maxminddb +pip3 install gevent-websocket msgpack-python gevent base58 merkletools rsa PySocks pyasn1 websocket_client gevent-ws coincurve maxminddb #================================================= # CREATE DEDICATED USER @@ -138,14 +138,6 @@ ynh_script_progression --message="Starting a systemd service..." ynh_systemd_action --service_name=$app --action="start" --log_path="$datadir/log/debug-last.log" --line_match="Ui.UiServer Web interface" --timeout=120 -#================================================= -# SETUP SSOWAT -#================================================= -ynh_script_progression --message="Upgrading SSOwat configuration..." - -# Allow the app to be public -ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" - #================================================= # RELOAD NGINX #=================================================