Jacob Salmela
4ad2b68ee1
reverting IPv6 so I can merge lighttpd.conf
2015-10-27 17:16:17 -05:00
Jacob Salmela
17904b3106
ads still get blocked when a 404 happens
2015-10-17 12:12:51 -05:00
Jacob Salmela
7b16a42f31
conditionals for accessing the web interface
...
This adds in some back end improvements for better debugging. It also
allows you to access the Web interface, while you are connected to the
Pi-hole, which resolves #31
2015-10-17 12:11:03 -05:00
Jacob Salmela
28dd956449
changing web server root folder
...
Since the version of lighted in Jessie moved the default folder to
/var/www/html, I am going to make it the same for wheezy for better
compatibility.
Also removed spaces
2015-10-17 12:04:49 -05:00
Jacob Salmela
ee40bc0423
forgot to redirect it to the file
2015-10-10 14:02:18 -05:00
Jacob Salmela
428d5e9a06
Revert "new command to print both the IPv4 and IPv6 address on their own line"
...
This reverts commit 88e6ce041d
2015-10-10 14:01:10 -05:00
Jacob Salmela
88e6ce041d
new command to print both the IPv4 and IPv6 address on their own line
...
I'm not 100% sure if you can add multiple IP addresses to one domain on
a single line, so I just broke it up into two. It makes the file
bigger and longer, but I'll have to see how it works
2015-10-10 13:55:49 -05:00
Jacob Salmela
e3c0fdfeb7
new variables for IPv4 and IPv6
...
The IPv6 address looks for the one created from the MAC address.
2015-10-10 13:52:54 -05:00
Jacob Salmela
dfbf1a952f
deleting tabs and spaces
2015-10-10 13:51:21 -05:00
Jacob Salmela
8f3bbadf73
Merge branch 'master' into development
2015-10-10 13:40:07 -05:00
Jacob Salmela
6976532ef5
Removing IP as input
...
Due to users having issues with the IP not being entered properly, I am restoring the original way to store `piholeIP` until a better solution can be formed.
2015-10-06 06:12:52 -05:00
Jacob Salmela
89e63c7e90
Merge pull request #52 from mospaeda/mospaeda-patch-1
...
Dnsutils package missing for dig tool
2015-10-05 17:55:12 -05:00
mospaeda
06e89614e9
Dnsutils package missing for dig tool
2015-10-05 23:58:15 +02:00
Jacob Salmela
d859d925e3
Merge pull request #47 from mospaeda/master
...
Tools are missing for chronometer.sh
2015-10-03 11:10:01 -05:00
Jacob Salmela
d52fdde2f8
using double bracket notation
...
Despite the script running successfully, it produced this error:
`/usr/local/bin/gravity.sh: line 8: [: missing `]'`
prior to this fix.
2015-10-03 11:06:50 -05:00
Jacob Salmela
533f707578
Merge pull request #45 from jofrep/IP-as-input-parameter
...
Allow external IP as an input script parameter
2015-10-03 11:05:52 -05:00
Jofre Palau
4ea397bc71
Removed extra blank space if no IP added
2015-09-28 17:40:13 +02:00
mospaeda
7b49677d24
add install for bc and toilet tools
...
these tools are needed later by chronometer.sh
2015-09-22 22:38:25 +02:00
mospaeda
56d4b7b0f7
Update basic-install.sh
2015-09-22 22:13:16 +02:00
mospaeda
96bc557e21
Update basic-install.sh
2015-09-22 22:11:30 +02:00
mospaeda
11fcfc4bf5
Update basic-install.sh
2015-09-22 22:10:33 +02:00
Jacob Salmela
2ca9b6b005
Merge pull request #42 from hawson/noswap
...
Allow for local settings to disable swap
2015-09-18 16:49:43 -05:00
Jofre Palau
885069d440
Allow external IP as an input script parameter: ./gravity.sh 123.123.123.123
2015-09-18 23:06:29 +02:00
mospaeda
6fc798ebe4
Update basic-install.sh
2015-09-18 00:40:21 +02:00
mospaeda
2b4500363b
Update basic-install.sh
2015-09-18 00:31:17 +02:00
mospaeda
2d91a7a3c4
Update basic-install.sh
2015-09-18 00:22:21 +02:00
mospaeda
d15a085dd0
Update basic-install.sh
2015-09-18 00:20:50 +02:00
mospaeda
8718321727
Update basic-install.sh
2015-09-18 00:06:04 +02:00
mospaeda
d44e48114e
Merge pull request #4 from jacobsalmela/master
...
Rebase
2015-09-17 23:51:32 +02:00
Jesse Becker
cfac2be334
toggle test case for noswap
2015-09-13 15:23:29 -04:00
Jesse Becker
4a4db7ab56
Allow for local settings to disable swap
2015-09-11 22:54:37 -04:00
Jacob Salmela
23713d82a0
1.6 million instead of 900,000
...
Updating to reflect the latest amount of domains the Pi-hole blocks.
2015-09-06 10:16:11 -05:00
Jacob Salmela
e19a6c3624
Merge pull request #38 from korhadris/master
...
Fixes #32 and fixes #35
2015-09-06 10:11:39 -05:00
jacobsalmela
2792238472
Merge remote-tracking branch 'origin/development'
2015-08-26 18:08:19 -05:00
jacobsalmela
fa77b7b69d
increase swap to fix #37 memory error
...
This will increase the swap file to 500MB before downloading the lists.
Most of the issue comes from the mahakala list, which is so large. If
no swap file is found, one is created.
2015-08-25 18:01:54 -05:00
jacobsalmela
d68c262b96
swap file to eliminate memory allocation error
2015-08-24 16:30:00 -05:00
korhadris
98c94912e1
Replace use of grep -w with grep -x.
...
Prepend "^" to start of latentWhitelist.txt lines.
The -x switch requires a full line match of the regexp, where as -w
will try to find the match somewhere in the line, looking for work
breaks. Combined with turning the whitelist lines into full regexps,
this results in significantly faster parsing.
Having "^" prepended to the lines also keeps false whitelisting from
occuring, such as the following example:
If whitelist.txt contains "google.com" it would whitelist many other
sites that end in "google.com" as long as there is a non-word
character preceeding the google (such as "-", or ".").
2015-08-22 23:37:01 -07:00
korhadris
a26377d229
Append ad list sources to latentWhitelist.txt to prevent them from being filtered.
...
Additional fixes for #35 . This will prevent our own sources from being
filtered out by competing source lists.
2015-08-22 21:44:41 -07:00
korhadris
e464c04490
Ignore domains in ad lists that do not contain . characters.
...
This will skip entries such as `localhost`, `android`, `debian` and
empty lines as listed in #35 .
2015-08-22 17:47:22 -07:00
korhadris
bb7db11214
Changing printouts when updating sources to tell what is going on when
...
manually running gravity.sh
This will print "Getting $domain list... " for each domain, followed
by either "Done" if data was received and validated, or "Skipping
list because it does not have any new entries" if no updates were
needed.
2015-08-22 17:33:30 -07:00
korhadris
1f29d01694
Remove leading and trailing whitespace and . characters and
...
duplicate `.` characters as each list is stored.
Should fix #32 .
2015-08-22 17:05:19 -07:00
korhadris
d6d192cb0a
Use url variable to store ${sources[$i]} value to improve readability.
...
I also wanted to replace the for loop iterating over indices with
something like:
`for url in $sources[@]}`
It made the use of `$i` in the save location more annoying though.
2015-08-22 16:22:07 -07:00
korhadris
0ec6eab683
Appending ".$justDomainsExtension" to $saveLocation variable.
...
Every use of $saveLocation was adding this and making lines
longer.
2015-08-22 16:04:54 -07:00
korhadris
159b29b80b
Replace spaces with tabs to make indentation consistent within the file.
2015-08-22 15:56:32 -07:00
Jacob Salmela
77a3c5f8b3
Merge pull request #33 from mathiasschopmans/patch-1
...
Fix URL of chronometer.sh
2015-08-10 15:53:15 -05:00
Mathias
46bda342a9
Fix URL of chronometer.sh
...
Github URLs seems to be case-sensitive. Now the chronometer.sh souldn't contain "Not Found" anymore. ;)
2015-08-10 22:50:06 +02:00
Jacob Salmela
5ed08b44a5
Merge pull request #29 from Fourdee/master
...
Patch 3 - Dont use /etc/hosts
2015-07-30 18:49:54 -05:00
Fourdee
52ef76d717
missed a few more /etc/host changes
2015-07-30 18:10:26 +01:00
Dan
024395b73b
Update chronometer.sh
...
Missed a change todaysAdsEliminated to /\/etc\/pihole\/gravity.list/
2015-07-30 18:01:10 +01:00
Fourdee
9d99a4ef36
Patch 3 - Dont use /etc/hosts
...
/etc/pihole/gravity.list now stores the block list. Ensures the
/etc/hosts file is left untouched.
2015-07-30 17:24:24 +01:00
