Просмотр исходного кода

Make package_check.sh better score

root 7 лет назад
Родитель
Сommit
7e5a166842
3 измененных файлов с 5 добавлено и 6 удалено
  1. 2 2
      check_process
  2. 1 2
      scripts/backup
  3. 2 2
      scripts/restore

+ 2 - 2
check_process

@@ -23,8 +23,8 @@
 		backup_restore=1
 		multi_instance=0
 		incorrect_path=1
-		port_already_use=0
-		change_url=0
+		port_already_use=1
+		change_url=1
 ;;; Levels
 	Level 1=auto
 	Level 2=auto

+ 1 - 2
scripts/backup

@@ -24,7 +24,7 @@ ynh_abort_if_errors
 # LOAD SETTINGS
 #=================================================
 
-app=$YNH_APP_INSTANCE_NAME
+app="zabbix"
 
 final_path=$(ynh_app_setting_get $app final_path)
 domain=$(ynh_app_setting_get $app domain)
@@ -51,7 +51,6 @@ ynh_backup "/etc/zabbix/zabbix_agentd.d"
 #=================================================
 
 ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf"
-
 #=================================================
 # BACKUP THE PHP-FPM CONFIGURATION
 #=================================================

+ 2 - 2
scripts/restore

@@ -83,13 +83,13 @@ ynh_app_setting_set $app final_path $final_path
 
 # Create a dedicated nginx config
 
-ynh_restore_file "/etc/nginx/conf.d/mike.test.d/ynhzabbix.conf"
+ynh_restore_file "/etc/nginx/conf.d/mike.test.d/$app.conf"
 
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
 
-ynh_restore_file "/etc/php/7.0/fpm/pool.d/ynhzabbix.conf"
+ynh_restore_file "/etc/php/7.0/fpm/pool.d/$app.conf"
 
 
 # Reload SSOwat config