From aefdb082d07ede95e067006c2e2729042d2eb6bf Mon Sep 17 00:00:00 2001 From: Ray Tanaka Date: Fri, 2 Nov 2018 15:24:25 -0700 Subject: [PATCH 1/3] refactoring to add back write configs script --- run/cifs_archive/configure-archive.sh | 3 +-- run/cifs_archive/verify-archive-configuration.sh | 5 ++--- run/cifs_archive/write-archive-configs-to.sh | 6 ++++++ run/rclone_archive/configure-archive.sh | 4 ++-- run/rclone_archive/write-archive-configs-to.sh | 6 ++++++ run/rsync_archive/configure-archive.sh | 5 ++--- run/rsync_archive/write-archive-configs-to.sh | 7 +++++++ setup/pi/configure.sh | 4 ++-- 8 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 run/cifs_archive/write-archive-configs-to.sh create mode 100644 run/rclone_archive/write-archive-configs-to.sh create mode 100644 run/rsync_archive/write-archive-configs-to.sh diff --git a/run/cifs_archive/configure-archive.sh b/run/cifs_archive/configure-archive.sh index f4204a9..a9b7fb5 100644 --- a/run/cifs_archive/configure-archive.sh +++ b/run/cifs_archive/configure-archive.sh @@ -15,8 +15,7 @@ function configure_archive () { local cifs_version="${cifs_version:-3.0}" local credentials_file_path="/root/.teslaCamArchiveCredentials" - echo "username=$shareuser" > "$credentials_file_path" - echo "password=$sharepassword" >> "$credentials_file_path" + /root/bin/write-archive-configs-to.sh "$credentials_file_path" echo "//$archive_server_ip_address/$sharename $archive_path cifs vers=${cifs_version},credentials=${credentials_file_path},iocharset=utf8,file_mode=0777,dir_mode=0777 0" >> /etc/fstab diff --git a/run/cifs_archive/verify-archive-configuration.sh b/run/cifs_archive/verify-archive-configuration.sh index 6b6a7a1..bf8b9f2 100644 --- a/run/cifs_archive/verify-archive-configuration.sh +++ b/run/cifs_archive/verify-archive-configuration.sh @@ -26,9 +26,8 @@ function check_archive_mountable () { local cifs_version="${cifs_version:-3.0}" - local tmp_credentials_file_path="/tmp/.teslaCamArchiveCredentials" - echo "username=$shareuser" > "$tmp_credentials_file_path" - echo "password=$sharepassword" >> "$tmp_credentials_file_path" + local tmp_credentials_file_path="/tmp/teslaCamArchiveCredentials" + /root/bin/write-archive-configs-to.sh "$tmp_credentials_file_path" local mount_failed=false mount -t cifs "//$archive_server_ip_address/$sharename" "$test_mount_location" -o "vers=${cifs_version},credentials=${tmp_credentials_file_path},iocharset=utf8,file_mode=0777,dir_mode=0777" || mount_failed=true diff --git a/run/cifs_archive/write-archive-configs-to.sh b/run/cifs_archive/write-archive-configs-to.sh new file mode 100644 index 0000000..082af81 --- /dev/null +++ b/run/cifs_archive/write-archive-configs-to.sh @@ -0,0 +1,6 @@ +#!/bin/bash -eu + +FILE_PATH="$1" + +echo "username=$shareuser" > "$FILE_PATH" +echo "password=$sharepassword" >> "$FILE_PATH" \ No newline at end of file diff --git a/run/rclone_archive/configure-archive.sh b/run/rclone_archive/configure-archive.sh index 5740157..c4e307f 100644 --- a/run/rclone_archive/configure-archive.sh +++ b/run/rclone_archive/configure-archive.sh @@ -3,8 +3,8 @@ function configure_archive () { echo "Configuring rclone archive..." - echo "drive=$RCLONE_DRIVE" > /root/.teslaCamRcloneConfig - echo "path=$RCLONE_PATH" >> /root/.teslaCamRcloneConfig + local config_file_path="/root/.teslaCamRcloneConfig" + /root/bin/write-archive-configs-to.sh "$config_file_path" if [ ! -L "/root/.config/rclone" ] && [ -e "/root/.config/rclone" ] then diff --git a/run/rclone_archive/write-archive-configs-to.sh b/run/rclone_archive/write-archive-configs-to.sh new file mode 100644 index 0000000..b8ccef6 --- /dev/null +++ b/run/rclone_archive/write-archive-configs-to.sh @@ -0,0 +1,6 @@ +#!/bin/bash -eu + +FILE_PATH="$1" + +echo "drive=$RCLONE_DRIVE" > "$FILE_PATH" +echo "path=$RCLONE_PATH" >> "$FILE_PATH" \ No newline at end of file diff --git a/run/rsync_archive/configure-archive.sh b/run/rsync_archive/configure-archive.sh index 9d94ff5..bb77faa 100644 --- a/run/rsync_archive/configure-archive.sh +++ b/run/rsync_archive/configure-archive.sh @@ -3,9 +3,8 @@ function configure_archive () { echo "Configuring the rsync archive..." - echo "user=$RSYNC_USER" > /root/.teslaCamRsyncConfig - echo "server=$RSYNC_SERVER" >> /root/.teslaCamRsyncConfig - echo "path=$RSYNC_PATH" >> /root/.teslaCamRsyncConfig + local config_file_path="/root/.teslaCamRsyncConfig" + /root/bin/write-archive-configs-to.sh "$config_file_path" } configure_archive \ No newline at end of file diff --git a/run/rsync_archive/write-archive-configs-to.sh b/run/rsync_archive/write-archive-configs-to.sh new file mode 100644 index 0000000..43237f6 --- /dev/null +++ b/run/rsync_archive/write-archive-configs-to.sh @@ -0,0 +1,7 @@ + #!/bin/bash -eu + +FILE_PATH="$1" + +echo "user=$RSYNC_USER" > "$FILE_PATH" +echo "server=$RSYNC_SERVER" >> "$FILE_PATH" +echo "path=$RSYNC_PATH" >> "$FILE_PATH" \ No newline at end of file diff --git a/setup/pi/configure.sh b/setup/pi/configure.sh index 5da1c18..4f30e21 100644 --- a/setup/pi/configure.sh +++ b/setup/pi/configure.sh @@ -115,13 +115,13 @@ function install_archive_scripts () { get_script $install_path remountfs_rw run get_script $install_path lookup-ip-address.sh run - echo "Installing archive module scripts ($archive_module)" - + echo "Installing archive module scripts" get_script $install_path verify-archive-configuration.sh $archive_module get_script $install_path configure-archive.sh $archive_module get_script $install_path archive-clips.sh $archive_module get_script $install_path connect-archive.sh $archive_module get_script $install_path disconnect-archive.sh $archive_module + get_script $install_path write-archive-configs-to.sh $archive_module } function check_and_configure_pushover () { From fd7be5871b83d600090b1ad82aa4b01dc32136b0 Mon Sep 17 00:00:00 2001 From: Ray Tanaka Date: Fri, 2 Nov 2018 15:39:13 -0700 Subject: [PATCH 2/3] bug fix - INSTALL_DIR was not getting propagated to child script --- setup/pi/configure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/pi/configure.sh b/setup/pi/configure.sh index 4f30e21..36ef23f 100644 --- a/setup/pi/configure.sh +++ b/setup/pi/configure.sh @@ -2,8 +2,8 @@ REPO=${REPO:-cimryan} BRANCH=${BRANCH:-master} -INSTALL_DIR=${INSTALL_DIR:-/root/bin} +export INSTALL_DIR=${INSTALL_DIR:-/root/bin} function check_variable () { local var_name="$1" From 83c661be63ff2dcda0a5b8ec97db0852c296c77f Mon Sep 17 00:00:00 2001 From: Ray Tanaka Date: Fri, 2 Nov 2018 15:42:53 -0700 Subject: [PATCH 3/3] remove errant tab --- run/rsync_archive/write-archive-configs-to.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/rsync_archive/write-archive-configs-to.sh b/run/rsync_archive/write-archive-configs-to.sh index 43237f6..ae9a1f3 100644 --- a/run/rsync_archive/write-archive-configs-to.sh +++ b/run/rsync_archive/write-archive-configs-to.sh @@ -1,4 +1,4 @@ - #!/bin/bash -eu +#!/bin/bash -eu FILE_PATH="$1"