* Begin work on Docker support * rewrite permission detection * wrong else * Change pihole detection based on sudo results * Write out to devnull * nosodo handle * AND then * scanning * nosudo more * clearer wording on failures * headers * handle nosudo on docker detection better * SUDO sudo * AND THEN * status report rewrite * link * alert on no local install detected * yellow headers like the rest of GS * semi critical issues * purple instead of red * clean up output of sudo detection * give me space * Auto run config script * added logo * center logo * move intro * trying dev/tty * advanced config generate * != * logic is hard * new logo * image * fonts * svg image * remove h1 * use rihole variable * New root check * better method of checking sudo * remove messages * rihole * attempting realpath * GS_FILEPATH * remove $HOME call * remove config requirement for updates * no config for updates * all the variables * all kinds of variable replacements * double quotes * it’s like I’ve forgotten how to write this stuff * removals * updated requirements * variable rearrangement * validation check for docker * riholes * placeholder * more riholes * even more riholes * docker examples * docker rewrite * docker docker docker * docker custom checks * update from anywhere * correct validation error * check for current owner only if local install * give me space * stuff * more stuff * bash alias creation * cleanup installer * fix .sh * config errors, remove sshpass validation * skip directories if done * limit config script * fix for changes when both targets have changed * RIHOLE * cleanup warning messages * stop sign * big red * documenting new variables * master Co-authored-by: Michael Stanclift <vmstan@sovereign.vmstan.net> Co-authored-by: Michael Stanclift <vmstan@sovereign.local>
25 KiB
The Changelog
3.1
The Container Release
The premise of this release was to focus on adding better support for Docker container instances of Pi-hole. This release also changes a lot of things about the requirements that Gravity Sync has always had, which were not running as the root user, and requiring that the script be run from the user's home directory. Those two restrictions are gone.
You can now use a standard Pi-hole install as your primary, or your secondary. You can use a Docker install of Pi-hole as your primary, or your secondary. You can mix and match between the two however you choose. You can have Pi-hole installed in different directories at each side, either as standard installs or with container configuration files in different locations. Overall it's much more flexible.
Docker Support
- Only the official Pi-hole managed Docker image is supported. Other builds may work, but they have not been tested.
- If you are using a name for your container other than the default
piholein your Docker configuration, you must specify this in yourgravity-sync.conffile. - Smart Sync, and the associated push/pull operations, now will send exec commands to run Pi-hole restart commands within the Docker container.
- Your container configuration must expose access to the virtual
/etc/piholelocation to the host's file system, and be configured in yourgravity-sync.conffile.
Example: if your container configuration looked something like like -v /home/vmstan/etc-pihole/:/etc/pihole then the location /home/vmstan/etc-pihole would need to be accessible by the user running Gravity Sync, and be configured as the PIHOLE_DIR (or RIHOLE_DIR) in your gravity-sync.conf file.
Installation Script
- Detects the running instance of default Pi-hole Docker container image, if standard Pi-hole lookup fails. Pi-hole must still be installed prior to Gravity Sync.
- Changes detection of root vs sudo users, and adapts commands to match. You no longer need to avoid running the script as
root. - Only deploys passwordless SUDO components if deemed necessary. (i.e. Not running as
root.) - Now automatically runs the local configuration function on the secondary Pi-hole after execution.
- Deploys script via
gitto whatever directory the installer runs in, instead of defaulting to the user's$HOMEdirectory. - Gravity Sync no longer requires that it be run from the user's
$HOMEdirectory.
Configuration Workflow
- Overall, a simpler configuration function, as the online installer now checks for the dependencies prior to execution.
- New users with basic Pi-hole installs will only be prompted for the address of the primary (remote) Pi-hole, an SSH user and then the SSH password to establish a trusted relationship and share the keyfiles.
- Automatically prompts on during setup to configure advanced variables if a Docker installation is detected on the secondary (local) Pi-hole.
- Advanced users can set more options for non-standard deployments at installation. If you are using a Docker deployment of Pi-hole on your primary (remote) Pi-hole, but not the system running Gravity Sync, you will need to enter this advanced mode when prompted.
- Existing users with default setups should not need to run the config utility again after upgrading, but those with custom installs (especially existing container users) should consider it to adopt new variable names and options in your config files.
- Creates a BASH environment alias to run the command
gravity-syncfrom anywhere on the system. If you use a different shell (such as zsh or fish) as your default this may need to be added manually.
New Variables
REMOTE_FILE_OWNERvariable renamedRILE_OWNERfor consistency.RIHOLE_DIRvariable added to set different Pi-hole directory for remote host than local.DOCKER_CONandROCKER_CONvariables added to specify different names for local and remote Pi-hole Docker containers.PH_IN_TYPEandRH_IN_TYPEvariables allow you to to either standard or Docker deployments of Pi-hole, per side.DOCKER_BINandROCKER_BINvariables allow you to set non-standard locations for Docker binary files, per side.- Adds all variables to
gravity-sync.conf.examplefor easy customization.
Removals
- Support for
sshpasshas been removed, the only valid authentication method going forward will be ssh-key based. - If you've previously configured Gravity Sync using
sshpassyou will need to run./gravity-sync.sh configagain to create a new configuration file.
Bug Killer
- Lots of long standing little buggles have been squashed.
Branding
- I made a logo.
3.0
The Breakout Release
This release focuses on breaking out elements of the script from the main file into a collection of a dozen or so files located under the includes/gs-*.sh hirearchy. Seperating out allows new contributors to work on different parts of the script individually, provides an oppertunity to clean up and reorganize parts of the code, and hopefully provides less risk of breaking the entire script.
This release also features a brand new installation script, including a host check for both the primary and secondary Pi-hole system. This should reduce frustration of users who are missing parts of the system requirements. This will also place a file in the sudoers.d file on both systems to make sure passwordless sudo is configured as part of the installation.
Lastly, we adopts Pi-hole style iconography such as ✓ ✗ e ! ? instead of [ GOOD ] in command output.
Enjoy!
3.0.1
devfunction now automatically updates Gravity Sync after application.devfunction pulls new branches down before prompting to select which one to update against.- Minor shuffle of
gravity-sync.shcontents. - Clarify installation requirements in
README.md. - Fixes issues with permissions on
gravity.dbafter push operations. - Fixes missing script startup output during
devoperation.
3.0.2
- Realigned EPS conduits, they overheat if you leave them pointed the same way for too long.
- Corrected error when running via crontab where includes directory was not properly sourced.
2.2
The Purged Release
This release removes support for Dropbear SSH client/server. If you are using this instead of OpenSSH (common with DietPi) please reconfigure your installation to use OpenSSH. You will want to delete your existing ~/.ssh/id_rsa and ~/.ssh/id_rsa.pub files and run ./gravity-sync.sh configure again to generate a new key and copy it to the primary Pi-hole.
This release also adds the ./gravity-sync.sh purge function that will totally wipe out your existing Gravity Sync installation and reset it to the default state for the version you are running. If all troubleshooting of a bad installation fails, this is the command of last resort.
- Updates the remote backup timeout from 15 to 60, preventing the
gravity.dbbackup on the remote Pi-hole from failing. (PR #76) - Adds uninstall instructions to the README.md file. (Basically, run the new
purgefunction and then delete thegravity-syncfolder.) - 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.listalready present on the local Pi-hole. - Adds Pi-hole default directories to
gravity-sync.conf.examplefile. - Adds
RIHOLE_BINvariable to specify different Pi-hole binary location on remote server.
2.2.2
- Corrects another logical problem that prevented
custom.listfrom being backed up and replicated, if it didn't already exist on the local Pi-hole.
2.2.3
- Adds variable to easily override database/binary file owners, useful for container deployments. (Thanks @dpraul)
- Adds variable to easily override Pi-hole binary directory for remote host, seperate from local host. (Thanks @dpraul)
- Rewritten
devoption now lets you select the branch to pull code against, allowing for more flexibility in updating against test versions of the code. Thebetafunction introduced in 2.1.5 has now been removed. - Validates existance of SQLite installation on local Pi-hole.
- Adds Gravity Sync permissions for running user to local
/etc/sudoer.dfile duringconfigoperation. - Adds
./gravity-sync.sh sudofunction to create above file for existing setups, or to configure the remote Pi-hole by placing the installer files on that system. This is not required for existing functional installs, but this should also negate the need to give the Gravity Sync user NOPASSWD permissions to the entire system.
2.1
The Backup Release
A new function ./gravity-sync.sh backup will now perform a SQLITE3 operated backup of the gravity.db on the local Pi-hole. This can be run at any time you wish, but can also be automated by the ./gravity-sync.sh automate function to run once a day. New and existing users will be prompted to configure both during this task. If can also disable both using the automate function, or just automate one or the other, by setting the value to 0 during setup.
New users will automatically have their local settings backed up after completion of the initial setup, before the first run of any sync tasks.
By default, 7 days worth of backups will be retained in the backup folder. You can adjust the retention length by changing the BACKUP_RETAIN function in your gravity-sync.conf file. See the ADVANCED.md file for more information on setting these custom configuration options.
There are also enhancements to the ./gravity-sync.sh restore function, where as previously this task would only restore the previous copy of the database that is made during sync operations, now this will ask you to select a previous backup copy (by date) and will use that file to restore. This will stop the Pi-hole services on the local server while the task is completed. After a successful restoration, you will now also be prompted to perform a push operation of the restored database to the primary Pi-hole server.
It's suggested to make sure your local restore was successful before completing the restore operation with the push job.
Dropbear Notice
Support for the the Dropbear SSH client/server (which was added in 1.7.6) will be removed in an upcoming version of Gravity Sync. If you are using this instead of OpenSSH (common with DietPi) please reconfigure your installation to use OpenSSH. You will want to delete your existing ~/.ssh/id_rsa and ~/.ssh/id_rsa.pub files and run ./gravity-sync.sh configure again to generate a new key and copy it to the primary Pi-hole.
The ./gravity-sync.sh update and version functions will look for the dbclient binary on the local system and warn users about the upcoming changes.
2.1.1
- Last release was incorrectly published without logic to ignore
custom.listif request or not used.
2.1.2
- Corrects a bug in
backupautomation that causes the backup to run every minute during the hour selected.
2.1.5
Skipping a few digits because what does it really matter?
- Implements a new beta branch, and with it a new
./gravity-sync.sh betafunction to enable it. This will hopefully allow new features and such to be added for test users who can adopt them and provide feedback before rolling out to the main update branch. - Uses new SQLITE3 backup methodology introduced in 2.1, for all push/pull sync operations.
./gravity-sync.sh restorelets you select a differentgravity.dbandcustom.listfor restoration.- One new Star Trek reference.
./gravity-sync.sh restorenow shows recent complete Backup executions.
2.1.6
- Adds prompts during
./gravity-sync.sh configureto allow custom SSH port and enable PING avoidance. - Adds
ROOT_CHECK_AVOIDvariable to advanced configuration options, to help facilitate running Gravity Sync with container installations of Pi-hole. (PR #64) - Adds the ability to automate automation. :mind_blown_emoji: Please see the ADVANCED.md document for more information. (PR #64)
(Thanks to @fbourqui for this contributions to this release.)
2.1.7
- Adjusts placement of configuration import to fully implement
ROOT_CHECK_AVOIDvariable. - Someday I'll understand all these git error messages.
2.0
The Smart Release
In this release, Gravity Sync will now detect not only if each component (gravity.db and custom.list) has changed since the last sync, but also what direction they need to go. It will then initiate a push and/or pull specific to each piece.
Example: If the gravity.db has been modified on the primary Pi-hole, but the custom.list file has been changed on the secondary, Gravity Sync will now do a pull of the gravity.db then push custom.list and finally restart the correct components on each server. It will also now only perform a sync of each component if there are changes within each type to replicate. So if you only make a small change to your Local DNS settings, it doesn't kickoff the larger gravity.db replication.
The default command for Gravity Sync is now just ./gravity-sync.sh -- but you can also run ./gravity-sync.sh smart if you feel like it, and it'll do the same thing.
This allows you to be more flexible in where you make your configuration changes to block/allow lists and local DNS settings being made on either the primary or secondary, but it's best practice to continue making changes on one side where possible. In the event there are configuration changes to the same element (example, custom.list changes at both sides) then Gravity Sync will attempt to determine based on timestamps on what side the last changed happened, in which case the latest changes will be considered authoritative and overwrite the other side. Gravity Sync does not merge the contents of the files when changes happen, it simply overwrites the entire content.
New installs will use the smart function by default. Existing users who want to use this new method as their standard should run ./gravity-sync.sh automate function to replace the existing automated pull with the new Smart Sync. This is not required. The previous ./gravity-sync.sh pull and ./gravity-sync.sh push commands continue to function as they did previously, with no intention to break this functionality.
2.0.1
- Fixes bug that caused existing crontab entry not to be removed when switching from
pullto Smart Sync. #50
2.0.2
- Correct output of
smartfunction when script is run without proper function requested. - Decided marketing team was correct about display of versions in
CHANGELOG.md-- sorry Chris. - Adds reference architectures to the
ADVANCED.mdfile. - Checks for RSYNC functionality to remote host during
./gravity-sync.sh configureand prompts to install. #53 - Move much of the previous
README.mdtoADVANCED.mdfile.
1.8
The Logical Release
There is nothing really sexy here, but a lot of changes under the covers to improve reliability between different SSH client types. A lot of the logic and functions are more consistent and cleaner. In some cultures, fewer bugs and more reliability are considered features. Much of this will continue through the 1.8.x line.
- SSH/RSYNC connection logic rewritten to be specific to client options between OpenSSH, OpenSSH w/ SSHPASS, and Dropbear.
- Key-pair generation functions rewritten to be specific to client options, also now works with no (or at least fewer) user prompts.
- SSHPASS options should be more reliable if used, but removes messages that SSHPASS is not installed during setup, if it's not needed and Redirects user to documentation.
- Adds custom port specification to ssh-copy-id and dropbearkey commands during configuration generation.
- Generally better error handling of configuration options.
1.8.1
- Detects if script is running as the root user or via
sudo ./gravity-sync.shand exits on error. #34
1.8.2
- Corrects issue where
custom.listfile would not replicate if the file didn't exist locally, and there were no other changes to replicate. #39
1.8.3
- Simplified method for input of automation frequency when running
./gravity-sync.sh automatefunction. - Now removes existing automation task from crontab, if it exists, when re-running
automatefunction. - Automation can be disabled by setting frequency to
0when prompted. - Adds
devtag to./gravity-sync.sh versionoutput for users running off the development branch.
1.7
The Andrew Release
Features
- Gravity Sync will now manage the
custom.listfile that contains the "Local DNS Records" function within the Pi-hole interface. - If you do not want this feature enabled it can be bypassed by adding a
SKIP_CUSTOM='1'to your .conf file. - Sync will be trigged during a pull operation if there are changes to either file.
Known Issues
- No new Star Trek references.
1.7.1
- There is a changelog file now. I'm mentioning it in the changelog file. So meta.
./gravity-sync.sh versionwill check for and alert you for new versions.
1.7.2
This update changes the way that beta/development updates are applied. To continue receiving the development branch, create an empty file in the gravity-sync folder called dev and afterwards the standard ./gravity-sync.sh update function will apply the correct updates.
cd gravity-sync
touch dev
./gravity-sync.sh update
Delete the dev file and update again to revert back to the stable/master branch.
1.7.3
- Cleaning up output of argument listing
- Removes
betafunction for applying development branch updates.
1.7.4
./gravity-sync.sh devwill now toggle dev flag on/off. Notouchrequired, although it still works that way under the covers. Improvement of methods added in 1.7.2../gravity-sync.sh updateperforms better error handling.- Slightly less verbose in some places to make up for being more verbose in others.
- [DONE] has become [ OK ] in output.
- [INFO] header is now yellow all the way across.
- Tightens up verbiage of status messages.
- Fixes
custom.listnot being processed by./gravity-sync.sh restorefunction. - Detects absence of
sshclient command on host OS (DietPi) - Detects absence of
rsyncclient command on host OS (DietPi) - Detects absence of
ssh-keygenutility on host OS and will usedropbearkeyas an alternative (DietPi) - Changelog polarity reversed after heated discussions with marketing team.
1.7.5
- No code changes!
- Primary README now only reflect "The Easy Way" to install and configure Gravity Sync
- "The Less Easy Way" are now part of ADVANCED.md
- All advanced configuration options are outlined in ADVANCED.md
1.7.6
- Detects
dbclientinstall as alternative to OpenSSH Client. - Attempts to install OpenSSH Client if not found, and Dropbear is not alternative.
- Fix bug with
dropbearkeynot finding .ssh folder. - Numerous fixes to accommodate DietPi in general.
- Fixes issue where
comparefunction would show changes where actually none existed. - [WARN] header is now purple all the way across, consistent with [INFO] as of 1.7.4.
- Fixes issue where
custom.listwould only pull if the file already existed on the secondary Pi-hole. - One new Star Trek reference.
1.7.7
configfunction will attempt to ping remote host to validate network connection, can by bypassed by addingPING_AVOID='1'to yourgravity-sync.conffile.- Changes some [INFO] messages to [WARN] where appropriate.
- Adds aliases for more Gravity Sync functions.
- Shows current version on each script execution.
- Adds time output to Aborting message (exit without change.)
- Includes parsing of functions in time calculation.
- Checks for existence of Pi-hole binaries during validation.
- Less chatty about each step of configuration validation if it completes.
- Less chatty about replication validation if it's not necessary.
- Less chatty about file validation if no changes are required.
- When applying
updatein DEV mode, the Git branch used will be shown. - Validates log export operation.
1.6
The Restorative Release
- New
./gravity-sync.sh restorefunction will bring a previous version of thegravity.dbback from the dead. - Changes the way that Gravity Sync prompts for data input and how confirmation prompts are handled.
- Adds ability to override verification of 'push', 'restore' or 'config' reset, see
.examplefile for details. - Five new Star Trek references.
- New functions add consistency in status output.
1.5
The Automated Release
- You can now easily deploy the task automation via crontab by running
./gravity-sync.sh automatewhich will simply ask how often you'd like to run the script per hour, and then create the entry for you. - If you've already configured an entry for this manually with a prior version, the script should detect this and ask that you manually remove it or edit it via crontab -e. I'm hesitant to delete existing entries here, as it could potentially remove something unrelated to Gravity Sync.
- Changes the method for pulling development branch updates via the 'beta' function.
- Cleanup of various exit commands.
1.4
The Configuration Release
- Adds new
./gravity-sync configfeature to simplify deployment! - Adds variables for SSH settings.
- Rearranges functions, which impacts nothing.
- All new and exciting code comments.
- No new Star Trek references.
1.4.1
- Adds variables for custom log locations to
gravity-sync.conf, see.examplefile for listing.
1.4.2
- Will prompt to create new
gravity-sync.conffile when run without an existing configuration.
1.4.3
- Bug fixes around not properly utilizing custom SSH key-file.
1.3
The Comparison Release
1.3 should be called 2.0, but I'll resist that temptation -- but there are so many new enhancements!
- Gravity Sync will now compare remote and local databases and only replicate if it detects a difference.
- Verifies most commands complete before continuing each step to fail more gracefully.
- Additional debugging options such as checking last cronjob output via
./gravity-sync.sh cronif configured. - Much more consistency in how running commands are processed in interactive mode.
1.3.1
- Changes [GOOD] to [DONE] in execution output.
- Better validation of initial SSH connection.
- Support for password based authentication using SSHPASS.
1.3.2
- MUCH cleaner output, same great features.
1.3.3
- Corrected Pi-hole bin path issue that cause automated sync not to reload services.
1.3.4
- Moves backup of local database before initiating remote pull.
- Validates file ownership and permissions before attempting to rewrite.
- Added two Star Trek references.
1.2
The Functional Release
- Refactored process to use functions and cleanup process of execution.
- Does not look for permission to update when run.
- Cleanup and expand comments.
1.2.1
- Improved logging functions.
1.2.2
- Different style for status updates.
1.2.3
- Uses a dedicated backup folder for
.backupand.lastfiles. - Copies db instead of moving to rename and then replacing to be more reliable.
- Even cleaner label status.
1.2.4
- Changes
~to$HOME. - Fixes bug that prevented sync from working when run via crontab.
1.2.5
- Push function now does a backup, on the secondary PH, of the primary database, before pushing.
1.1
The Pushy Release
- Separated main purpose of script into
pullargument. - Allow process to reverse back using
pushargument.
1.1.2
- First release since move from being just a Gist.
- Just relearning how to use GitHub, minor bug fixes.
1.1.3
- Now includes example an configuration file.
1.1.4
- Added update script.
- Added version check.
1.1.5
- Added ability to view logs with
./gravity-sync.sh logs.
1.1.6
- Code easier to read with proper tabs.
1.0
The Initial Release
No version control, variables or anything fancy. It only worked if everything was exactly perfect.
echo 'Copying gravity.db from HA primary'
rsync -e 'ssh -p 22' ubuntu@192.168.7.5:/etc/pihole/gravity.db /home/pi/gravity-sync
echo 'Replacing gravity.db on HA secondary'
sudo cp /home/pi/gravity-sync/gravity.db /etc/pihole/
echo 'Reloading configuration of HA secondary FTLDNS from new gravity.db'
pihole restartdns reload-lists
For real, that's it. 6 lines, and could probably have be done with less.