This commit is contained in:
rosbeef andino 2022-12-18 13:27:52 +00:00 committed by GitHub
commit 171f7019af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 6 deletions

View file

@ -11,7 +11,7 @@ bridge:
bindAddress: localhost bindAddress: localhost
# Public domain of the homeserver # Public domain of the homeserver
domain: __DOMAIN__ domain: __USER_DOMAIN__
# Reachable URL of the Matrix homeserver # Reachable URL of the Matrix homeserver
homeserverUrl: https://__DOMAIN__ homeserverUrl: https://__DOMAIN__

View file

@ -20,7 +20,8 @@
"email": "florent.git@zeteo.me" "email": "florent.git@zeteo.me"
}, },
"requirements": { "requirements": {
"yunohost": ">= 4.1.0" "yunohost": ">= 4.1.0",
"synapse": ">=1.0.0"
}, },
"multi_instance": true, "multi_instance": true,
"services": [ "services": [
@ -32,13 +33,15 @@
"name": "synapsenumber", "name": "synapsenumber",
"type": "string", "type": "string",
"ask": { "ask": {
"en": "Choose the local synapse instance number to communicate with the Discord-Matrix bridge", "en": "Choose the local synapse instance number to communicate with the Discord-Matrix bridge.",
"fr": "Choisissez le numéro de l'instance synapse qui doit communiquer avec la passerelle Discord-Matrix" "fr": "Choisissez le numéro de l'instance synapse qui doit communiquer avec la passerelle Discord-Matrix.",
"es": "Elije el numero de la instancia que se communicara con esta passarella Discord."
}, },
"example": "2 (for instance synapse__2)", "example": "2 (for instance synapse__2)",
"help": { "help": {
"en": "If you installed synapse only once time, then leave default value 1.", "en": "If you installed synapse only once time, then leave default value 1.",
"fr": "Si vous n'avez installé qu'une fois synapse, gardez la valeur par défaut 1." "fr": "Si vous n'avez installé qu'une fois synapse, gardez la valeur par défaut 1.",
"es": "Si synapse esta installado una sola vez, deje el valor en 1. "
}, },
"default": "1" "default": "1"
} }

View file

@ -29,6 +29,7 @@ app=$YNH_APP_INSTANCE_NAME
final_path=$(ynh_app_setting_get --app=$app --key=final_path) final_path=$(ynh_app_setting_get --app=$app --key=final_path)
domain=$(ynh_app_setting_get --app=$app --key=domain) domain=$(ynh_app_setting_get --app=$app --key=domain)
user_domain=$(ynh_app_setting_get --app=$app --key=user_domain)
db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_name=$(ynh_app_setting_get --app=$app --key=db_name)
log_path=$(ynh_app_setting_get --app=$app --key=log_path) log_path=$(ynh_app_setting_get --app=$app --key=log_path)
etc_path=$(ynh_app_setting_get --app=$app --key=etc_path) etc_path=$(ynh_app_setting_get --app=$app --key=etc_path)

View file

@ -45,6 +45,7 @@ fi
server_name=$(ynh_app_setting_get --app $synapse_instance --key server_name) 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)
user_domain=$(ynh_app_setting_get --app=$synapse_instance --key=server_name)
app_service_registration_path="/etc/matrix-$synapse_instance/app-service" app_service_registration_path="/etc/matrix-$synapse_instance/app-service"
log_path="/var/log/$app" log_path="/var/log/$app"
base_config_path="$final_path/base.config.yaml" base_config_path="$final_path/base.config.yaml"
@ -63,6 +64,7 @@ test ! -e "$final_path" || ynh_die --message="This path already contains a folde
ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_script_progression --message="Storing installation settings..." --weight=1
ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=domain --value=$domain
ynh_app_setting_set --app=$app --key=user_domain --value=$user_domain
ynh_app_setting_set --app=$app --key=log_path --value=$log_path ynh_app_setting_set --app=$app --key=log_path --value=$log_path
ynh_app_setting_set --app=$app --key=app_service_registration_path --value=$app_service_registration_path ynh_app_setting_set --app=$app --key=app_service_registration_path --value=$app_service_registration_path
ynh_app_setting_set --app=$app --key=synapse_instance --value=$synapse_instance ynh_app_setting_set --app=$app --key=synapse_instance --value=$synapse_instance
@ -151,7 +153,7 @@ ynh_app_setting_set --app=$app --key=etc_path --value=$etc_path
mkdir -p -m 750 "$etc_path" mkdir -p -m 750 "$etc_path"
chown "$app:$app" "$etc_path" chown "$app:$app" "$etc_path"
any_account_of_domain="@.*:${domain//\./\\\.}" any_account_of_domain="@.*:${user_domain//\./\\\.}"
# TODO Add a way to override the config.yaml file # TODO Add a way to override the config.yaml file
ynh_add_config --template="base.config.yaml" --destination="$base_config_path" ynh_add_config --template="base.config.yaml" --destination="$base_config_path"

View file

@ -17,6 +17,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get --app=$app --key=domain) domain=$(ynh_app_setting_get --app=$app --key=domain)
user_domain=$(ynh_app_setting_get --app=$app --key=user_domain)
port=$(ynh_app_setting_get --app=$app --key=port) port=$(ynh_app_setting_get --app=$app --key=port)
db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_name=$(ynh_app_setting_get --app=$app --key=db_name)
db_user=$db_name db_user=$db_name

View file

@ -28,6 +28,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get --app=$app --key=domain) domain=$(ynh_app_setting_get --app=$app --key=domain)
user_domain=$(ynh_app_setting_get --app=$app --key=user_domain)
path_url=$(ynh_app_setting_get --app=$app --key=path) path_url=$(ynh_app_setting_get --app=$app --key=path)
final_path=$(ynh_app_setting_get --app=$app --key=final_path) final_path=$(ynh_app_setting_get --app=$app --key=final_path)
db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_name=$(ynh_app_setting_get --app=$app --key=db_name)

View file

@ -17,6 +17,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME
domain=$(ynh_app_setting_get --app=$app --key=domain) domain=$(ynh_app_setting_get --app=$app --key=domain)
user_domain=$(ynh_app_setting_get --app=$app --key=user_domain)
path_url=$(ynh_app_setting_get --app=$app --key=path) path_url=$(ynh_app_setting_get --app=$app --key=path)
language=$(ynh_app_setting_get --app=$app --key=language) language=$(ynh_app_setting_get --app=$app --key=language)
admin=$(ynh_app_setting_get --app=$app --key=admin) admin=$(ynh_app_setting_get --app=$app --key=admin)
@ -32,6 +33,11 @@ user_config_path="$etc_path/user.config.yaml"
pip_path="$final_path/.pip" pip_path="$final_path/.pip"
app_service_registration_path=$(ynh_app_setting_get --app=$app --key=app_service_registration_path) app_service_registration_path=$(ynh_app_setting_get --app=$app --key=app_service_registration_path)
if [ -z "$user_domain" ]; then
user_domain=$domain
ynh_app_setting_set --app=$app --key=user_domain --value=$domain
fi
#================================================= #=================================================
# CHECK VERSION # CHECK VERSION
#================================================= #=================================================