diff --git a/scripts/change_url b/scripts/change_url index 51a3236..ff06606 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -24,7 +24,7 @@ app=$YNH_APP_INSTANCE_NAME #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=1 # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get --app=$app --key=final_path) @@ -32,7 +32,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --time --weight=1 +ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 # Backup the current version of the app ynh_backup_before_upgrade @@ -65,7 +65,7 @@ fi #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating NGINX web server configuration..." --time --weight=1 +ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf @@ -94,7 +94,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload @@ -102,4 +102,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Change of URL completed for $app" --time --last +ynh_script_progression --message="Change of URL completed for $app" --last diff --git a/scripts/install b/scripts/install index 1d67987..7922ff8 100644 --- a/scripts/install +++ b/scripts/install @@ -87,10 +87,6 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" -# chmod 750 "$final_path" -# chmod -R o-rwx "$final_path" -# chown -R $app:www-data "$final_path" - #================================================= # NGINX CONFIGURATION #================================================= diff --git a/scripts/restore b/scripts/restore index 70d862b..c7cb1b9 100644 --- a/scripts/restore +++ b/scripts/restore @@ -66,26 +66,22 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$final_path" -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" - #================================================= # RESTORE USER RIGHTS #================================================= -# # Set permissions on app files -# chown -R root: $final_path +# Set permissions on app files +chown -R root: $final_path -# # Remove permission to others than $app and www-data (nginx user) -# chmod o-rwx $final_path -# chown $app:www-data $final_path +# Remove permission to others than $app and www-data (nginx user) +chmod o-rwx $final_path +chown $app:www-data $final_path -# chown -R $app $final_path/assets -# chown -R $app $final_path/protected/config -# chown -R $app $final_path/protected/modules -# chown -R $app $final_path/protected/runtime -# chown -R $app $final_path/uploads/* +chown -R $app $final_path/assets +chown -R $app $final_path/protected/config +chown -R $app $final_path/protected/modules +chown -R $app $final_path/protected/runtime +chown -R $app $final_path/uploads #================================================= # REINSTALL DEPENDENCIES diff --git a/scripts/upgrade b/scripts/upgrade index 02ce7dd..5091ad5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -95,10 +95,6 @@ then ynh_secure_remove --file="$final_path.old" fi -# chmod 750 "$final_path" -# chmod -R o-rwx "$final_path" -# chown -R $app:www-data "$final_path" - #================================================= # UPGRADE DEPENDENCIES #================================================= @@ -138,18 +134,14 @@ ynh_replace_string --match_string="defined('YII_ENV') or define('YII_ENV', 'dev' #================================================= # MIGRATE DATABASE #================================================= -ynh_script_progression --message="Migrating database..." --weight=1 +ynh_script_progression --message="Migrating database and modules..." --weight=1 -chown -R $app $final_path/ +chown -R $app $final_path -sudo -u $app /usr/bin/php$YNH_PHP_VERSION $final_path/protected/yii migrate/up --includeModuleMigrations=1 - -#================================================= -# UPDATE MODULES -#================================================= -ynh_script_progression --message="Updating modules..." --weight=1 - -sudo -u $app /usr/bin/php$YNH_PHP_VERSION $final_path/protected/yii module/update-all +pushd $final_path + php$phpversion protected/yii migrate/up --includeModuleMigrations=1 + php$phpversion protected/yii module/update-all +popd #================================================= # REINSTALL CRONTAB