From 8b7c7a230e9f8b2c985b3374d379e854c5eb04c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 19 Feb 2023 11:21:27 +0100 Subject: [PATCH] Fix --- conf/config.json | 18 ++++-------------- scripts/install | 3 ++- scripts/restore | 4 ++-- scripts/upgrade | 3 ++- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/conf/config.json b/conf/config.json index 33b0920..74c4490 100644 --- a/conf/config.json +++ b/conf/config.json @@ -1,26 +1,16 @@ { "default_server_config": { - "m.homeserver": { - "base_url": "https://__DEFAULT_HOME_SERVER__" - }, - "m.identity_server": { - "base_url": "https://vector.im" - } + "m.homeserver": {"base_url": "https://__DEFAULT_HOME_SERVER__"}, + "m.identity_server": {"base_url": "https://vector.im"} }, "brand": "Element", "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api", "showLabsSettings": false, - "roomDirectory": { - "servers": [ - "matrix.org" - ] - }, + "roomDirectory": {"servers": ["matrix.org"]}, "enable_presence_by_hs_url": { "https://matrix.org": false, "https://matrix-client.matrix.org": false }, - "embedded_pages": { - "login_for_welcome": __LOGIN_FOR_WELCOME__ - } + "embedded_pages": {"login_for_welcome": __LOGIN_FOR_WELCOME__} } diff --git a/scripts/install b/scripts/install index e70f43e..4ef12fd 100644 --- a/scripts/install +++ b/scripts/install @@ -31,7 +31,8 @@ ynh_script_progression --message="Setting up source files..." --weight=4 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" -# Set permissions to app files +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" chown -R $app:www-data "$install_dir" #================================================= diff --git a/scripts/restore b/scripts/restore index ddd7edf..c891943 100644 --- a/scripts/restore +++ b/scripts/restore @@ -17,8 +17,8 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" -# Set permissions to app files -chown -R $app:www-data "$install_dir" +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" chmod 400 "$install_dir/config.json" chown $app:$app "$install_dir/config.json" diff --git a/scripts/upgrade b/scripts/upgrade index b465a99..4f159d5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -43,7 +43,8 @@ then ynh_setup_source --dest_dir="$install_dir" --keep="config.json" fi -# Set permissions to app files +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" chown -R $app:www-data "$install_dir" #=================================================