diff --git a/conf/default_matrix-synapse b/conf/default_matrix-synapse deleted file mode 100644 index abb2d4c..0000000 --- a/conf/default_matrix-synapse +++ /dev/null @@ -1,3 +0,0 @@ -# Specify environment variables used when running Synapse -# SYNAPSE_CACHE_FACTOR=1 (default) - diff --git a/conf/synapse.service b/conf/synapse.service index fc6737e..ab8a2fc 100644 --- a/conf/synapse.service +++ b/conf/synapse.service @@ -7,7 +7,6 @@ Type=simple User=__APP__ WorkingDirectory=/opt/yunohost/matrix-__APP__ BindPaths=/etc/matrix-__APP__ -EnvironmentFile=/etc/default/matrix-__APP__ ExecStartPre=/opt/yunohost/matrix-__APP__/bin/python -m synapse.app.homeserver --config-path=/etc/matrix-__APP__/homeserver.yaml --config-path=/etc/matrix-__APP__/conf.d/ --generate-keys ExecStart=/opt/yunohost/matrix-__APP__/bin/python -m synapse.app.homeserver --config-path=/etc/matrix-__APP__/homeserver.yaml --config-path=/etc/matrix-__APP__/conf.d/ Restart=always diff --git a/scripts/backup b/scripts/backup index ec25863..4b419cb 100644 --- a/scripts/backup +++ b/scripts/backup @@ -70,7 +70,6 @@ ynh_backup --src_path="/etc/matrix-$app" # BACKUP SYSTEMD #================================================= -ynh_backup --src_path="/etc/default/matrix-$app" ynh_backup --src_path="/etc/systemd/system/$app.service" ynh_backup --src_path="/etc/default/coturn-$app" ynh_backup --src_path="/etc/systemd/system/$app-coturn.service" diff --git a/scripts/install b/scripts/install index 7b066f2..3e4a44b 100644 --- a/scripts/install +++ b/scripts/install @@ -191,7 +191,6 @@ ynh_app_setting_set --app=$app --key=macaroon_secret_key --value="$macaroon_secr ynh_script_progression --message="Configuring a systemd service..." --weight=2 # Create systemd service for synapse and turnserver -cp ../conf/default_matrix-synapse /etc/default/matrix-$app ynh_add_systemd_config --service=$app --template=synapse.service cp ../conf/default_coturn /etc/default/coturn-$app diff --git a/scripts/remove b/scripts/remove index ff6731b..530f533 100755 --- a/scripts/remove +++ b/scripts/remove @@ -43,7 +43,6 @@ ynh_script_progression --message="Removing app main directory" --weight=2 ynh_secure_remove --file=$code_dir ynh_secure_remove --file=/var/log/matrix-$app ynh_secure_remove --file=/etc/matrix-$app -ynh_secure_remove --file=/etc/default/matrix-$app ynh_secure_remove --file=/etc/default/coturn-$app ynh_secure_remove --file=/etc/nginx/conf.d/${server_name}.d/${app}_server_name.conf diff --git a/scripts/upgrade b/scripts/upgrade index f1ce94d..79897f4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -460,7 +460,6 @@ yunohost service add $app-coturn --needs_exposed_ports $port_turnserver_tls --de ynh_script_progression --message="Upgrading systemd configuration..." --weight=3 # Create systemd service for synapse and turnserver -cp ../conf/default_matrix-synapse /etc/default/matrix-$app ynh_add_systemd_config --service=$app --template=synapse.service cp ../conf/default_coturn /etc/default/coturn-$app