Merge pull request #88 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.2~ynh2
+**Shipped version:** 2.0.2~ynh4
 
 
 

README_fr.md

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

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.2~ynh2",
+  "version": "2.0.2~ynh4",
   "url": "https://labriqueinter.net",
   "license": "AGPL-3.0",
   "maintainer": {

scripts/config

@@ -243,9 +243,9 @@ ynh_app_config_validate() {
 
         # Build specific OVPN template
         tmp_dir=$(dirname "${config_file}")
-        cp -f /etc/openvpn/client.conf.tpl $tmp_dir/client.conf.tpl
+        cp -f /etc/yunohost/apps/vpnclient/conf/openvpn_client.conf.tpl $tmp_dir/client.conf.tpl
         # Remove some lines
-        for rm_regex in $(jq --raw-output '.openvpn_rm[]' "${config_file}")
+        jq --raw-output '.openvpn_rm[]' "${config_file}" | while read -r rm_regex
         do
             if [ ! -z "${rm_regex}" ] ; then
                 sed -i "/$rm_regex/d" $tmp_dir/client.conf.tpl