Browse Source

fix config template location when the app is upgraded

HgO 6 days ago
parent
commit
3fe3e13149
3 changed files with 4 additions and 1 deletions
  1. 0 1
      scripts/_common.sh
  2. 2 0
      scripts/config
  3. 2 0
      scripts/upgrade

+ 0 - 1
scripts/_common.sh

@@ -104,7 +104,6 @@ function convert_cube_file()
 
   # Build specific OVPN template
   config_template="$tmp_dir/client.conf.tpl"
-  cp -f /etc/yunohost/apps/vpnclient/conf/openvpn_client.conf.tpl "$config_template"
   # Remove some lines
   jq --raw-output '.openvpn_rm[]' "${config_file}" | while read -r rm_regex
   do

+ 2 - 0
scripts/config

@@ -198,6 +198,8 @@ ynh_app_config_validate() {
 
                 cube_file="$tmp_dir/client.cube"
                 cp -f "$config_file" "$cube_file"
+                # We copy the config template because it will be modified later
+                cp -f "/etc/yunohost/apps/vpnclient/conf/openvpn_client.conf.tpl" "$tmp_dir/client.conf.tpl"
 
                 convert_cube_file "$config_file"
             # Othewise, assume that it's a .ovpn / .conf

+ 2 - 0
scripts/upgrade

@@ -93,6 +93,8 @@ vpnclient_deploy_files_and_services
 if [[ -f "$tmp_dir/client.cube" ]]
 then
     cp -f "$tmp_dir/client.cube" "$tmp_dir/client.conf"
+    # We copy the config template because it will be modified later
+    cp -f "../conf/openvpn_client.conf.tpl" "$tmp_dir/client.conf.tpl"
     convert_cube_file "$tmp_dir/client.conf"
 elif [[ -f "$tmp_dir/client.ovpn" ]]
 then