YunoHost-Apps/mautrix_signal_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/mautrix_signal_ynh.git synced 2024-09-03 19:46:07 +02:00
Code Issues Activity Actions

init tags listuser,admin,relay

Browse source
This commit is contained in:
Gredin67 2023-01-10 03:36:38 +01:00 • committed by GitHub
parent d1fe7772be
commit d3f9fb9624
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 38 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
conf/config.yaml
View file

@ -234,9 +234,9 @@ bridge:
# domain - All users on that homeserver # domain - All users on that homeserver
# mxid - Specific user # mxid - Specific user
permissions: permissions:
"__RELAYUSERS__": "relay" "__LISTRELAY__": "relay"
"__BOTUSERS__": "user" "__LISTUSER__": "user"
"__BOTADMIN__": "admin" "__LISTADMIN__": "admin"
relay: relay:
# Whether relay mode should be allowed. If allowed, `!signal set-relay` can be used to turn any # Whether relay mode should be allowed. If allowed, `!signal set-relay` can be used to turn any

3
config_panel.toml
View file

@ -162,19 +162,16 @@ services = ["__APP__"]
ask = "Users" ask = "Users"
type = "tags" type = "tags"
visible = "role == 'user'" visible = "role == 'user'"
bind = "permissions>__BOTUSERS__:__FINALPATH__/config.yaml"
[usermanagement.config.listadmin] [usermanagement.config.listadmin]
ask = "Admins" ask = "Admins"
type = "tags" type = "tags"
visible = "role == 'admin'" visible = "role == 'admin'"
bind = "permissions>__BOTADMIN__:__FINALPATH__/config.yaml"
[usermanagement.config.listrelay] [usermanagement.config.listrelay]
ask = "Relay users" ask = "Relay users"
type = "tags" type = "tags"
visible = "role == 'relay'" visible = "role == 'relay'"
bind = "permissions>__RELAYUSERS:__FINALPATH__/config.yaml"
[usermanagement.config.role] [usermanagement.config.role]
ask = "Role" ask = "Role"

16
scripts/install
View file

@ -27,8 +27,8 @@ synapsenumber=$YNH_APP_ARG_SYNAPSENUMBER
botname=$YNH_APP_ARG_BOTNAME botname=$YNH_APP_ARG_BOTNAME
bot_synapse_adm=true bot_synapse_adm=true
encryption=false encryption=false
botadmin=$YNH_APP_ARG_BOTADMIN listadmin=$YNH_APP_ARG_BOTADMIN
botusers=$YNH_APP_ARG_BOTUSERS listuser=$YNH_APP_ARG_BOTUSERS
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME
@ -47,9 +47,9 @@ bot_synapse_db_user="@$botname:$server_name"
synapse_db_name="matrix_$synapse_instance" synapse_db_name="matrix_$synapse_instance"
signald_user="signald" # This is actually chosen by the signald dependency signald_user="signald" # This is actually chosen by the signald dependency
if [ "$botusers" == "local" ] if [ "$listuser" == "local" ]
then then
botusers=$server_name listuser=$server_name
fi fi
#================================================= #=================================================
@ -69,7 +69,7 @@ contact_list_names="disallow"
federate_rooms=true federate_rooms=true
encryption_default=false encryption_default=false
print_level="INFO" print_level="INFO"
relayusers="*" listrelay="*"
ynh_app_setting_set --app=$app --key=appserviceid --value=$appserviceid ynh_app_setting_set --app=$app --key=appserviceid --value=$appserviceid
ynh_app_setting_set --app=$app --key=displayname --value=$displayname ynh_app_setting_set --app=$app --key=displayname --value=$displayname
@ -84,7 +84,7 @@ ynh_app_setting_set --app=$app --key=contact_list_names --value=$contact_list_na
ynh_app_setting_set --app=$app --key=federate_rooms --value=$federate_rooms ynh_app_setting_set --app=$app --key=federate_rooms --value=$federate_rooms
ynh_app_setting_set --app=$app --key=encryption_default --value=$encryption_default ynh_app_setting_set --app=$app --key=encryption_default --value=$encryption_default
ynh_app_setting_set --app=$app --key=print_level --value=$print_level ynh_app_setting_set --app=$app --key=print_level --value=$print_level
ynh_app_setting_set --app=$app --key=relayusers --value=$relayusers ynh_app_setting_set --app=$app --key=listrelay --value=$listrelay
#================================================= #=================================================
# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
@ -102,8 +102,8 @@ ynh_script_progression --message="Storing installation settings..." --weight=7
ynh_app_setting_set --app=$app --key=botname --value=$botname 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=bot_synapse_adm --value=$bot_synapse_adm
ynh_app_setting_set --app=$app --key=encryption --value=$encryption 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=listuser --value=$listuser
ynh_app_setting_set --app=$app --key=botusers --value=$botusers 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=synapse_instance --value=$synapse_instance
ynh_app_setting_set --app=$app --key=server_name --value=$server_name ynh_app_setting_set --app=$app --key=server_name --value=$server_name
ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=domain --value=$domain

