1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/mautrix_whatsapp_ynh.git synced 2024-09-03 19:46:01 +02:00

Merge pull request #148 from YunoHost-Apps/testing

Testing to master [Fix Bookworm CI and database name]
This commit is contained in:
Salamandar 2024-06-20 19:31:22 +02:00 committed by GitHub
commit 970d014992
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 15 additions and 5 deletions

View file

@ -1,5 +1,15 @@
#!/bin/bash #!/bin/bash
#=================================================
# PERSONAL HELPERS
#=================================================
get_synapse_db_name() {
# Parameters: synapse instance identifier
# Returns: database name
ynh_app_setting_get --app="$1" --key=db_name
}
#================================================= #=================================================
# CONFIG PANEL SETTERS # CONFIG PANEL SETTERS
#================================================= #=================================================
@ -56,4 +66,4 @@ set__listadmin() {
ynh_app_setting_set --app=$app --key=listadmin --value="$listadmin" ynh_app_setting_set --app=$app --key=listadmin --value="$listadmin"
apply_permissions apply_permissions
ynh_store_file_checksum --file="$install_dir/config.yaml" ynh_store_file_checksum --file="$install_dir/config.yaml"
} }

View file

@ -14,7 +14,7 @@ server_name=$(ynh_app_setting_get --app $synapse_instance --key server_name)
domain=$(ynh_app_setting_get --app $synapse_instance --key domain) domain=$(ynh_app_setting_get --app $synapse_instance --key domain)
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
synapse_db_name="matrix_$synapse_instance" synapse_db_name="$(get_synapse_db_name $synapse_instance)"
# This is needed to convert the value from the manifest to a valid value for the config.yaml file. # This is needed to convert the value from the manifest to a valid value for the config.yaml file.
# Without this the install script will throw a warning. # Without this the install script will throw a warning.

View file

@ -17,7 +17,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=5
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME
db_user=$db_name db_user=$db_name
synapse_db_name="matrix_$synapse_instance" synapse_db_name="$(get_synapse_db_name $synapse_instance)"
bot_synapse_db_user="@""$botname"":""$server_name" bot_synapse_db_user="@""$botname"":""$server_name"
#================================================= #=================================================

View file

@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers
server_name=$(ynh_app_setting_get --app=$app --key=server_name) server_name=$(ynh_app_setting_get --app=$app --key=server_name)
synapse_db_name="matrix_$synapse_instance" synapse_db_name="$(get_synapse_db_name $synapse_instance)"
bot_synapse_db_user="@$botname:$server_name" bot_synapse_db_user="@$botname:$server_name"
#================================================= #=================================================

View file

@ -11,7 +11,7 @@ source /usr/share/yunohost/helpers
server_name=$(ynh_app_setting_get --app=$app --key=server_name) server_name=$(ynh_app_setting_get --app=$app --key=server_name)
synapse_db_name="matrix_$synapse_instance" synapse_db_name="$(get_synapse_db_name $synapse_instance)"
bot_synapse_db_user="@$botname:$server_name" bot_synapse_db_user="@$botname:$server_name"
#================================================= #=================================================