Merge pull request #98 from YunoHost-Apps/testing

Testing

README.md

@@ -24,7 +24,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 
 
-**Shipped version:** 2.0.1~ynh7
+**Shipped version:** 2.0.2~ynh9
 
 
 

README_fr.md

@@ -20,7 +20,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 
 
-**Version incluse :** 2.0.1~ynh7
+**Version incluse :** 2.0.2~ynh9
 
 
 

conf/openvpn@.service

@@ -1,5 +1,3 @@
-.include /lib/systemd/system/openvpn@.service
-
 [Service]
 Restart=always
 RestartSec=1

manifest.json

@@ -6,7 +6,7 @@
     "en": "Tunnel the internet traffic through a VPN",
     "fr": "Fait passer le trafic internet à travers un VPN"
   },
-  "version": "2.0.1~ynh7",
+  "version": "2.0.2~ynh9",
   "url": "https://labriqueinter.net",
   "license": "AGPL-3.0",
   "maintainer": {

scripts/_common.sh

@@ -25,10 +25,11 @@ function vpnclient_deploy_files_and_services()
   chown root:${app} /etc/openvpn/
   chmod 775 /etc/openvpn/
   mkdir -pm 0755 /etc/yunohost/hooks.d/post_iptable_rules/
+  mkdir -pm 0755 /etc/systemd/system/openvpn@.service.d/
 
   install -b -o root -g ${app} -m 0644 ../conf/openvpn_client.conf.tpl /etc/openvpn/client.conf.tpl
   install -b -o root -g root -m 0755 ../conf/hook_post-iptable-rules /etc/yunohost/hooks.d/90-vpnclient.tpl
-  install -b -o root -g root -m 0644 ../conf/openvpn@.service /etc/systemd/system/
+  install -b -o root -g root -m 0644 ../conf/openvpn@.service /etc/systemd/system/openvpn@.service.d/override.conf
 
   # Create certificates directory
   mkdir -pm 0770 /etc/openvpn/keys/

scripts/backup

@@ -50,7 +50,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"
+ynh_backup "/etc/systemd/system/openvpn@.service.d/override.conf"
 
 #=================================================
 # END OF SCRIPT

scripts/remove

@@ -68,7 +68,7 @@ ynh_secure_remove /etc/openvpn/client.conf.tpl
 ynh_secure_remove /etc/yunohost/hooks.d/90-vpnclient.tpl
 
 # Remove openvpn service
-ynh_secure_remove /etc/systemd/system/openvpn@.service
+ynh_secure_remove /etc/systemd/system/openvpn@.service.d/override.conf
 
 # Remove openvpn certificates
 ynh_secure_remove /etc/openvpn/keys

scripts/restore

@@ -64,7 +64,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"
+ynh_restore_file "/etc/systemd/system/openvpn@.service.d/override.conf"
 systemctl daemon-reload
 systemctl enable "$service_name.service" --quiet
 systemctl enable "$service_checker_name.service" --quiet

scripts/upgrade

@@ -20,6 +20,9 @@ app=$YNH_APP_INSTANCE_NAME
 
 dns_method=$(ynh_app_setting_get $app dns_method)
 nameservers=$(ynh_app_setting_get $app nameservers)
+service_enabled=$(ynh_app_setting_get $app service_enabled)
+ip6_addr=$(ynh_app_setting_get $app ip6_addr)
+ip6_net=$(ynh_app_setting_get $app ip6_net)
 
 #=================================================
 # SPECIAL UPGRADE FOR VERSIONS < 1.2.0
@@ -67,6 +70,23 @@ if [ -z "$nameservers" ]; then
     nameservers="$(grep -o -P '\s*nameserver\s+\K[abcdefabcdef\d.:]+' /etc/resolv.dnsmasq.conf | sort | uniq | paste -s -d, -)"
     ynh_app_setting_set --app=$app --key=nameservers --value="$nameservers"
 fi
+if [ -z "$service_enabled" ]; then
+    ynh_app_setting_set --app=$app --key=service_enabled --value=0
+fi
+if [ -z "$ip6_addr" ]; then
+    ynh_app_setting_set --app=$app --key=ip6_addr --value=""
+fi
+if [ -z "$ip6_net" ]; then
+    ynh_app_setting_set --app=$app --key=ip6_net --value=""
+fi
+
+#=================================================
+# UPGRADE FROM BUSTER TO BULLSEYE
+#=================================================
+
+if [ -e "/etc/systemd/system/openvpn@.service" ]; then
+  ynh_secure_remove "/etc/systemd/system/openvpn@.service"
+fi
 
 ##=================================================
 ## BACKUP BEFORE UPGRADE THEN ACTIVE TRAP