a6313c9e9e
Update gravity.sh
...
Fix kill command and only run as last step.
2015-12-26 14:37:51 -04:00
3cdce17d28
adding more coverage
...
- Rob's post on medium.com
- TekThing video
Also posting about plans to partner up with Rob for his new service that can help reduce the flame war surrounding ad blocking
2015-12-25 21:14:19 -06:00
184d1bd046
fixes #126
...
These commands were left out, resulting in the Web interface not showing ads blocked despite the Pi-hole working. It is just a permissions error.
2015-12-16 11:23:44 -06:00
c88982d0d5
chmod doesn't apply at initial install
2015-12-09 15:52:53 -06:00
57282cfe16
ugly hack to whitelist from the Web interface
...
I wanted the whitelist feature to keep the user on the same page
without having to reload it. I'm sure someone better versed in PHP
could eliminate the need for this hack. Nonetheless, it works.
www-data runs the script if executed from the Web interface. www-data
also needs access to write to /etc/pihole/gravity.list to actually
remove the domain. So a few more things need to happen before this
will fully work.
The changes in this script won't change what is displayed if run from
the terminal, but will help when it needs to be run from the Web
interface, so I am just committing this now.
The only other thing I would like to see would be a progress spinner,
but my Web skills still need some work...
2015-12-09 15:16:34 -06:00
263d9a222a
Merge pull request #120 from dschaper/documenting
...
Add GPL V2+ headers to script files
2015-12-08 17:46:56 -06:00
73bbfc27d0
Remove extra debian doc file
2015-12-08 15:43:40 -08:00
4027139d9c
More merge conflict resolution
2015-12-06 20:24:58 -08:00
d215fa9ade
Resolve merge confict
2015-12-06 20:22:34 -08:00
b261e046bb
Merge pull request #8 from jacobsalmela/master
...
Upstream sync
2015-12-06 14:44:55 -08:00
4bca6fdfc4
Merge pull request #124 from dschaper/master
...
Fix merge conflicts
2015-12-06 16:41:46 -06:00
9c1eca23ae
Fix merge conflicts
2015-12-06 14:39:43 -08:00
66953319c4
Merge branch 'development' of github.com:dschaper/pi-hole into development
2015-12-06 14:37:40 -08:00
dfc317124c
Merge pull request #6 from jacobsalmela/development
...
Development
2015-12-06 14:36:55 -08:00
debb5aeed6
Merge pull request #5 from jacobsalmela/master
...
Upstream sync
2015-12-06 14:36:26 -08:00
f724a3a61a
Merge pull request #122 from dschaper/bug/interfaceCheck
...
Bug/interface check
2015-12-06 16:32:44 -06:00
f5e573371c
Merge pull request #121 from dschaper/development
...
Merge development
2015-12-06 16:31:11 -06:00
86192a6950
Merge pull request #117 from dschaper/master
...
Merge development into master
2015-12-06 16:18:12 -06:00
ed75f11f3e
Merge branch 'bug/interfaceCheck' into development
2015-12-06 14:05:35 -08:00
dcccb2ee2b
Merge branch 'bug/multipleIP' into development
2015-12-06 11:58:02 -08:00
412a190b42
Basic-install.sh should only show one ip address in whiptail screen.
2015-12-06 11:05:09 -08:00
d2b260fc1e
Log file is automatically generated by dnsmasq, no need to create.
2015-12-06 10:29:59 -08:00
723c2d47bb
Add gravity.pod
2015-12-06 09:27:13 -08:00
22d0e82d92
Add GPL V2+ header
2015-12-06 06:31:49 -08:00
cb91b8f5fa
Add copyright headers
2015-12-06 05:55:50 -08:00
a230df0032
Fix errant )
2015-12-06 05:33:22 -08:00
b391afef49
Interface pull for multiple platforms
2015-12-06 04:45:04 -08:00
5441591409
Resolve merge confict
2015-12-06 03:10:29 -08:00
7cf5320f50
Only write to dhcpcd.conf if address isn't set
2015-12-06 02:40:30 -08:00
04c31f3d06
Merge branch 'development'
...
Conflicts:
automated install/basic-install.sh
2015-12-06 00:48:15 -08:00
e5652be2a9
Merge pull request #4 from jacobsalmela/development
...
Sync with upstream development branch
2015-12-06 00:34:01 -08:00
d068593582
Get last IP for selected interface
2015-12-06 00:30:16 -08:00
3e0daa7e3c
Merge pull request #3 from jacobsalmela/master
...
Upstream sync
2015-12-05 23:04:08 -08:00
d8034f4156
Get last IP listed for interface
2015-12-05 22:17:28 -08:00
2b5030e629
Link to explainer video
...
Also clarifies that the automated install is for Raspbian installs only.
2015-12-05 23:23:44 -06:00
f453d407a9
log-async
...
For better performance. I have been using it for a few weeks with no
adverse effects.
2015-12-05 14:14:34 -06:00
49a40115c8
fixes #105
2015-12-05 14:04:37 -06:00
f7f2895eec
Merge pull request #2 from jacobsalmela/master
...
Upstream sync
2015-12-04 20:26:50 -08:00
0c3409a028
fixes #111
...
Also clears out some errors users don't need to see
2015-12-04 21:41:37 -06:00
f896d1a5bc
Merge pull request #1 from jacobsalmela/development
...
Sync to upstream/development
2015-12-04 18:10:47 -08:00
3b5f40c1f7
Merge branch 'master' into development
2015-12-04 16:31:45 -06:00
e74bb78a96
Merge pull request #109 from dschaper/bug/dnsmasqInterface
...
Bug/dnsmasq interface
2015-12-04 15:09:38 -06:00
99c9f792f2
Merge pull request #108 from dschaper/feature/installFunctions
...
Feature/install functions
2015-12-04 15:09:23 -06:00
0a5c3d021a
Merge pull request #110 from dschaper/patch-2
...
ReadMe.md point to wiki
2015-12-04 15:08:17 -06:00
b9a5ca60b2
Oneline ip link call, tighten awk call
2015-12-03 20:34:45 -08:00
861673594d
Point to wiki
...
Point users to the Wiki Customization entry instead of the PR
2015-12-03 13:17:27 -08:00
3651ee5480
Bugfix for hardcoded dnsmasq.conf interface
...
Add target to dnsmasq.conf for sed
Replace dnsmasq.conf target with selected interface
2015-12-03 10:05:48 -08:00
7a82d1ff17
Breakout basic-install.sh into functions
2015-12-03 09:26:43 -08:00
9421366e4f
Breakout basic-install.sh to functions
2015-12-03 09:25:13 -08:00
b806a36cfc
Merge pull request #106 from dschaper/documenting
...
Document dnsmasq.conf config
2015-12-03 10:23:44 -06:00