37
scripts/upgrade
View file

@ -16,10 +16,6 @@ ynh_script_progression --message="Loading installation settings..." --weight=1
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME
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) domain=$(ynh_app_setting_get --app=$app --key=domain)
final_path=$(ynh_app_setting_get --app=$app --key=final_path) final_path=$(ynh_app_setting_get --app=$app --key=final_path)
previous_mautrix_version=$(ynh_app_setting_get --app=$app --key=mautrix_version) previous_mautrix_version=$(ynh_app_setting_get --app=$app --key=mautrix_version)
@ -32,12 +28,12 @@ server_name=$(ynh_app_setting_get --app=$app --key=server_name)
mautrix_version=$(ynh_app_upstream_version) mautrix_version=$(ynh_app_upstream_version)
synapse_db_name="matrix_$synapse_instance" synapse_db_name="matrix_$synapse_instance"
signald_user="signald" # This is actually chosen by the signald dependency signald_user="signald" # This is actually chosen by the signald dependency
enable_relaybot=true
#================================================= #=================================================
# GET CONFIG PANEL SETTINGS # GET CONFIG PANEL SETTINGS
#================================================= #=================================================
appserviceid=$(ynh_app_setting_get --app=$app --key=appserviceid) appserviceid=$(ynh_app_setting_get --app=$app --key=appserviceid)
botname=$(ynh_app_setting_get --app=$app --key=botname)
displayname=$(ynh_app_setting_get --app=$app --key=displayname) displayname=$(ynh_app_setting_get --app=$app --key=displayname)
avatar=$(ynh_app_setting_get --app=$avatar --key=avatar) avatar=$(ynh_app_setting_get --app=$avatar --key=avatar)
ephemeral_events=$(ynh_app_setting_get --app=$app --key=ephemeral_events) ephemeral_events=$(ynh_app_setting_get --app=$app --key=ephemeral_events)
@ -48,10 +44,13 @@ enable_disappearing_messages_in_groups=$(ynh_app_setting_get --app=$app --key=en
username_template=$(ynh_app_setting_get --app=$app --key=username_template) username_template=$(ynh_app_setting_get --app=$app --key=username_template)
contact_list_names=$(ynh_app_setting_get --app=$app --key=contact_list_names) contact_list_names=$(ynh_app_setting_get --app=$app --key=contact_list_names)
federate_rooms=$(ynh_app_setting_get --app=$app --key=federate_rooms) federate_rooms=$(ynh_app_setting_get --app=$app --key=federate_rooms)
encryption=$(ynh_app_setting_get --app=$app --key=encryption)
encryption_default=$(ynh_app_setting_get --app=$app --key=encryption_default) encryption_default=$(ynh_app_setting_get --app=$app --key=encryption_default)
print_level=$(ynh_app_setting_get --app=$app --key=print_level) print_level=$(ynh_app_setting_get --app=$app --key=print_level)
relayusers=$(ynh_app_setting_get --app=$app --key=relayusers) 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)
enable_relaybot=$(ynh_app_setting_get --app=$app --key=enable_relaybot)
#================================================= #=================================================
# CHECK VERSION # CHECK VERSION
@ -161,10 +160,28 @@ then
ynh_app_setting_set --app=$app --key=print_level --value=$print_level ynh_app_setting_set --app=$app --key=print_level --value=$print_level
fi fi
if [ -z "$relayusers" ] if [ -z "$listrelay" ]
then then
relayusers="*" listrelay="*"
ynh_app_setting_set --app=$app --key=relayusers --value=$relayusers ynh_app_setting_set --app=$app --key=listrelay --value=$listrelay
fi
if [ -z "$listuser" ]
then
listuser=$(ynh_app_setting_get --app=$app --key=botusers)
ynh_app_setting_set --app=$app --key=listuser --value=$listuser
fi
if [ -z "$listadmin" ]
then
listadmin=$(ynh_app_setting_get --app=$app --key=botadmin)
ynh_app_setting_set --app=$app --key=listadmin --value=$listadmin
fi
if [ -z "$enable_relaybot" ]
then
enable_relaybot=true
ynh_app_setting_set --app=$app --key=enable_relaybot --value=$enable_relaybot
fi fi
# Fix possible permission issues with a previous signald version, esp. with stickers # Fix possible permission issues with a previous signald version, esp. with stickers