diff options
| -rw-r--r-- | manifest.toml | 1 | ||||
| -rw-r--r-- | scripts/install | 4 | ||||
| -rw-r--r-- | scripts/upgrade | 14 | ||||
| -rw-r--r-- | scripts/ynh_add_swap | 4 |
4 files changed, 13 insertions, 10 deletions
diff --git a/manifest.toml b/manifest.toml index 2e00d20..4e2591d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -61,7 +61,6 @@ ram.runtime = "500M" allow_email = true [resources.install_dir] - group = "www-data:r-x" [resources.permissions] main.url = "/" diff --git a/scripts/install b/scripts/install index 6808c69..6608646 100644 --- a/scripts/install +++ b/scripts/install @@ -17,6 +17,10 @@ ynh_script_progression "Setting up source files..." ynh_setup_source --dest_dir="$install_dir/live" +chmod -R 775 "$install_dir" +chmod o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" + #================================================= # INSTALL DEPENDENCIES #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ed19b64..d9fa23f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -83,14 +83,14 @@ ynh_nodejs_install # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -# FIXME: this is still supported but the recommendation is now to *always* re-setup the app sources wether or not the upstream sources changed -if ynh_app_upstream_version_changed -then - ynh_script_progression "Upgrading source files..." +ynh_script_progression "Upgrading source files..." - # Download, check integrity, uncompress and patch the source from manifest.toml - ynh_setup_source --dest_dir="$install_dir/live" --full_replace --keep="public/system .env.production" -fi +# Download, check integrity, uncompress and patch the source from manifest.toml +ynh_setup_source --dest_dir="$install_dir/live" --full_replace --keep="public/system .env.production" + +chmod -R 775 "$install_dir" +chmod o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" #================================================= # BUILD ASSETS diff --git a/scripts/ynh_add_swap b/scripts/ynh_add_swap index aa82c51..f99e1a7 100644 --- a/scripts/ynh_add_swap +++ b/scripts/ynh_add_swap @@ -22,14 +22,14 @@ ynh_add_swap () { # Can't swap inside an LXD if [ "$(systemd-detect-virt)" == "lxc" ] then - ynh_print_warn --message="You are inside a LXC container, swap will not be added, but that can cause troubles for the app $app. Please make sure you have more than 2.5G available RAM." + ynh_print_warn "You are inside a LXC container, swap will not be added, but that can cause troubles for the app $app. Please make sure you have more than 2.5G available RAM." return fi # Swap on SD card only if it's is specified if ynh_is_main_device_a_sd_card && [ "$SD_CARD_CAN_SWAP" == "0" ] then - ynh_print_warn --message="The main mountpoint of your system '/' is on an SD card, swap will not be added to prevent some damage of this one, but that can cause troubles for the app $app. If you still want activate the swap, you can relaunch the command preceded by 'SD_CARD_CAN_SWAP=1'" + ynh_print_warn "The main mountpoint of your system '/' is on an SD card, swap will not be added to prevent some damage of this one, but that can cause troubles for the app $app. If you still want activate the swap, you can relaunch the command preceded by 'SD_CARD_CAN_SWAP=1'" return fi |