simplify a bit logs migration

scripts/upgrade

@@ -44,6 +44,13 @@ if [ -e "/etc/openvpn/client.conf.tpl" ]; then
   ynh_safe_rm "/etc/openvpn/client.conf.tpl"
 fi
 
+# Fixing incorrect logrotate config
+if grep -q -e "/var/log/ynh-vpnclient.log" -e "/var/log/openvpn-client.log" "/etc/logrotate.d/$app"; then
+  ynh_config_remove_logrotate
+  chmod 0755 /var/log
+  chown root:root /var/log
+fi
+
 # New stuff
 
 ynh_app_setting_set_default --key="dns_method" --value="custom"
@@ -71,26 +78,6 @@ ynh_print_info "Stopping VPN client to apply config changes..."
 ynh_systemctl --action="stop" --service="$service_checker_name.timer"
 yunohost service stop $service_name
 
-# Moving log files from legacy location
-if [[ -e "/var/log/openvpn-client.log" ]]; then
-  mkdir -p "/var/log/$app"
-  mv "/var/log/openvpn-client.log" "/var/log/$app/"
-fi
-if [[ -e "/var/log/openvpn-client.status" ]]; then
-  mkdir -p "/var/log/$app"
-  mv "/var/log/openvpn-client.status" "/var/log/$app/"
-fi
-if [[ -e "/var/log/ynh-vpnclient.log" ]]; then
-  mkdir -p "/var/log/$app"
-  mv "/var/log/ynh-vpnclient.log" "/var/log/$app/"
-fi
-# Fixing incorrect logrotate config
-if grep -q -e "/var/log/ynh-vpnclient.log" -e "/var/log/openvpn-client.log" "/etc/logrotate.d/$app"; then
-  ynh_config_remove_logrotate
-  chmod 0755 /var/log
-  chown root:root /var/log
-fi
-
 # Keep a copy of existing config files before overwriting them
 tmp_dir=$(mktemp -d /tmp/vpnclient-upgrade-XXX)
 for config_file in /etc/openvpn/client.{conf,cube,ovpn}; do
@@ -138,6 +125,17 @@ yunohost service add $service_name --description "Tunnels the internet traffic t
 
 ynh_config_add_logrotate
 
+# Moving log files from legacy location
+if [[ -e "/var/log/openvpn-client.log" ]]; then
+  mv "/var/log/openvpn-client.log" "/var/log/$app/"
+fi
+if [[ -e "/var/log/openvpn-client.status" ]]; then
+  mv "/var/log/openvpn-client.status" "/var/log/$app/"
+fi
+if [[ -e "/var/log/ynh-vpnclient.log" ]]; then
+  mv "/var/log/ynh-vpnclient.log" "/var/log/$app/"
+fi
+
 # checker service (this service was previously integrated in yunohost but we do not do this anymore)
 if ynh_hide_warnings yunohost service status $service_checker_name >/dev/null
 then