3.3.1 (#164)

* 3.3.1 * Delete changelog files * No SVG * Ignore year. * A great many things. * Add CONTAIMAGE variable. * “ Co-authored-by: Michael Stanclift <[email protected]>
vmstan · Feb 14, 2021 · f32a0e2 · f32a0e2
1 parent 064dbf7
commit f32a0e2
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 720 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-    <img src="https://raw.githubusercontent.com/vmstan/gravity-sync/master/docs/gravity-header.svg" width="80%" alt="Gravity Sync">
+    <img src="https://vmstan.com/content/images/2021/02/gs-logo.svg" width="40%" alt="Gravity Sync">
 </p>
 
 What is better than a [Pi-hole](https://github.com/pi-hole/pi-hole) blocking ads via DNS on your network? That's right, **two** Pi-hole blocking ads on your network!

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.3.0
+3.3.1
diff --git a/backup/BACKUP.md b/backup/BACKUP.md
@@ -1,2 +1,5 @@
 Your backup files will be stored here. 
-They will be ignored by any git updates.
+They will be ignored by any git updates.
+This file is required for Git to create the folder.
+It serves no other purpose.
+Live long and prosper.
diff --git a/docs/gravity-header.svg b/docs/gravity-header.svg
diff --git a/docs/gs-logo.svg b/docs/gs-logo.svg
diff --git a/gravity-sync.sh b/gravity-sync.sh
@@ -3,7 +3,7 @@ SCRIPT_START=$SECONDS
 
 # GRAVITY SYNC BY VMSTAN #####################
 PROGRAM='Gravity Sync'
-VERSION='3.3.0'
+VERSION='3.3.1'
 
 
 # For documentation or downloading updates visit https://github.com/vmstan/gravity-sync
@@ -36,6 +36,7 @@ FILE_OWNER='pihole:pihole'			# default Pi-hole file owner and group (local)
 RILE_OWNER='pihole:pihole'			# default Pi-hole file owner and group (remote)
 DOCKER_CON='pihole'					# default Pi-hole container name (local)
 ROCKER_CON='pihole'					# default Pi-hole container name (remote)
+CONTAIMAGE='pihole/pihole'          # official Pi-hole container image
 
 GRAVITY_FI='gravity.db' 			        # default Pi-hole database file
 CUSTOM_DNS='custom.list'			        # default Pi-hole local DNS lookups

diff --git a/includes/gs-backup.sh b/includes/gs-backup.sh
@@ -103,6 +103,6 @@ function backup_cleanup {
     MESSAGE="Scrubbing ${BACKUP_RETAIN} Redundant Antimatter Containment Pods"
     echo_stat
 
-    find ${LOCAL_FOLDR}/${BACKUP_FOLD}/$(date +%Y)*.backup -mtime +${BACKUP_RETAIN} -type f -delete
+    find ${LOCAL_FOLDR}/${BACKUP_FOLD}/*.backup -mtime +${BACKUP_RETAIN} -type f -delete
     error_validate
 }
diff --git a/includes/gs-config.sh b/includes/gs-config.sh
@@ -35,7 +35,7 @@ function config_generate {
 
     MESSAGE="Creating New ${CONFIG_FILE} from Template"
     echo_stat
-    cp ${LOCAL_FOLDR}/settings/${CONFIG_FILE}.example ${LOCAL_FOLDR}/settings/${CONFIG_FILE}
+    cp ${LOCAL_FOLDR}/templates/${CONFIG_FILE}.example ${LOCAL_FOLDR}/settings/${CONFIG_FILE}
     error_validate
 
     echo_lines

diff --git a/includes/gs-validate.sh b/includes/gs-validate.sh
@@ -39,7 +39,7 @@ function validate_ph_folders {
         fi
     elif [ "$PH_IN_TYPE" == "docker" ]
     then
-        FTLCHECK=$(sudo docker container ls | grep 'pihole/pihole')
+        FTLCHECK=$(sudo docker container ls | grep "${CONTAIMAGE}")
         if [ "$FTLCHECK" == "" ]
         then
             MESSAGE="Unable to Validate that Pi-Hole is Installed"
@@ -48,7 +48,7 @@ function validate_ph_folders {
         fi
     elif [ "$PH_IN_TYPE" == "podman" ]
     then
-        FTLCHECK=$(sudo podman container ls | grep 'pihole/pihole')
+        FTLCHECK=$(sudo podman container ls | grep "${CONTAIMAGE}")
         if [ "$FTLCHECK" == "" ]
         then
             MESSAGE="Unable to Validate that Pi-Hole is Installed"

diff --git a/logs/README.md b/logs/README.md
@@ -1 +1,5 @@
-Logging goes here.
+Your log files will be stored here. 
+They will be ignored by any git updates.
+This file is required for Git to create the folder.
+It serves no other purpose.
+The needs of the many, outweigh the needs of the few.
diff --git a/settings/README.md b/settings/README.md
@@ -0,0 +1,5 @@
+Your configuration file will be stored here. 
+It will be ignored by any git updates.
+This file is required for Git to create the folder.
+It serves no other purpose.
+I have been, and always shall be, your friend.
diff --git a/settings/gravity-sync.conf.example → templates/gravity-sync.conf.example b/settings/gravity-sync.conf.example → templates/gravity-sync.conf.example
@@ -27,6 +27,7 @@ REMOTE_USER='pi'
 # RILE_OWNER=''				# default Pi-hole file owner and group (remote)
 # DOCKER_CON=''				# default Pi-hole container name (local)
 # ROCKER_CON=''				# default Pi-hole container name (remote)
+# CONTAIMAGE=''             # official Pi-hole container image
 
 # GRAVITY_FI='' 			# default Pi-hole database file
 # CUSTOM_DNS=''				# default Pi-hole local DNS lookups