From 25f0a3018ac489a107b4677b2fe6f9792b05abb4 Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Sun, 17 Feb 2019 17:58:02 +0100 Subject: [PATCH] Cosmetic changes on info messages --- scripts/backup | 4 ++-- scripts/change_url | 6 +++--- scripts/install | 10 +++++----- scripts/remove | 6 +++--- scripts/restore | 10 +++++----- scripts/upgrade | 6 +++--- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/scripts/backup b/scripts/backup index 2779742..99570de 100755 --- a/scripts/backup +++ b/scripts/backup @@ -43,7 +43,7 @@ ynh_backup "$final_path" #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= -ynh_print_info "Backing up nginx configuration..." +ynh_print_info "Backing up nginx web server configuration..." ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" @@ -57,7 +57,7 @@ ynh_backup "/etc/php/7.0/fpm/pool.d/$app.conf" #================================================= # BACKUP THE MYSQL DATABASE #================================================= -ynh_print_info "Backing up the mysql database..." +ynh_print_info "Backing up the MySQL database..." ynh_mysql_dump_db "$db_name" > db.sql diff --git a/scripts/change_url b/scripts/change_url index c0d0372..93a67da 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -63,7 +63,7 @@ fi #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_print_info "Updating nginx configuration..." +ynh_print_info "Updating nginx web server configuration..." nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf @@ -100,7 +100,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_print_info "Reloading nginx..." +ynh_print_info "Reloading nginx web server..." systemctl reload nginx @@ -108,4 +108,4 @@ systemctl reload nginx # END OF SCRIPT #================================================= -ynh_print_info "Change of url completed for $app" +ynh_print_info "Change of URL completed for $app" diff --git a/scripts/install b/scripts/install index a6f2e60..1f0eb0d 100755 --- a/scripts/install +++ b/scripts/install @@ -105,7 +105,7 @@ ynh_install_app_dependencies deb1 deb2 #================================================= # CREATE A MYSQL DATABASE #================================================= -ynh_print_info "Creating a mysql database..." +ynh_print_info "Creating a MySQL database..." ### Use these lines if you need a database for the application. ### `ynh_mysql_setup_db` will create a database, an associated user and a ramdom password. @@ -136,7 +136,7 @@ ynh_setup_source "$final_path" #================================================= # NGINX CONFIGURATION #================================================= -ynh_print_info "Configuring nginx..." +ynh_print_info "Configuring nginx web server..." ### `ynh_add_nginx_config` will use the file conf/nginx.conf @@ -208,7 +208,7 @@ ynh_add_systemd_config chown -R $app: $final_path # Set the app as temporarily public for curl call -ynh_print_info "Configuring ssowat..." +ynh_print_info "Configuring SSOwat..." ynh_app_setting_set $app skipped_uris "/" # Reload SSOwat config yunohost app ssowatconf @@ -217,7 +217,7 @@ yunohost app ssowatconf systemctl reload nginx # Installation with curl -ynh_print_info "Finalizing install..." +ynh_print_info "Finalizing installation..." ynh_local_curl "/INSTALL_PATH" "key1=value1" "key2=value2" "key3=value3" # Remove the public access @@ -306,7 +306,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_print_info "Reloading nginx..." +ynh_print_info "Reloading nginx web server..." systemctl reload nginx diff --git a/scripts/remove b/scripts/remove index ee37fd5..08188af 100755 --- a/scripts/remove +++ b/scripts/remove @@ -38,7 +38,7 @@ fi #================================================= # STOP AND REMOVE SERVICE #================================================= -ynh_print_info "Stopping and removing the service" +ynh_print_info "Stopping and removing the systemd service" # Remove the dedicated systemd config ynh_remove_systemd_config @@ -46,7 +46,7 @@ ynh_remove_systemd_config #================================================= # REMOVE THE MYSQL DATABASE #================================================= -ynh_print_info "Removing the mysql database" +ynh_print_info "Removing the MySQL database" # Remove a database if it exists, along with the associated user ynh_mysql_remove_db $db_user $db_name @@ -70,7 +70,7 @@ ynh_secure_remove "$final_path" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_print_info "Removing nginx configuration" +ynh_print_info "Removing nginx web server configuration" # Remove the dedicated nginx config ynh_remove_nginx_config diff --git a/scripts/restore b/scripts/restore index 9fa5c6b..3806c0c 100755 --- a/scripts/restore +++ b/scripts/restore @@ -53,14 +53,14 @@ ynh_restore_file "/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_print_info "Restore the app main directory..." +ynh_print_info "Restoring the app main directory..." ynh_restore_file "$final_path" #================================================= # RECREATE THE DEDICATED USER #================================================= -ynh_print_info "Recreate the dedicated systen user..." +ynh_print_info "Recreating the dedicated systen user..." # Create the dedicated user (if not existing) ynh_system_user_create $app @@ -83,7 +83,7 @@ ynh_restore_file "/etc/php/7.0/fpm/pool.d/$app.conf" #================================================= # REINSTALL DEPENDENCIES #================================================= -ynh_print_info "Reinstall dependencies..." +ynh_print_info "Reinstalling dependencies..." # Define and install dependencies ynh_install_app_dependencies deb1 deb2 @@ -91,7 +91,7 @@ ynh_install_app_dependencies deb1 deb2 #================================================= # RESTORE THE MYSQL DATABASE #================================================= -ynh_print_info "Restoring the mysql database..." +ynh_print_info "Restoring the MySQL database..." db_pwd=$(ynh_app_setting_get $app mysqlpwd) ynh_mysql_setup_db $db_name $db_name $db_pwd @@ -128,7 +128,7 @@ ynh_restore_file "/etc/logrotate.d/$app" #================================================= # RELOAD NGINX AND PHP-FPM #================================================= -ynh_print_info "Reloading nginx and php-fpm..." +ynh_print_info "Reloading nginx web server and php-fpm..." systemctl reload php7.0-fpm systemctl reload nginx diff --git a/scripts/upgrade b/scripts/upgrade index e3013fe..4b4393b 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -53,7 +53,7 @@ fi #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_print_info "Backing up the app before upgrading... (may take a while)" +ynh_print_info "Backing up the app before upgrading (may take a while)..." # Backup the current version of the app ynh_backup_before_upgrade @@ -84,7 +84,7 @@ ynh_setup_source "$final_path" #================================================= # NGINX CONFIGURATION #================================================= -ynh_print_info "Upgrading nginx configuration..." +ynh_print_info "Upgrading nginx web server configuration..." # Create a dedicated nginx config ynh_add_nginx_config @@ -164,7 +164,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_print_info "Reloading nginx..." +ynh_print_info "Reloading nginx web server..." systemctl reload nginx