Add replication script and merge network settings (static/dhcp)

Author: aw

CHANGELOG.md

@@ -1,9 +1,12 @@
 # Changelog
 
-## 1.17.0 (TBD)
+## 1.17.0 (2017-11-01)
 
   * Output more detailed info when creating a backup
   * Ensure license.asc has correct permissions
+  * Fix minor issues in 'backup' script
+  * Add 'replication' script for handling replication settings
+  * Merge network settings commands for dhcp/static
 
 ## 1.16.0 (2017-10-02)
 

README.md

@@ -11,6 +11,7 @@ This repository contains bash scripts, ansible roles, and other files needed to
 * Ansible 1.5.x
 * curl
 * sha1sum (from core-utils)
+* [symlinktool](https://github.com/aw/tinycore-symlinktool) for running backups
 
 ## Ansible roles
 

group_vars/images

@@ -5,4 +5,4 @@ admin_type: LIVE IMAGE
 admin_type_lowcase: live image
 ssh_path: /usr/local/etc/ssh
 
-jidoteki_admin_version: 1.16.0
+jidoteki_admin_version: 1.17.0

roles/admin/tasks/main.yml

@@ -67,6 +67,7 @@
     - update_debug.sh
     - update_license.sh
     - update_logs.sh
+    - update_replication.sh
     - update_services.sh
     - update_settings.sh
     - update_storage.sh

roles/admin/templates/update_replication.sh.j2

@@ -0,0 +1,62 @@
+#!/bin/sh
+#
+# Generic script for updating the replication settings
+#
+# Copyright (c) 2013-2017 Alex Williams, Unscramble. See the LICENSE file (MIT).
+# https://unscramble.co.jp
+#
+# VERSION: {{ jidoteki_admin_version }}
+
+set -u
+set -e
+
+if [ -f "/tmp/update_replication.sh.task" ]; then
+  echo "already running"
+  exit 1
+fi
+touch /tmp/update_replication.sh.task
+
+admin_dir="{{ admin_path }}"
+uploads_dir="${admin_dir}/home/sftp/uploads"
+
+fail_and_exit() {
+  rm -f /tmp/update_replication.sh.task
+  echo "[`date +%s`][{{ admin_type }}] Unable to update replication settings" 2>&1 | tee -a "${admin_dir}/log/update_replication.log"
+  exit 1
+}
+
+################
+
+move_settings_files() {
+  cd "${uploads_dir}"
+
+  if [[ ! -f "replication.json" && ! -f "replication.conf" ]]; then return 1; fi
+
+  if [ -f "replication.json" ]; then
+    mv -f replication.json ${admin_dir}/etc/
+    chmod 640 "${admin_dir}/etc/replication.json" ; chown root:admin "${admin_dir}/etc/replication.json"
+  fi
+
+  if [ -f "replication.conf" ]; then
+    mv -f replication.conf /usr/local/etc/
+    chmod 640 "/usr/local/etc/replication.conf" ; chown root:admin "/usr/local/etc/replication.conf"
+  fi
+}
+
+save_replication_settings() {
+  ${admin_dir}/bin/replication.sh || return 1
+}
+
+################
+
+# Run all the tasks
+echo "[`date +%s`][{{ admin_type }}] Updating replication settings. Please wait.." 2>&1 | tee -a "${admin_dir}/log/update_replication.log"
+
+move_settings_files && \
+save_replication_settings || fail_and_exit
+
+echo "[`date +%s`][{{ admin_type }}] Updating replication settings successful" 2>&1 | tee -a "${admin_dir}/log/update_replication.log"
+
+rm -f /tmp/update_replication.sh.task
+
+exit 0

roles/admin/templates/wrapper.sh.j2

@@ -35,12 +35,8 @@ case "${SSH_ORIGINAL_COMMAND}" in
     sudo ${admin_dir}/bin/update_license.sh && \
     backup_data
     ;;
-  "settings static")
-    sudo ${admin_dir}/bin/update_settings.sh static && \
-    backup_data
-    ;;
-  "settings dhcp")
-    sudo ${admin_dir}/bin/update_settings.sh dhcp && \
+  "settings")
+    sudo ${admin_dir}/bin/update_settings.sh "$1" && \
     backup_data
     ;;
   "token")
@@ -74,6 +70,10 @@ case "${SSH_ORIGINAL_COMMAND}" in
     sudo ${admin_dir}/bin/update_backup.sh "$1" && \
     backup_data
     ;;
+  "replication")
+    sudo ${admin_dir}/bin/update_replication.sh && \
+    backup_data
+    ;;
   *)
     exit 1
     ;;