diff --git a/scripts/install b/scripts/install index 34521fc..e5cc70e 100644 --- a/scripts/install +++ b/scripts/install @@ -20,8 +20,9 @@ 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" -chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" +chmod -R u=rX,g=X,o= "$install_dir" +chmod -R u=rX,g=rX,o= "$install_dir/www" #================================================= # SYSTEM CONFIGURATION @@ -51,6 +52,9 @@ ynh_add_config --template="config.local.php" --destination="$install_dir/config. chmod 650 "$install_dir/config.local.php" chown $app:$app "$install_dir/config.local.php" +chown -R $app:www-data "$data_dir/" +chmod -R u=rwX,g=,o= "$data_dir/" + #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index c778d29..e5c1ce7 100644 --- a/scripts/restore +++ b/scripts/restore @@ -17,8 +17,9 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" -chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" +chmod -R u=rX,g=X,o= "$install_dir" +chmod -R u=rX,g=rX,o= "$install_dir/www" #================================================= # RESTORE THE DATA DIRECTORY @@ -27,6 +28,9 @@ ynh_script_progression --message="Restoring the data directory..." --weight=1 ynh_restore_file --origin_path="$data_dir" --not_mandatory +chown -R $app:www-data "$data_dir/" +chmod -R u=rwX,g=,o= "$data_dir/" + #================================================= # RESTORE SYSTEM CONFIGURATIONS #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index a6ff68c..b5aae11 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -70,8 +70,8 @@ then ynh_setup_source --dest_dir="$install_dir" --keep="config.local.php data/plugins" fi -chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" +chmod 650 "$install_dir/config.local.php" +chown $app:$app "$install_dir/config.local.php" #================================================= # REAPPLY SYSTEM CONFIGURATIONS @@ -103,6 +103,8 @@ chown $app:$app "$install_dir/config.local.php" ynh_replace_string --match_string="//require '$data_dir/data/config.local.user.php';" --replace_string="require '$data_dir/data/config.local.user.php';" --target_file="$install_dir/config.local.php" +chmod -R u=rX,g=X,o= "$install_dir" +chmod -R u=rX,g=rX,o= "$install_dir/www" #================================================= # ADD A CONFIG FILE #================================================= @@ -110,11 +112,11 @@ ynh_replace_string --match_string="//require '$data_dir/data/config.local.user.p if [ ! -d "$data_dir/data" ]; then ynh_script_progression --message="Adding a configuration directory..." --weight=5 mkdir "$data_dir/data" - chmod 770 "$data_dir/data" chown -R $app:www-data "$data_dir/data" + chmod -R u=rwX,g=,o= "$data_dir/data" else - chown -R $app:www-data "$data_dir/data/cache" - chown $app:www-data "$data_dir/data/index.html" + chown -R $app:www-data "$data_dir/data" + chmod -R u=rwX,g=,o= "$data_dir/data" fi if [ ! -f "$data_dir/data/config.local.user.php" ]; then