mirror of
https://github.com/YunoHost-Apps/mautrix_whatsapp_ynh.git
synced 2024-09-03 19:46:01 +02:00
init tags listuser,admin,relay
This commit is contained in:
Gredin67
GitHub
parent
f151a35cda
commit
83cb70b7ed
4 changed files with 41 additions and 40 deletions
|
|
@ -75,7 +75,7 @@ metrics:
|
|||
# Enable prometheus metrics?
|
||||
enabled: __ENABLE_METRICS__
|
||||
# IP and port where the metrics listener should be. The path is always /metrics
|
||||
listen: __METRICS_LISTEN_PORT__
|
||||
listen: __LISTEN_PORT__
|
||||
|
||||
# Config for things that are directly sent to WhatsApp.
|
||||
whatsapp:
|
||||
|
|
@ -395,11 +395,9 @@ bridge:
|
|||
# domain - All users on that homeserver
|
||||
# mxid - Specific user
|
||||
permissions:
|
||||
"*": relay
|
||||
#"example.com": user
|
||||
"__BOTUSERS__": user
|
||||
#"@admin:example.com": admin
|
||||
"__BOTADMIN__": admin
|
||||
"__LISTRELAY__": relay
|
||||
"__LISTUSER__": user
|
||||
"__LISTADMIN__": admin
|
||||
|
||||
# Settings for relay mode
|
||||
relay:
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ services = ["__APP__"]
|
|||
no = "false"
|
||||
bind = "metrics>enabled:__FINALPATH__/config.yaml"
|
||||
|
||||
[appservice.metrics.metrics_listen_port]
|
||||
[appservice.metrics.listen_port]
|
||||
ask = "IP and Port for the Metrics listener?"
|
||||
type = "string"
|
||||
help = "Defaults to: '127.0.0.1:8001'. The path is always /metrics"
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ synapsenumber=$YNH_APP_ARG_SYNAPSENUMBER
|
|||
botname=$YNH_APP_ARG_BOTNAME
|
||||
bot_synapse_adm=$YNH_APP_ARG_BOT_SYNAPSE_ADM
|
||||
encryption=$YNH_APP_ARG_ENCRYPTION
|
||||
botadmin=$YNH_APP_ARG_BOTADMIN
|
||||
botusers=$YNH_APP_ARG_BOTUSERS
|
||||
listadmin=$YNH_APP_ARG_BOTADMIN
|
||||
listuser=$YNH_APP_ARG_BOTUSERS
|
||||
|
||||
app=$YNH_APP_INSTANCE_NAME
|
||||
|
||||
|
|
@ -44,9 +44,9 @@ server_name=$(ynh_app_setting_get --app $synapse_instance --key server_name)
|
|||
domain=$(ynh_app_setting_get --app $synapse_instance --key domain)
|
||||
synapse_db_name="matrix_$synapse_instance"
|
||||
|
||||
if [ "$botusers" == "local" ]
|
||||
if [ "$listuser" == "local" ]
|
||||
then
|
||||
botusers="$server_name"
|
||||
listuser="$server_name"
|
||||
fi
|
||||
|
||||
#=================================================
|
||||
|
|
@ -58,7 +58,7 @@ displayname="WhatsApp bridge bot"
|
|||
avatar="mxc://maunium.net/NeXNQarUbrlYBiPCpprYsRqr"
|
||||
ephemeral_events="true"
|
||||
enable_metrics="false"
|
||||
metrics_listen_port="127.0.0.1:8001"
|
||||
listen_port="127.0.0.1:8001"
|
||||
os_name="Mautrix-WhatsApp bridge"
|
||||
browser_name="unknown"
|
||||
username_template="whatsapp_{{.}}"
|
||||
|
|
@ -68,19 +68,17 @@ send_presence_on_typing="false"
|
|||
url_previews="false"
|
||||
encryption_default="false"
|
||||
encryption_require="false"
|
||||
enable_relaybot="true"
|
||||
admin_only="true"
|
||||
print_level="INFO"
|
||||
existingUsers=$botusers
|
||||
existingAdmins=$botadmin
|
||||
existingRelayUsers="*"
|
||||
enable_relaybot="true"
|
||||
listrelay="*"
|
||||
|
||||
ynh_app_setting_set --app=$app --key=async_media --value=$async_media
|
||||
ynh_app_setting_set --app=$app --key=displayname --value=$displayname
|
||||
ynh_app_setting_set --app=$app --key=avatar --value=$avatar
|
||||
ynh_app_setting_set --app=$app --key=ephemeral_events --value=$ephemeral_events
|
||||
ynh_app_setting_set --app=$app --key=enable_metrics --value=$enable_metrics
|
||||
ynh_app_setting_set --app=$app --key=metrics_listen_port --value=$metrics_listen_port
|
||||
ynh_app_setting_set --app=$app --key=listen_port --value=$listen_port
|
||||
ynh_app_setting_set --app=$app --key=os_name --value=$os_name
|
||||
ynh_app_setting_set --app=$app --key=browser_name --value=$browser_name
|
||||
ynh_app_setting_set --app=$app --key=username_template --value=$username_template
|
||||
|
|
@ -93,9 +91,7 @@ ynh_app_setting_set --app=$app --key=encryption_require --value=$encryption_requ
|
|||
ynh_app_setting_set --app=$app --key=enable_relaybot --value=$enable_relaybot
|
||||
ynh_app_setting_set --app=$app --key=admin_only --value=$admin_only
|
||||
ynh_app_setting_set --app=$app --key=print_level --value=$print_level
|
||||
ynh_app_setting_set --app=$app --key=existingUsers --value=$existingUsers
|
||||
ynh_app_setting_set --app=$app --key=existingAdmins --value=$existingAdmins
|
||||
ynh_app_setting_set --app=$app --key=existingRelayUsers --value=$existingRelayUsers
|
||||
ynh_app_setting_set --app=$app --key=listrelay --value=$listrelay
|
||||
|
||||
#=================================================
|
||||
# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
|
||||
|
|
@ -114,8 +110,8 @@ ynh_app_setting_set --app=$app --key=appserviceid --value=$appserviceid
|
|||
ynh_app_setting_set --app=$app --key=botname --value=$botname
|
||||
ynh_app_setting_set --app=$app --key=bot_synapse_adm --value=$bot_synapse_adm
|
||||
ynh_app_setting_set --app=$app --key=encryption --value=$encryption
|
||||
ynh_app_setting_set --app=$app --key=botadmin --value=$botadmin
|
||||
ynh_app_setting_set --app=$app --key=botusers --value=$botusers
|
||||
ynh_app_setting_set --app=$app --key=listuser --value=$listuser
|
||||
ynh_app_setting_set --app=$app --key=listadmin --value=$listadmin
|
||||
ynh_app_setting_set --app=$app --key=synapse_instance --value=$synapse_instance
|
||||
ynh_app_setting_set --app=$app --key=server_name --value=$server_name
|
||||
ynh_app_setting_set --app=$app --key=domain --value=$domain
|
||||
|
|
|
|||
|
|
@ -19,8 +19,6 @@ app=$YNH_APP_INSTANCE_NAME
|
|||
appserviceid=$(ynh_app_setting_get --app=$app --key=appserviceid)
|
||||
botname=$(ynh_app_setting_get --app=$app --key=botname)
|
||||
encryption=$(ynh_app_setting_get --app=$app --key=encryption)
|
||||
botadmin=$(ynh_app_setting_get --app=$app --key=botadmin)
|
||||
botusers=$(ynh_app_setting_get --app=$app --key=botusers)
|
||||
domain=$(ynh_app_setting_get --app=$app --key=domain)
|
||||
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
||||
db_name=$(ynh_app_setting_get --app=$app --key=db_name)
|
||||
|
|
@ -40,7 +38,7 @@ displayname=$(ynh_app_setting_get --app=$app --key=displayname)
|
|||
avatar=$(ynh_app_setting_get --app=$app --key=avatar)
|
||||
ephemeral_events=$(ynh_app_setting_get --app=$app --key=ephemeral_events)
|
||||
enable_metrics=$(ynh_app_setting_get --app=$app --key=enable_metrics)
|
||||
metrics_listen_port=$(ynh_app_setting_get --app=$app --key=metrics_listen_port)
|
||||
listen_port=$(ynh_app_setting_get --app=$app --key=listen_port)
|
||||
os_name=$(ynh_app_setting_get --app=$app --key=os_name)
|
||||
browser_name=$(ynh_app_setting_get --app=$app --key=browser_name)
|
||||
username_template=$(ynh_app_setting_get --app=$app --key=username_template)
|
||||
|
|
@ -53,9 +51,9 @@ encryption_require=$(ynh_app_setting_get --app=$app --key=encryption_require)
|
|||
enable_relaybot=$(ynh_app_setting_get --app=$app --key=enable_relaybot)
|
||||
admin_only=$(ynh_app_setting_get --app=$app --key=admin_only)
|
||||
print_level=$(ynh_app_setting_get --app=$app --key=print_level)
|
||||
existingUsers=$(ynh_app_setting_get --app=$app --key=existingUsers)
|
||||
existingAdmins=$(ynh_app_setting_get --app=$app --key=existingAdmins)
|
||||
existingRelayUsers=$(ynh_app_setting_get --app=$app --key=existingRelayUsers)
|
||||
listrelay=$(ynh_app_setting_get --app=$app --key=listrelay)
|
||||
listuser=$(ynh_app_setting_get --app=$app --key=listuser)
|
||||
listadmin=$(ynh_app_setting_get --app=$app --key=listadmin)
|
||||
|
||||
|
||||
#=================================================
|
||||
|
|
@ -120,10 +118,10 @@ then
|
|||
enable_metrics="false"
|
||||
ynh_app_setting_set --app=$app --key=enable_metrics --value=$enable_metrics
|
||||
fi
|
||||
if [ -z "$metrics_listen_port" ]
|
||||
if [ -z "$listen_port" ]
|
||||
then
|
||||
metrics_listen_port="127.0.0.1:8001"
|
||||
ynh_app_setting_set --app=$app --key=metrics_listen_port --value=$metrics_listen_port
|
||||
listen_port="127.0.0.1:8001"
|
||||
ynh_app_setting_set --app=$app --key=listen_port --value=$listen_port
|
||||
fi
|
||||
if [ -z "$os_name" ]
|
||||
then
|
||||
|
|
@ -185,20 +183,29 @@ then
|
|||
print_level="INFO"
|
||||
ynh_app_setting_set --app=$app --key=print_level --value=$print_level
|
||||
fi
|
||||
if [ -z "$existingUsers" ]
|
||||
if [ -z "$listrelay" ]
|
||||
then
|
||||
existingUsers=$botusers
|
||||
ynh_app_setting_set --app=$app --key=existingUsers --value=$existingUsers
|
||||
listrelay="*"
|
||||
ynh_app_setting_set --app=$app --key=listrelay --value=$listrelay
|
||||
fi
|
||||
if [ -z "$existingAdmins" ]
|
||||
if [ -z "$enable_relaybot" ]
|
||||
then
|
||||
existingAdmins=$botadmin
|
||||
ynh_app_setting_set --app=$app --key=existingAdmins --value=$existingAdmins
|
||||
enable_relaybot="true"
|
||||
ynh_app_setting_set --app=$app --key=enable_relaybot --value=$enable_relaybot
|
||||
fi
|
||||
if [ -z "$existingRelayUsers" ]
|
||||
|
||||
if [ -z "$listuser" ]
|
||||
then
|
||||
existingRelayUsers="*"
|
||||
ynh_app_setting_set --app=$app --key=existingRelayUsers --value=$existingRelayUsers
|
||||
listuser=$(ynh_app_setting_get --app=$app --key=botusers)
|
||||
ynh_app_setting_set --app=$app --key=listuser --value=$listuser
|
||||
ynh_app_setting_delete --app=$app --key=botusers
|
||||
fi
|
||||
|
||||
if [ -z "$listadmin" ]
|
||||
then
|
||||
listadmin=$(ynh_app_setting_get --app=$app --key=botadmin)
|
||||
ynh_app_setting_set --app=$app --key=listadmin --value=$listadmin
|
||||
ynh_app_setting_delete --app=$app --key=botadmin
|
||||
fi
|
||||
|
||||
#=================================================
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue