Install 'network-config' and dont follow symlinks for backup

Author: aw

.github/workflows/main.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         arch: ['src64']
-        version: ['17.12', '18.6', '18.12', '19.6', 'latest']
+        version: ['17.12', '18.6', '18.12', '19.6', '19.12', 'latest']
         ansible: ['1.8.4', '2.7']
 
     steps:

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.25.0 (2020-02-18)
+
+  * Install the 'network-config' file if it exists
+  * Ensure backup tar doesn't follow symlinks
+
 ## 1.24.0 (2019-10-31)
 
   * Update JSON dependency to v4.1.0

roles/admin/templates/update_backup.sh.j2

@@ -2,7 +2,7 @@
 #
 # Generic script for starting and stopping a backup
 #
-# Copyright (c) 2013-2017 Alex Williams, Unscramble. See the LICENSE file (MIT).
+# Copyright (c) 2013-2020 Alex Williams, Unscramble. See the LICENSE file (MIT).
 # https://unscramble.co.jp
 #
 # VERSION: {{ jidoteki_admin_version }}
@@ -53,14 +53,14 @@ start_backup() {
 
   backup_all_files=$(cd $restore_path; find $backup_list -maxdepth 0 -print)
   disk_available=`/bin/df -k / | tail -n 1 | awk -F " " ' {print $4 }'`
-  backup_size=$((`/bin/tar -C $restore_path -ch $backup_all_files -f - | wc -c` / 1024))
+  backup_size=$((`/bin/tar -C $restore_path -c $backup_all_files -f - | wc -c` / 1024))
   backup_safeguard=$(($disk_available - 16384)) # 16 MiB in KiB
 
   if [ "$backup_size" -lt "$backup_safeguard" ]; then
     echo "[`date +%s`][{{ admin_type }}] Starting backup" | log_output
 
     # generate the backup archive
-    /bin/tar -C "$restore_path" -chf "$backup_file" $backup_all_files || fail_and_exit
+    /bin/tar -C "$restore_path" -cf "$backup_file" $backup_all_files || fail_and_exit
 
     # generate the JSON status file
     filesize=`/usr/bin/du -ha $backup_file | awk '{print $1 }'`

roles/admin/templates/update_settings.sh.j2

@@ -2,7 +2,7 @@
 #
 # Generic script for updating the network and app settings
 #
-# Copyright (c) 2013-2016 Alex Williams, Unscramble. See the LICENSE file (MIT).
+# Copyright (c) 2013-2020 Alex Williams, Unscramble. See the LICENSE file (MIT).
 # https://unscramble.co.jp
 #
 # VERSION: {{ jidoteki_admin_version }}
@@ -47,6 +47,11 @@ move_settings_files() {
     mv -f network.conf /usr/local/etc/
     chmod 640 "/usr/local/etc/network.conf" ; chown 0:997 "/usr/local/etc/network.conf"
   fi
+
+  if [ -f "network-config" ]; then
+    mv -f network-config /etc/sysconfig/network-config
+    chmod 644 "/etc/sysconfig/network-config" ; chown 0:0 "/etc/sysconfig/network-config"
+  fi
 }
 
 save_network_settings() {