Commit Graph

547 Commits

Author SHA1 Message Date
Michael Stanclift
6466e5a384
3.3.2 (#170)
* Fix crash when using remote docker instance (#169)

When trying to compare / sync and where the remote host is based on Docker, an error will be displayed as per below:
invalid argument "pihole1" for "-f, --filter" flag: bad format of filter (expected name=value)
See 'docker ps --help'.

* 3.3.2

Co-authored-by: Michael Thompson <25192401+nh-mike@users.noreply.github.com>
Co-authored-by: Michael Stanclift <vmstan@mstanclift-a03.local>
2021-02-15 15:18:36 -06:00
Michael Stanclift
f32a0e2ab4
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 <vmstan@mstanclift-a03.local>
2021-02-13 21:11:43 -06:00
Michael Stanclift
97735f19f1
3.3.0 (#161)
* Catch up 3.3 (#142)

* 3.2.5 (#140)

Co-authored-by: Michael Stanclift <vmstan@mstanclift-a03.vmware.com>

* Adds backup cleanup back to process

* Add backup cleanup to compare script when no changes are detected.

* Trek reference

* Redundant

* 3.2.6

* 3.2.6

Co-authored-by: Michael Stanclift <vmstan@mstanclift-a03.vmware.com>
Co-authored-by: Michael Stanclift <vmstan@mstanclift-a03.local>

* Beginning 3.3.0 work

* Podman support

* Support for pihole running in a podman container (#138)

* add support for pihole running in a podman container

* revert renaming of DOCKER_CON to CON_NAME to avoid breaking existing installations

Co-authored-by: Michael Stanclift <mstanclift@vmware.com>

* Add sudo to call of Pihole container version

* Use dev branch pipe

* Without origin

* ascii

* rotate logo

* Move config files to settings folder

* MIssed an important one

* Relocate logs files

* Filling empty directory

* Regression of sudo fix

* Logs

* More words

* Change sync frequency options

* Remove backup automation

* Bold questions

* name

* elif

* BACKUP_RETAIN=3

* Remove automation flag

* == not !=

* Rearrange

* IF

* Default to 0

* 15 default

* More words!

* ELSE

* tighter columns

* Instance type

* Y/N

Co-authored-by: Michael Stanclift <vmstan@mstanclift-a03.vmware.com>
Co-authored-by: Michael Stanclift <vmstan@mstanclift-a03.local>
Co-authored-by: Martin F. Schumann <mfs@mfs.name>
2021-02-09 16:05:17 -06:00
Michael Stanclift
f6f69201b4
3.2.6 (#141)
* Adds backup cleanup back to process

* Add backup cleanup to compare script when no changes are detected.

* Trek reference

* Redundant

* 3.2.6

* 3.2.6

Co-authored-by: Michael Stanclift <vmstan@mstanclift-a03.local>
2021-02-04 10:47:40 -06:00
Michael Stanclift
13dfc7d2d0
3.2.5 (#140)
Co-authored-by: Michael Stanclift <vmstan@mstanclift-a03.vmware.com>
2021-02-02 13:23:29 -06:00
Michael Stanclift
d0d2ae97d2 3.2.4 2021-01-12 22:57:32 +00:00
Michael Stanclift
5b125e0776
3.2.3 (#133)
* Add info to error output

* Tabs

* Lines

* Words

* ``

* Wrods

* Clean up spacing for tasktype

* Checkbox

* 3.2.3

* Changes

* THEN
2021-01-12 10:38:40 -06:00
Michael Stanclift
b912f74ebb
3.2.2 (#132)
* start 3.2.2

* -z

* !=

* “”

* headers

* Change to new PH_EXEC run

* Empty list detection for CNAME

* IGNORE list

* Skip Gravity logic

* oops

* Two == to be super serious

* variables are hard

* change colors

* the colors

* I’m getting rusty

* echo_lines

* 3.2.2

Co-authored-by: Michael Stanclift <vmstan@sovereign.local>
2021-01-10 10:37:35 -06:00
Michael Stanclift
1c033ef1f6
3.2.1 (#129)
* 3.2.1

* Change FILE_OWNER & RILE_OWNER to use UID:GID (#128)

Adressing #99 - use UID:GID instead names to support pihole docker user.

* Cleanup tabs on main script

* Add pihole version output

* Output version based on Docker type

* AND THEN

* AND THEN AND THEN

* bash version

* add DNSMASQ to output

* Add GS version

* No color

* Custom settings

* VERIFY_PASS

* Reformat Remote info

* Info screen

* ssh v

* rsync

* -e

* no echo, duh

* header

* sqlite3 version output

* sudo git docker versions

* move spacer

* uname

* remove duplicate docs

Co-authored-by: Michael Stanclift <vmstan@sovereign.local>
Co-authored-by: Krzysiek Kurek <kk50657@sgh.waw.pl>
2021-01-05 09:57:38 -06:00
Michael Stanclift
836a5a1611
3.2.0 (#127)
* Add configuration variables for DNSMASQ files and directories

* Move compare function to gs-core

* Words

* Add validation command for DNSMASQ

* conditional checking of cname folder

* Add CNAME file to md5 check

* Reanalyse CNAME

* Bug report #125

* Add varilable for GS conf file

* more syncing

* Version 3.2

* Add DNS folder validation to other tasks

* Backup CNAME files

* {}

* Add message if no local files are detected but selected for backup

* Add CNAME list to restore code

* Pull CNAME, validate permissions

* Add pull function to runtime

* Extra R

* Use new permission validation function

* Push CNAME function added

* Missing variable name

* Add MD5 logging for CNAME files

* Add CNAME to smart task

* Change location of remote DNSMASQ file backups

* 1 not 0

* Change backup folder location

* Remove {}?

* “”

* INCLUDE_CNAME

* Detect invalid CNAME configuration

* Explainers for CNAME enabling

Co-authored-by: Michael Stanclift <vmstan@sovereign.local>
2021-01-04 14:37:35 -06:00
Michael Stanclift
42118e9b98 cleanup indentions 2020-12-31 02:49:54 +00:00
Michael Stanclift
9313200b94 indention change 2020-12-31 02:45:47 +00:00
Michael Stanclift
470dc3a2da add info function 2020-10-23 14:23:53 +00:00
Michael Stanclift
277e7bd07b Start 3.1.2 2020-10-23 14:21:59 +00:00
Michael Stanclift
804a792b94
3.1.1 (#112)
* Docker exec not completeing

* Directions for upgrade

Co-authored-by: Michael Stanclift <vmstan@sovereign.local>
2020-10-21 09:37:23 -05:00
Michael Stanclift
6551ae88c7
3.1.0 (#105)
* 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>
2020-10-19 13:48:23 -05:00
Michael Stanclift
7d09218524
3.0.2 (#104)
* version change

* Nova

* No-config function

* Markdown cleanup

* Create gs-core file

* correct missing includes via cron

Co-authored-by: Michael Stanclift <vmstan@Sovereign.vmstan.net>
Co-authored-by: Michael Stanclift <vmstan@sovereign.local>
2020-10-10 11:30:40 -05:00
Michael Stanclift
c1b71ec996 3.0.1(1) 2020-10-08 20:45:03 -05:00
Michael Stanclift
d94e7c711b
3.0.1 (#101)
* 3.0.1 start

* words

* fix remote file owner setting

* fi

* fix missing sudo directory

* ALL

* 301

Co-authored-by: Michael Stanclift <vmstan@Sovereign.vmstan.net>
2020-10-08 20:39:30 -05:00
Michael Stanclift
ead57c2506 3.0.0(2) 2020-10-07 22:16:45 -05:00
Michael Stanclift
9dae851a9c
3.0.0 (#100)
* first!

* folders

* break out colors

* home

* seperate update

* breakout pull

* move file

* breakout push

* breakout smart

* restore breakout

* include restore

* breakout logs validate ssh

* breakout config exit intent

* source exit

* breakout backup automation and purge

* breakout root

* file headers

* create push pull restore smart functions

* consolidate options

* include root check

* includes

* includes 2

* automate

* rearrange imports

* header

* ssh rsync

* new install steps

* ticks

* yellow

* host check

* check for git

* ticks

* check for pihole

* check sudo powers

* create sudo file

* write output

* pihole directory

* install sudo file

* purge error message

* comment cleanup

* installer

* header

* instructions

* l

* read p

* header

* skip prompts

* sudo no longer in config

* compare exit code

* exit with change

* 3.0

Co-authored-by: Michael Stanclift <vmstan@Sovereign.vmstan.net>
Co-authored-by: Michael Stanclift <vmstan@Sovereign.local>
2020-10-07 17:45:39 -05:00
Michael Stanclift
d23ae53628
2.2.3 (#98)
* feat: add option to override file owner setting (#94)

* Merge changes

* Change beta updater

* Dev branch changes

* Add check for SQLite3

* SQLite message formattitng

* sqlite

* repo checks

* sudoers file

* add sudo file

* sudoer auto

* overwrite not append

* sudo docs

* sudo instructions

* SUDO instructions

Co-authored-by: Dylan Praul <dpraul@users.noreply.github.com>
Co-authored-by: Michael Stanclift <vmstan@Sovereign.vmstan.net>
2020-10-02 14:01:17 -05:00
Michael Stanclift
3a2eed97f6 2.2.2(1) 2020-10-01 15:29:06 -05:00
Michael Stanclift
82b7d887cc 2.2.2 2020-10-01 15:26:35 -05:00
Michael Stanclift
986f1092e9 Move backup to after detection 2020-10-01 15:05:23 -05:00
Callum Oakley
8d5c725d0c
s/insure/ensure (#91) 2020-09-04 15:50:50 -05:00
Michael Stanclift
17325791fc 2.2.1 2020-08-18 10:09:13 -05:00
Michael Stanclift
572abc07e1 pull if no local custom list 2020-08-18 09:54:26 -05:00
Michael Stanclift
8d7a61ca55 fix missing custom list detection 2020-08-18 09:51:38 -05:00
Michael Stanclift
4aa301f179
2.2.0 (#81)
* import config file before executing

* show_target function

* git

* Sync back (#72)

* 2.1.6 beta 1 (#65)

* select different files for restore

* star trek reference

* Log backup jobs

* color restore

* ping avoid and custom ssh prompts

* z variable

* or

* []

* new method for defaults

* variables matter

* or this?

* making it specific

Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.vmstan.net>

* 2.1.6 beta 2 (#67)

* select different files for restore

* star trek reference

* Log backup jobs

* color restore

* ping avoid and custom ssh prompts

* z variable

* or

* []

* new method for defaults

* variables matter

* or this?

* making it specific

* adv conf: add ROOT_CHECK_AVOID for container. (#64)

* adv conf: add ROOT_CHECK_AVOID for container.
import_gs only once at start

* allow parameters for automation option

Co-authored-by: Michael Stanclift <mstanclift@vmware.com>

* Post PR cleanup

* Thanks for fbourqui

* readjusts import_gs

Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.vmstan.net>
Co-authored-by: fbourqui <fbourqui@yahoo.com>

* 2.1.7 (#70)

* import config file before executing

* show_target function

* git

Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.vmstan.net>

Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.vmstan.net>
Co-authored-by: fbourqui <fbourqui@yahoo.com>

* Sync back (#73)

* 2.1.6 beta 1 (#65)

* select different files for restore

* star trek reference

* Log backup jobs

* color restore

* ping avoid and custom ssh prompts

* z variable

* or

* []

* new method for defaults

* variables matter

* or this?

* making it specific

Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.vmstan.net>

* 2.1.6 beta 2 (#67)

* select different files for restore

* star trek reference

* Log backup jobs

* color restore

* ping avoid and custom ssh prompts

* z variable

* or

* []

* new method for defaults

* variables matter

* or this?

* making it specific

* adv conf: add ROOT_CHECK_AVOID for container. (#64)

* adv conf: add ROOT_CHECK_AVOID for container.
import_gs only once at start

* allow parameters for automation option

Co-authored-by: Michael Stanclift <mstanclift@vmware.com>

* Post PR cleanup

* Thanks for fbourqui

* readjusts import_gs

Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.vmstan.net>
Co-authored-by: fbourqui <fbourqui@yahoo.com>

Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.vmstan.net>
Co-authored-by: fbourqui <fbourqui@yahoo.com>

* spellcheck is awesome

* I speel reel gurd

* Spelling sucks

* Update remote backup timeout to 60

This will avoid [ FAIL ] Performing Backup of Remote gravity.db

* readme updates

* spelling

* extra fi

* config cleanup

* hide if dbclient installed but also ssh

* move backup in config

* backup process in configure

* 2.2.0 beta 1 (#78)

* 2.1.6 beta 1 (#65)

* select different files for restore

* star trek reference

* Log backup jobs

* color restore

* ping avoid and custom ssh prompts

* z variable

* or

* []

* new method for defaults

* variables matter

* or this?

* making it specific

Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.vmstan.net>

* 2.1.6 beta 2 (#67)

* select different files for restore

* star trek reference

* Log backup jobs

* color restore

* ping avoid and custom ssh prompts

* z variable

* or

* []

* new method for defaults

* variables matter

* or this?

* making it specific

* adv conf: add ROOT_CHECK_AVOID for container. (#64)

* adv conf: add ROOT_CHECK_AVOID for container.
import_gs only once at start

* allow parameters for automation option

Co-authored-by: Michael Stanclift <mstanclift@vmware.com>

* Post PR cleanup

* Thanks for fbourqui

* readjusts import_gs

Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.vmstan.net>
Co-authored-by: fbourqui <fbourqui@yahoo.com>

* import config file before executing

* show_target function

* git

* Sync back (#72)

* 2.1.6 beta 1 (#65)

* select different files for restore

* star trek reference

* Log backup jobs

* color restore

* ping avoid and custom ssh prompts

* z variable

* or

* []

* new method for defaults

* variables matter

* or this?

* making it specific

Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.vmstan.net>

* 2.1.6 beta 2 (#67)

* select different files for restore

* star trek reference

* Log backup jobs

* color restore

* ping avoid and custom ssh prompts

* z variable

* or

* []

* new method for defaults

* variables matter

* or this?

* making it specific

* adv conf: add ROOT_CHECK_AVOID for container. (#64)

* adv conf: add ROOT_CHECK_AVOID for container.
import_gs only once at start

* allow parameters for automation option

Co-authored-by: Michael Stanclift <mstanclift@vmware.com>

* Post PR cleanup

* Thanks for fbourqui

* readjusts import_gs

Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.vmstan.net>
Co-authored-by: fbourqui <fbourqui@yahoo.com>

* 2.1.7 (#70)

* import config file before executing

* show_target function

* git

Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.vmstan.net>

Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.vmstan.net>
Co-authored-by: fbourqui <fbourqui@yahoo.com>

* spellcheck is awesome

* I speel reel gurd

* Spelling sucks

* Update remote backup timeout to 60

This will avoid [ FAIL ] Performing Backup of Remote gravity.db

* readme updates

* spelling

* extra fi

* config cleanup

* hide if dbclient installed but also ssh

* move backup in config

* backup process in configure

Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.vmstan.net>
Co-authored-by: fbourqui <fbourqui@yahoo.com>
Co-authored-by: Sungray <ced.lapage@gmail.com>
Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.local>

* THE PURGE

* PURGE IT

* PURRRRRRGE

* Purged Release

* if beta

* pihole note

* silence git output

* 2.2.0 beta 2 (#79)

* 2.1.6 beta 1 (#65)

* select different files for restore

* star trek reference

* Log backup jobs

* color restore

* ping avoid and custom ssh prompts

* z variable

* or

* []

* new method for defaults

* variables matter

* or this?

* making it specific

Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.vmstan.net>

* 2.1.6 beta 2 (#67)

* select different files for restore

* star trek reference

* Log backup jobs

* color restore

* ping avoid and custom ssh prompts

* z variable

* or

* []

* new method for defaults

* variables matter

* or this?

* making it specific

* adv conf: add ROOT_CHECK_AVOID for container. (#64)

* adv conf: add ROOT_CHECK_AVOID for container.
import_gs only once at start

* allow parameters for automation option

Co-authored-by: Michael Stanclift <mstanclift@vmware.com>

* Post PR cleanup

* Thanks for fbourqui

* readjusts import_gs

Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.vmstan.net>
Co-authored-by: fbourqui <fbourqui@yahoo.com>

* import config file before executing

* show_target function

* git

* Sync back (#72)

* 2.1.6 beta 1 (#65)

* select different files for restore

* star trek reference

* Log backup jobs

* color restore

* ping avoid and custom ssh prompts

* z variable

* or

* []

* new method for defaults

* variables matter

* or this?

* making it specific

Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.vmstan.net>

* 2.1.6 beta 2 (#67)

* select different files for restore

* star trek reference

* Log backup jobs

* color restore

* ping avoid and custom ssh prompts

* z variable

* or

* []

* new method for defaults

* variables matter

* or this?

* making it specific

* adv conf: add ROOT_CHECK_AVOID for container. (#64)

* adv conf: add ROOT_CHECK_AVOID for container.
import_gs only once at start

* allow parameters for automation option

Co-authored-by: Michael Stanclift <mstanclift@vmware.com>

* Post PR cleanup

* Thanks for fbourqui

* readjusts import_gs

Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.vmstan.net>
Co-authored-by: fbourqui <fbourqui@yahoo.com>

* 2.1.7 (#70)

* import config file before executing

* show_target function

* git

Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.vmstan.net>

Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.vmstan.net>
Co-authored-by: fbourqui <fbourqui@yahoo.com>

* spellcheck is awesome

* I speel reel gurd

* Spelling sucks

* Update remote backup timeout to 60

This will avoid [ FAIL ] Performing Backup of Remote gravity.db

* readme updates

* spelling

* extra fi

* config cleanup

* hide if dbclient installed but also ssh

* move backup in config

* backup process in configure

* THE PURGE

* PURGE IT

* PURRRRRRGE

* Purged Release

* if beta

* pihole note

* silence git output

Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.vmstan.net>
Co-authored-by: fbourqui <fbourqui@yahoo.com>
Co-authored-by: Sungray <ced.lapage@gmail.com>
Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.local>

* Installation instructions.

* bash

* words

* purge now updates

* purge reword

* more warnigns

* 2.2.0

Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.vmstan.net>
Co-authored-by: fbourqui <fbourqui@yahoo.com>
Co-authored-by: Sungray <ced.lapage@gmail.com>
Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.local>
2020-07-21 00:14:20 -05:00
Michael Stanclift
fb2ae38723
2.1.7 (#70)
* import config file before executing

* show_target function

* git

Co-authored-by: Michael Stanclift <vmstan@MS-MacBook.vmstan.net>
2020-07-17 09:45:08 -05:00
Michael Stanclift
1afc7cd521 rebase 2020-07-16 22:02:46 -05:00
Michael Stanclift
6063363773 readjusts import_gs 2020-07-16 13:37:27 -05:00
Michael Stanclift
9a8e49f07c Post PR cleanup 2020-07-16 13:15:38 -05:00
fbourqui
f6cdbc40ec
adv conf: add ROOT_CHECK_AVOID for container. (#64)
* adv conf: add ROOT_CHECK_AVOID for container.
import_gs only once at start

* allow parameters for automation option

Co-authored-by: Michael Stanclift <mstanclift@vmware.com>
2020-07-16 13:09:44 -05:00
Michael Stanclift
70da7aad14 making it specific 2020-07-16 12:04:34 -05:00
Michael Stanclift
2d7fa277ad or this? 2020-07-16 12:02:48 -05:00
Michael Stanclift
8c5dadb560 variables matter 2020-07-16 11:59:02 -05:00
Michael Stanclift
c73b3c9dfc new method for defaults 2020-07-16 11:57:02 -05:00
Michael Stanclift
86805ab02d [] 2020-07-16 11:50:45 -05:00
Michael Stanclift
719d2bf077 or 2020-07-16 11:49:12 -05:00
Michael Stanclift
1092db143e z variable 2020-07-16 11:44:20 -05:00
Michael Stanclift
a994652b2b ping avoid and custom ssh prompts 2020-07-16 11:37:06 -05:00
Michael Stanclift
fb23d48296 color restore 2020-07-12 10:27:15 -05:00
Michael Stanclift
e2acade063 Log backup jobs 2020-07-12 10:26:07 -05:00
Michael Stanclift
dd5e7a63b5 star trek reference 2020-07-12 09:24:45 -05:00
Michael Stanclift
d4276042b5 select different files for restore 2020-07-12 09:20:58 -05:00
Michael Stanclift
ad1f758384 if 2020-07-11 21:15:01 -05:00
Michael Stanclift
8e78bca575 beta updater 2020-07-11 21:12:21 -05:00
Michael Stanclift
bc75664129 load previous md5 for compare 2020-07-11 21:06:06 -05:00