diff --git a/ADVANCED.md b/ADVANCED.md index ed32ddd..459f8e0 100644 --- a/ADVANCED.md +++ b/ADVANCED.md @@ -18,8 +18,8 @@ Download the latest release from [GitHub](https://github.com/vmstan/gravity-sync ```bash cd ~ -wget https://github.com/vmstan/gravity-sync/archive/v2.2.0.zip -unzip v2.2.0.zip -d gravity-sync +wget https://github.com/vmstan/gravity-sync/archive/v2.2.1.zip +unzip v2.2.1.zip -d gravity-sync cd gravity-sync ``` diff --git a/CHANGELOG.md b/CHANGELOG.md index 4649561..3de5307 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,12 @@ This release also adds the `./gravity-sync.sh purge` function that will totally - I found a markdown spellcheck utility for Visual Studio Code, and ran it against all my markdown files. I'm sorry, I don't spell good. 🤷‍♂️ - New Star Trek references. +#### 2.2.1 + +- Corrects issue with Smart Sync where it would fail if there was no `custom.list` already present on the local Pi-hole. +- Adds Pihole default directories to `gravity-sync.conf.example` file. +- Adds `RIHOLE_BIN` variable to specify different Pi-hole binary location on remote server. + ## 2.1 ### The Backup Release diff --git a/VERSION b/VERSION index e3a4f19..fae692e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.0 \ No newline at end of file +2.2.1 \ No newline at end of file diff --git a/gravity-sync.conf.example b/gravity-sync.conf.example index ef5c581..4264d66 100644 --- a/gravity-sync.conf.example +++ b/gravity-sync.conf.example @@ -35,4 +35,14 @@ REMOTE_PASS='' # PING_AVOID='' # ROOT_CHECK_AVOID='' -# BACKUP_RETAIN='' \ No newline at end of file +# BACKUP_RETAIN='' + +# PIHOLE DEFAULTS ######################## + +# Have a very good reason to change these! + +# PIHOLE_DIR='' +# GRAVITY_FI='' +# CUSTOM_DNS='' +# PIHOLE_BIN='' +# RIHOLE_BIN='' \ No newline at end of file diff --git a/gravity-sync.sh b/gravity-sync.sh index 77983c0..a861657 100755 --- a/gravity-sync.sh +++ b/gravity-sync.sh @@ -3,7 +3,7 @@ SCRIPT_START=$SECONDS # GRAVITY SYNC BY VMSTAN ##################### PROGRAM='Gravity Sync' -VERSION='2.2.0' +VERSION='2.2.1' # Execute from the home folder of the user who owns it (ex: 'cd ~/gravity-sync') # For documentation or downloading updates visit https://github.com/vmstan/gravity-sync @@ -40,7 +40,8 @@ BACKUP_RETAIN='7' # replace in gravity-sync.conf to overwrite PIHOLE_DIR='/etc/pihole' # default Pi-hole data directory GRAVITY_FI='gravity.db' # default Pi-hole database file CUSTOM_DNS='custom.list' # default Pi-hole local DNS lookups -PIHOLE_BIN='/usr/local/bin/pihole' # default Pi-hole binary directory +PIHOLE_BIN='/usr/local/bin/pihole' # default Pi-hole binary directory (local) +RIHOLE_BIN='/usr/local/bin/pihole' # default Pi-hole binary directory (remote) # OS Settings BASH_PATH='/bin/bash' # default OS bash path @@ -383,13 +384,13 @@ function push_gs_reload { MESSAGE="Updating Remote FTLDNS Configuration" echo_stat CMD_TIMEOUT='15' - CMD_REQUESTED="${PIHOLE_BIN} restartdns reloadlists" + CMD_REQUESTED="${RIHOLE_BIN} restartdns reloadlists" create_sshcmd MESSAGE="Reloading Remote FTLDNS Services" echo_stat CMD_TIMEOUT='15' - CMD_REQUESTED="${PIHOLE_BIN} restartdns" + CMD_REQUESTED="${RIHOLE_BIN} restartdns" create_sshcmd }