Browse Source

Fix backup/restore, again

Kayou 6 years ago
parent
commit
d015446ff7
2 changed files with 4 additions and 4 deletions
  1. 2 2
      scripts/backup
  2. 2 2
      scripts/restore

+ 2 - 2
scripts/backup

@@ -43,7 +43,7 @@ ynh_backup "/usr/local/bin/ipv6_expanded"
 ynh_backup "/usr/local/bin/ipv6_compressed"
 ynh_backup "/usr/local/bin/$service_name-loadcubefile.sh"
 
-ynh_backup "/etc/yunohost/hooks.d/90-vpnclient"
+ynh_backup "/etc/yunohost/hooks.d/90-vpnclient.tpl"
 
 ynh_backup "/etc/openvpn/client.conf.tpl"
 ynh_backup "/etc/openvpn/client.conf.tpl.restore"
@@ -51,7 +51,6 @@ ynh_backup "/etc/openvpn/keys/"
 
 ynh_backup "/usr/local/bin/$service_name"
 ynh_backup "/usr/local/bin/$service_checker_name.sh"
-ynh_backup "/usr/local/bin/$service_checker_name.timer"
 
 #=================================================
 # BACKUP THE NGINX CONFIGURATION
@@ -76,6 +75,7 @@ ynh_print_info "Backing up systemd configuration..."
 
 ynh_backup "/etc/systemd/system/$service_name.service"
 ynh_backup "/etc/systemd/system/$service_checker_name.service"
+ynh_backup "/etc/systemd/system/$service_checker_name.timer"
 ynh_backup "/etc/systemd/system/openvpn@.service"
 
 #=================================================

+ 2 - 2
scripts/restore

@@ -60,7 +60,7 @@ ynh_restore_file "/usr/local/bin/ipv6_expanded"
 ynh_restore_file "/usr/local/bin/ipv6_compressed"
 ynh_restore_file "/usr/local/bin/$service_name-loadcubefile.sh"
 
-ynh_restore_file "/etc/yunohost/hooks.d/90-vpnclient"
+ynh_restore_file "/etc/yunohost/hooks.d/90-vpnclient.tpl"
 
 ynh_restore_file "/etc/openvpn/client.conf.tpl"
 ynh_restore_file "/etc/openvpn/client.conf.tpl.restore"
@@ -68,7 +68,6 @@ ynh_restore_file "/etc/openvpn/keys/"
 
 ynh_restore_file "/usr/local/bin/$service_name"
 ynh_restore_file "/usr/local/bin/$service_checker_name.sh"
-ynh_restore_file "/usr/local/bin/$service_checker_name.timer"
 
 #=================================================
 # RECREATE THE DEDICATED USER
@@ -108,6 +107,7 @@ ynh_print_info "Restoring the systemd configuration..."
 
 ynh_restore_file "/etc/systemd/system/$service_name.service"
 ynh_restore_file "/etc/systemd/system/$service_checker_name.service"
+ynh_restore_file "/etc/systemd/system/$service_checker_name.timer"
 ynh_restore_file "/etc/systemd/system/openvpn@.service"
 systemctl enable "$service_name.service"
 systemctl enable "$service_checker_name.service"