Merge branch 'development' of https://github.com/vmstan/gravity-sync into development

This commit is contained in:
Michael Stanclift 2020-06-01 21:04:14 -05:00
commit 87fdf10d38
4 changed files with 47 additions and 2 deletions

25
.github/ISSUE_TEMPLATE/bug_report.md vendored Normal file
View File

@ -0,0 +1,25 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''
---
**Describe the bug**
A clear and concise description of what the bug is.
**Screenshots**
If applicable, add screenshots to help explain your problem.
**Configuration:**
- OS for Primary/Secondary: [e.g. Ubuntu/DietPi]
- Platform for Primary/Secondary: [e.g. VMware ESXi/Raspberry Pi 4]
- SSH Server/Client: [e.g. OpenSSH/Dropbear]
- SSH Authentication: [e.g. Keypair, Password]
- Gravity Sync Version: [e.g. 1.7.6]
- Pi-hole Versions: [e.g. v5.0]
**Additional context**
Add any other context about the problem here. If you have any advanced flags set in your `gravity-sync.conf` please list them here.

View File

@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Additional context**
Add any other context or screenshots about the feature request here.

View File

@ -89,7 +89,7 @@ This function purposefuly asks for user interaction to avoid being accidentally
- If your script prompts for a password on the remote system, make sure that your remote user account is setup not to require passwords in the sudoers file.
### The Restore Function
Graviy Sync can also `restore` the database on the secondary Pi-hole in the event you've overwritten it accidentally. This might happen in the above scenario where you've had your primary Pi-hole down for an extended period, made changes to the secondary, but perhaps didn't get a chance to perform a `push` of the changes back to the primary, before your automated sync ran.
Gravity Sync can also `restore` the database on the secondary Pi-hole in the event you've overwritten it accidentally. This might happen in the above scenario where you've had your primary Pi-hole down for an extended period, made changes to the secondary, but perhaps didn't get a chance to perform a `push` of the changes back to the primary, before your automated sync ran.
```bash
./gravity-sync.sh restore

View File

@ -1351,4 +1351,4 @@ case $# in
echo_fail
list_gs_arguments
;;
esac
esac