Skip to content
This repository was archived by the owner on Jul 26, 2024. It is now read-only.

Commit 50c786e

Browse files
vmstanalexperrault
vmstan
and
alexperrault
authored
4.0.7 (#433)
* fix: typo in dns cname permission change (#431) This typo prevents gravity-sync from continuing and calculating hashes resulting in always considering there are changes to sync * Update VERSION * Branding and typos * 4.0.7 --------- Co-authored-by: Alexandre Perrault <[email protected]>
1 parent ccb8962 commit 50c786e

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

‎ENV.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
<p align="center">
2-
<img src="https://vmstan.com/content/images/2021/02/gs-logo.svg" width="300" alt="Gravity Sync">
2+
<img src="images/gs-logo.svg" width="300" alt="Gravity Sync">
33
</p>
44

55
<span align="center">
66

7-
# Gravity-sync ENVs
7+
# Gravity Sync ENVs
88

99
</span>
1010

11-
These tables are a list of all gravity-sync settings, that can be tweaked via ENVs. Keep in mind that some of them are stored in `/etc/gravity-sync/gravity-sync.conf` after running `gravity-sync configure` and that `gravity-sync.conf` has higher priority than ENVs.
11+
These tables are a list of all Gravity Sync settings, that can be tweaked via ENVs. Keep in mind that some of them are stored in `/etc/gravity-sync/gravity-sync.conf` after running `gravity-sync configure` and that `gravity-sync.conf` has higher priority than ENVs.
1212

1313
### Local and remote paths & settings
1414
These settings will determine, from where (locally) to where (remotely) will be synced and with which account/permissions
1515
| Variable | Default | Value | Description |
1616
|----------------------------|------------------|------------|----------------------------------------------------|
1717
| `LOCAL_PIHOLE_DIRECTORY` | `/etc/pihole` | path | Path to local pi-hole instance in the filesystem |
18-
| `REMOTE_PIHOLE_DIRECTORY` | `/etc/pihole` | path | Path to remote pi-hole instanc in the filesystem |
18+
| `REMOTE_PIHOLE_DIRECTORY` | `/etc/pihole` | path | Path to remote pi-hole instance in the filesystem |
1919
| `LOCAL_DNSMASQ_DIRECTORY` | `/etc/dnsmasq.d` | path | Path to local dnsmasqd instance in the filesystem |
2020
| `REMOTE_DNSMASQ_DIRECTORY` | `/etc/dnsmasq.d` | path | Path to remote dnsmasqd instance in the filesystem |
2121
| `LOCAL_FILE_OWNER` | `pihole:pihole` | user:group | Local owner and group of the pi-hole config |
2222
| `REMOTE_FILE_OWNER` | `pihole:pihole` | user:group | Remote owner and group of the pi-hole config |
2323

2424
### Docker specific settings
25-
Gravity-sync will check your system for a native pi-hole install first (on local and remote site) and if does not detect any, tests against docker/podman pi-hole instances.
26-
Here, you can specific the docker or podman container name, that gravity-sync should interact with.
25+
Gravity-sync will check your system for a native Pi-hole install first (on local and remote site) and if does not detect any, tests against Docker/Podman Pi-hole instances.
26+
Here, you can specific the Docker or Podman container name, that Gravity Sync should interact with.
2727
| Variable | Default | Value | Description |
2828
|---------------------------|----------|----------------|--------------------------------------------|
2929
| `LOCAL_DOCKER_CONTAINER` | `pihole` | container name | Container name of pi-hole running locally |
@@ -33,7 +33,7 @@ Here, you can specific the docker or podman container name, that gravity-sync sh
3333
These settings are most likely the same on all systems. No need to touch them but nice to be able to touch them, if necessary.
3434
| Variable | Default | Value | Description |
3535
|----------------------------|-------------------------|-------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
36-
| `DEFAULT_PIHOLE_DIRECTORY` | `/etc/pihole` | path | Docker/Podman: Path to pi-hole instance within a docker/podman containrt. Don't mix up with `LOCAL_PIHOLE_DIRECTORY`, which is only used against local pi-hole instances (non-dockerized). |
36+
| `DEFAULT_PIHOLE_DIRECTORY` | `/etc/pihole` | path | Docker/Podman: Path to Pi-hole instance within a Docker/Podman container. Don't mix up with `LOCAL_PIHOLE_DIRECTORY`, which is only used against local Pi-hole instances (non-dockerized). |
3737
| `LOCAL_PIHOLE_BINARY` | `/usr/local/bin/pihole` | path | Path to `pihole` binary on local system |
3838
| `REMOTE_PIHOLE_BINARY` | `/usr/local/bin/pihole` | path | Path to `pihole` binary on remote system |
3939
| `LOCAL_FTL_BINARY` | `/usr/bin/pihole-FTL` | path | Path to `pihole-FTL` binary on local system |
@@ -45,7 +45,7 @@ These settings are most likely the same on all systems. No need to touch them bu
4545
| `PIHOLE_CONTAINER_IMAGE` | `pihole/pihole` | path | Name of the default pi-hole docker image |
4646

4747
### Nitty-gritty finetuning the target files
48-
Here, you can specifiy the gravity, DNS (A, CNAME) and DHCP settings file of pi-hole. It is almost certain, that these filenames do never change (except upstream pi-hole decides so). Better do not touch them.
48+
Here, you can specifiy the Gravity, DNS (A, CNAME) and DHCP settings file of Pi-hole. It is almost certain, that these filenames do never change (except if upstream Pi-hole decides so).
4949
| Variable | Default | Value | Description |
5050
|-----------------|-------------------------------|-------|--------------------------------------------|
5151
| `PH_GRAVITY_FI` | `gravity.db` | file | The gravity filename (blocklist) of pihole |
@@ -78,8 +78,8 @@ Customize parameters for accessing the remote end via SSH
7878
| `GS_SSH_PORT` | `22` | port | Port of the remote gravity-sync container/host |
7979
| `GS_SSH_PKIF` | `<GS_ETC_PATH>/gravity-sync.rsa` | file | Path to the local SSH private key of gravity-sync, that will be used for pubkey auth against the remote |
8080

81-
### Upgrade: Gravity-sync sourcecode location
82-
Gravity-sync is locally installed as a github repo. In order to upgrade your local gravity-sync instance via `gravity-sync upgrade` to the latest version, the path to that git-repo must be known and can be specified below.
81+
### Upgrade: Gravity Sync sourcecode location
82+
Gravity Sync is locally installed as a GitHub repo. In order to upgrade your local Gravity Sync instance via `gravity-sync upgrade` to the latest version, the path to that git repo must be known and can be specified below.
8383
| Variable | Default | Value | Description |
8484
|-----------------|---------------------|-------|---------------------------------------------|
8585
| `GS_LOCAL_REPO` | `<GS_ETC_PATH>/.gs` | path | Local install path of the gravity-sync repo |

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0.6
1+
4.0.7

‎gravity-sync‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ GS_RUN_START=$SECONDS
44

55
# GRAVITY SYNC BY VMSTAN #####################
66
PROGRAM='Gravity Sync'
7-
GS_VERSION='4.0.6'
7+
GS_VERSION='4.0.7'
88

99
# For documentation or the changelog/updates visit https://github.com/vmstan/gravity-sync
1010
# Requires Pi-Hole 5.x or higher already be installed, for help visit https://pi-hole.net
@@ -1596,7 +1596,7 @@ function validate_custom_permissions {
15961596
function validate_cname_permissions {
15971597
MESSAGE="${UI_SET_LOCAL_FILE_OWNERSHIP} ${UI_CNAME_NAME}"
15981598
echo_stat
1599-
sudo chown ${LOCAL_FILE_OWNER}${LOCAL_DNSMASQ_DIRECTORY}/${PH_CNAME_CONF} >/dev/null 2>&1
1599+
sudo chown ${LOCAL_FILE_OWNER} ${LOCAL_DNSMASQ_DIRECTORY}/${PH_CNAME_CONF} >/dev/null 2>&1
16001600
error_validate
16011601

16021602
MESSAGE="${UI_SET_FILE_PERMISSION} ${UI_CNAME_NAME}"

0 commit comments

Comments
 (0)