Dan Schaper
f899aaad44
Merge branch 'jacobsalmela-development' into bug/CleanupFiles
2015-11-25 19:30:09 -08:00
Dan Schaper
7bbe56d61c
Fix merge conflict
2015-11-25 19:29:13 -08:00
Jacob Salmela
8ad69cea33
Merge pull request #85 from dschaper/development
...
Refactored gravity.sh
2015-11-25 20:14:30 -06:00
Dan Schaper
2164e13303
Merge pull request #11 from dschaper/upstream
...
Pull upstream into master
2015-11-25 16:07:54 -08:00
Dan Schaper
3f4567d088
Merge pull request #10 from jacobsalmela/master
...
Upstream sync
2015-11-25 16:06:48 -08:00
Jacob Salmela
bf4ef2b314
Merge pull request #90 from dschaper/IPCheck
...
Pull IP info from outgoing interface
2015-11-25 18:02:09 -06:00
Dan Schaper
b011fe28d9
No longer need a reboot
2015-11-25 14:34:06 -08:00
Dan Schaper
b318d5350c
Merge branch 'IPCheck' of https://github.com/dschaper/pi-hole into IPCheck
2015-11-25 14:24:15 -08:00
Dan Schaper
21ee63b7fb
Get IP info from outgoing interface
...
Use IP to get interface information from outgoing interface. Use CIDR notation to make things easier.
2015-11-25 14:08:13 -08:00
Dan Schaper
4057a076a2
Merge pull request #9 from dschaper/upstream
...
Upstream sync
2015-11-25 14:03:25 -08:00
Dan Schaper
6e13134328
Revert FHS change until merged
2015-11-25 13:55:32 -08:00
Dan Schaper
29ae66c6db
Check IP info for outgoing interface
2015-11-25 13:43:59 -08:00
Jacob Salmela
464003d674
uninstall script
...
This should remove the Pi-hole.
2015-11-25 13:36:39 -08:00
Cole Turner
03bbef07b5
pinholeIP should only use one IP
...
Updated piholeIP because if there are multiple network adapters, the gravity list will populate incorrectly with both IP addresses. Only one address should be used.
2015-11-25 13:36:39 -08:00
Jacob Salmela
ecb514dd0a
pihole in the cloud link
2015-11-25 13:36:39 -08:00
Jacob Salmela
04f6c478cc
Updated install instructions
...
Also a screenshot of the dialog-based installer
2015-11-25 13:36:39 -08:00
Dan Schaper
20399b8262
Build array of active domains to concatenate
...
Fix #86 Builds an array of active domains, and then loops through that list to pick files to concatenate after truncating Matter.
2015-11-23 13:12:11 -08:00
Dan Schaper
e2b518568e
Forgot to start the directory check function
2015-11-23 12:39:47 -08:00
Dan Schaper
100cbd4032
Merge pull request #7 from dschaper/upstream
...
Upstream
2015-11-23 04:56:40 -08:00
Dan Schaper
673113cb98
Merge pull request #6 from jacobsalmela/master
...
Upstream sync
2015-11-23 04:55:57 -08:00
Dan Schaper
a5d29a1048
Fix function ordering
...
Unique is now called after the comments are scrubbed from the unified domain list.
2015-11-23 03:26:10 -08:00
Dan Schaper
4f1bb12d36
More functions
...
Splitting into more functions
2015-11-23 03:11:16 -08:00
Dan Schaper
3d22e3bb7d
Merge pull request #5 from dschaper/refactor
...
Code refactoring
2015-11-23 02:55:49 -08:00
Dan Schaper
af909e0ee6
Copyright issues
...
Some of the blocklists are copyright and need to be pulled and stored as is. They can be processed further in the script to remove comments.
2015-11-23 02:52:12 -08:00
Dan Schaper
fe46afd08d
More functions
...
More refactoring
2015-11-23 01:47:24 -08:00
Dan Schaper
a1e609d005
Ugly hack permissions
...
Temporary hack for /etc/pihole directory and file permissions to pull out sudo requirement. (Irony is that is requires sudo.) This will be fixed later, but for now it's needed for existing installs so they don't break.
2015-11-23 01:16:00 -08:00
Dan Schaper
668d14e32d
Add functions
...
Start to add functions for code reuse
2015-11-23 00:36:01 -08:00
Dan Schaper
f02c37ec07
Start code refactor, eliminate some repetitive code
...
Begin code refactor prepatation, prevent DRY where possible.
2015-11-22 23:49:38 -08:00
Jacob Salmela
4e50a03dfc
uninstall script
...
This should remove the Pi-hole.
2015-11-21 13:29:03 -06:00
Jacob Salmela
a3a244c4af
Merge pull request #82 from colepatrickturner/master
...
pinholeIP should only use one IP
2015-11-21 12:56:25 -06:00
Cole Turner
d0e9e90ebe
pinholeIP should only use one IP
...
Updated piholeIP because if there are multiple network adapters, the gravity list will populate incorrectly with both IP addresses. Only one address should be used.
2015-11-20 22:53:43 -05:00
Jacob Salmela
1578a28363
pihole in the cloud link
2015-11-19 19:36:34 -06:00
Dan Schaper
9c13d2d88b
Merge pull request #3 from jacobsalmela/master
...
Upstream sync
2015-11-18 02:17:11 -08:00
Jacob Salmela
b005da395f
Updated install instructions
...
Also a screenshot of the dialog-based installer
2015-11-15 20:54:15 -06:00
Jacob Salmela
1b47a42792
Merge pull request #74 from dschaper/CherryPick
...
Cherry pick from PR73
2015-11-15 08:40:09 -06:00
Jacob Salmela
d477021532
Merge pull request #75 from dschaper/ConflictBreaker
...
Resolve merge conflicts
2015-11-15 08:39:38 -06:00
Dan Schaper
b895235ec1
Merge pull request #2 from dschaper/ConflictBreaker
...
Resolve merge conflicts
2015-11-15 06:02:27 -08:00
Dan Schaper
3a01b370d3
Merge pull request #1 from dschaper/CherryPick
...
Cherry pick
2015-11-15 06:01:58 -08:00
dschaper
689426180a
Resolve merge conflicts
2015-11-15 13:59:51 +00:00
Jacob Salmela
d0d165ad16
chmod the log flusher
2015-11-15 13:14:56 +00:00
Jacob Salmela
0cb20fc080
typo
2015-11-15 13:14:46 +00:00
Jacob Salmela
dee3df4e11
download master gravity
2015-11-15 13:14:33 +00:00
Jacob Salmela
814873c643
reboot logic
2015-11-15 13:14:22 +00:00
Jacob Salmela
0936e394d4
reboot only if new IP was set
2015-11-15 13:14:07 +00:00
Jacob Salmela
ad91eb44fb
choose an interface
...
also fixing ipv6 logic
2015-11-15 13:13:21 +00:00
Jacob Salmela
76c217d9cc
moving to functions
...
Also download the whitelist script. Ask for donations for IPv6 support.
2015-11-15 13:13:07 +00:00
Jacob Salmela
46b4000e75
reboot works better
2015-11-15 13:12:55 +00:00
Jacob Salmela
8ac8aa72ce
Closing dialog
...
Also starting the Pi-hole and restarting networking.
2015-11-15 13:12:41 +00:00
Jacob Salmela
8df376860c
simple function to run install commands
...
The arrays were cool, but I think this just works easier.
2015-11-15 13:12:30 +00:00
Jacob Salmela
eec0a31216
trying text output
...
I commented out the whiptail dialog at the end in place of text so you
can see what is going on. I also install the crontab.
2015-11-15 13:12:16 +00:00
