560 Commits

Author	SHA1	Message	Date
xch12i5	0de5132e2b	Solves RegEx issue. ... Signed-off-by: xch12i5 <40517505+xCh12i5@users.noreply.github.com>	2019-01-19 17:07:27 +01:00
DL6ER	05bd88b4d8	Update agent string: the selected string is the most abundant one on 06 Dec 2018 with a percentage of almost 10% ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-12-06 18:04:17 +01:00
Adam Warner	83f7bd66e6	Don't mv preEventHorizon, copy it. ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-12-05 22:29:01 +00:00
Dan Schaper	5c621fa253	Lints ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-11-12 17:21:34 -08:00
Dan Schaper	f9e71bee0a	Account for port, or lack of, in PIHOLE_DNS_1 ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-11-12 17:15:24 -08:00
Mark Drobnak	33939a30ea	Merge pull request #2347 from Gusher123/patch-1 ... Don't let one blocklist block an other blocklist	2018-09-30 21:24:45 -04:00
Adam Warner	0131055ec9	Submission stale, addressing @mcat12's comments ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-09-30 20:00:06 +01:00
DL6ER	337cc5ca18	BLOCKING -> BLOCKING_ENABLED ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-13 17:22:10 +02:00
DL6ER	b011adc453	Use new setupVars BLOCKING variable to determine which file to update via gravity ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-13 14:19:59 +02:00
DL6ER	6cde066edd	Have gravity detect the presence of files like gravity.list.bck and update this file if present (assuming blocking is disabled) ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-13 13:43:14 +02:00
Gusher123	2feb5f22cc	Signed-off-by ... This is my commit message Signed-off-by: Gusher123 <t.siebeling@gmail.com>	2018-08-12 10:05:58 +02:00
Gusher123	03a9d3bc5b	Not hardcoding dns and covering all blockingmodes ... Using double brackets Mode double brackets	2018-08-12 03:05:53 +02:00
Gusher123	e58142b4ac	Added comments	2018-08-11 15:14:45 +02:00
Gusher123	3e5c6afaee	Don't let one blocklist, block an other ... If a blocklist is blocked by an other and 'pihole -g' is run, update the blocked blocklist by useing an alternate dns server (in this case 1.1.1.1) to acquire the IP adres and download the blocklist using the 'curl --resolve' (https://curl.haxx.se/docs/manpage.html#--resolve)	2018-08-11 14:33:33 +02:00
DL6ER	760dd01b50	Use grep invert-match ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-07 18:36:06 +02:00
DL6ER	5bf90cb77d	Use alternative logic for counting regex file entries, skipping commented out lines ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-08-07 18:02:01 +02:00
Mcat12	1a8d5fb4a9	Allow PHP to edit the regex file if installed ... Fixes permissions error on the web interface when modifying the regex. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-28 21:57:39 -04:00
Dan Schaper	dbc82cfb6a	Merge pull request #2236 from pi-hole/new/regex-lists ... Use regex lists instead of wildcards for blocking	2018-07-14 06:10:44 -07:00
Mcat12	72be7ad5f0	Don't count commented out regex lines ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-12 21:21:06 -04:00
WaLLy3K	7ddae8f2eb	Treat URLs without a protocol as HTTP ... Signed off by WaLLy3K <wally3k@pi-hole.net>	2018-07-02 19:59:22 +10:00
Mcat12	0f4968d75c	Merge remote-tracking branch 'origin/development' into new/regex-lists	2018-06-29 23:12:34 -04:00
Mcat12	55175087c4	Set regex file permissions for web access ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-06-28 22:52:44 -04:00
Dan Schaper	d5547f5c7c	Revert "Fix error: /opt/pihole/gravity.sh: 385: Warning: command substitution: ignored null byte in input"	2018-06-24 16:06:55 -07:00
Mark Drobnak	4fc3546887	Merge pull request #2069 from pi-hole/fix/nullbyte ... Fix error: /opt/pihole/gravity.sh: 385: Warning: command substitution: ignored null byte in input	2018-06-20 20:42:24 -04:00
DL6ER	bc705aac03	Add automated wildcard list -> regex filter conversion ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-06-17 14:39:19 +02:00
Mark Drobnak	3149a95d6a	Fix gravity_ParseFileIntoDomains Awk comment ... Signed-off-by: Mark Drobnak <newtoncat12@yahoo.com>	2018-06-03 13:33:33 -04:00
Adam Warner	5f2217a079	Fix for gravity.list not being emptied with an empty/missing adlist file. ... Variable output depending on content of /existence of adlist Signed-off-by: Adam Warner <adamw@rner.email>	2018-04-30 21:56:33 +01:00
Adam Warner	3216d65353	Merge branch 'development' into new/RemoveDefaultBlocklists	2018-04-29 13:39:17 +01:00
Adam Warner	9c29bd627e	fix user blacklisting	2018-04-21 23:55:33 +01:00
DL6ER	d24b141d8b	Get rid of numBlocked file, FTLDNS can now determine number of domains thanks to the new lists format ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-04-21 23:58:42 +02:00
DL6ER	bac9e005ae	Generate gravity.list and black.list in simple domain lists format for FTLDNS. Leave local.list in HOSTS format ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-04-21 23:27:36 +02:00
Dan Schaper	d4d1ec2568	Merge pull request #2124 from pi-hole/development ... Internal	2018-04-17 11:54:50 -07:00
Adam Warner	88d4108f92	- Add new whipstail to choose from example blocklists on new install ... - remove adlists.default - do not copy non-existent adlists.default on run of gravity Signed-off-by: Adam Warner <adamw@rner.email>	2018-04-17 10:33:06 +01:00
Jacob Salmela	187848660c	try another fix for #2028 ... Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>	2018-03-31 16:12:29 -05:00
Jacob Salmela	c3f391dc5a	maybe fixes #2028 by deleting null bytes ... Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>	2018-03-31 14:08:48 -05:00
DL6ER	ff47ab12fb	Save number of effectively blocked domains in /etc/pihole/numBlocked ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-03-30 21:01:51 +02:00
Riley Avron	f390671018	Improve scheme matching to avoid inadvertent blocking ... Signed-off-by: Riley Avron <riley.avron@gmail.com>	2018-03-06 22:03:56 -08:00
Riley Avron	512ec7fb87	Remove unneeded ifs in awk ... Signed-off-by: Riley Avron <riley.avron@gmail.com>	2018-03-06 22:03:43 -08:00
Adam Warner	24219422df	Merge branch 'development' into FTLDNSremoveDnsmasq	2018-03-06 20:43:27 +00:00
Adam Warner	ad1f210528	As we no longer add source lists to the whitelist by default, gravity falls over on new installs. ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-03-06 18:29:28 +00:00
Adam Warner	cadab61a21	Merge branch 'development' into FTLDNS	2018-03-05 21:33:53 +00:00
DL6ER	7ed45d26c2	Remove " " at some places where they shouldn't be ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-02-26 17:26:51 +01:00
DL6ER	e8ec0dc701	Use pihole-FTL resolver in pihole and gravity ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-02-25 09:34:04 +01:00
Adam Warner	6b4685b333	much more elegant to export LC_ALL at the beginning of the script! ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-02-21 11:33:29 +00:00
Adam Warner	d4ac818a0b	Specifty LC_ALL=C when dealing with sorted lists. ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-02-21 11:23:07 +00:00
DL6ER	fc5034696d	Don't auto-whitelist blocking list domains ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2018-02-16 19:42:33 +01:00
Dan Schaper	9f2ce0e296	Merge pull request #1910 from pi-hole/fix/BinaryFileLineInGravity ... Potential fix for #1909	2018-01-28 03:23:19 -08:00
Adam Warner	55e10d8287	replace another grep -F as pointed out by @StarPicard ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-01-28 00:50:15 +00:00
Adam Warner	f1956119fb	proposed gravity function renames ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-01-14 20:38:39 +00:00
Adam Warner	876170767c	Print actual domain instead of grep output of "Binary file /etc/pihole/list.preEventHorizon matches" when a domain with a unicode char is in a source list. ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-01-13 16:43:20 +00:00
Adam Warner	2d3906450a	add back in str local var, and change ticks to info on whitelist lines ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-12-18 20:14:53 +00:00
Adam Warner	5ecc46d85b	Accidentally too many spaces ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-12-16 14:03:12 +00:00
Adam Warner	ddd6f3dbe5	Grammar changes. Lets not work out programmatically whether we need to pluralise a word. It's not needed. ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-12-16 13:55:52 +00:00
Adam Warner	761fd13a70	Remove quotes from the uniqDomains array to actually whitelist the sources ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-12-16 13:15:26 +00:00
Adam Warner	c24e5cd3f6	:codacy: :codacy2: :codacy3: ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-12-12 12:45:25 +00:00
Adam Warner	cc3035267f	Revert parsing method to that of 3.1.4. New Method is allowing illegal lists through, and that is causing issues such as blocking www.google.com. This method will just throw away invalid list entries. ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-12-12 12:36:09 +00:00
Jacob Salmela	80e17ab721	potentially fixes #1806 by falling back to dig if getent fails ... Signed-off-by: Jacob Salmela <github@decoy.email>	2017-12-07 22:38:47 -06:00
Mcat12	8d721d086c	Modify indentation	2017-11-21 18:37:38 -05:00
DL6ER	6f0bb30def	Improve indentation ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-11-21 20:58:27 +01:00
DL6ER	c54f04ef4c	Repair username:password filtering ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-11-21 20:55:47 +01:00
DL6ER	eb83081a5c	Clarify error message: File could also have been of zero size ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-11-21 18:36:34 +01:00
DL6ER	8976930e20	Properly detect if local file was successfully downloaded ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-11-21 18:35:58 +01:00
DL6ER	164a81776e	Allow to add local lists to gravity using e.g. file:///path/to/my.list in adlists.list ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-11-21 18:30:40 +01:00
DL6ER	39ab1e1ea7	When using the Pi-hole DHCP server, local host names are called "something.local". Thir PR ensures that clients that are connected via VPN are augmented by a similar suffix like "someother.vpn". ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2017-09-30 13:03:49 +02:00
spacedingo	60365ad36a	Update gravity.sh	2017-09-26 09:25:47 +04:00
spacedingo	466e6d9b30	Redo pull #1687 ... Fix for case sensitive duplicate domains The change (https://github.com/pi-hole/pi-hole/pull/1687) was recently undone.	2017-09-26 05:53:07 +04:00
WaLLy3K	b9bcfe36ff	Place errors on newline	2017-09-24 11:57:15 +10:00
WaLLy3K	cd7c00ef8e	Fix Ctrl-C inadvertently deleting domains files	2017-09-23 10:32:56 +10:00
WaLLy3K	3aa525b0c0	Ensure domains files are not deleted upon w/blist	2017-09-22 14:17:56 +10:00
WaLLy3K	47099e2855	Ensure resolver test occurs each second ... * Ensure that gravity will run the second the resolver is available * Increase timeout to 120s	2017-09-22 03:56:53 +10:00
WaLLy3K	2deb2bf03f	Fix broken whitelist functionality	2017-09-22 02:23:43 +10:00
WaLLy3K	a6f9272d4b	Fix gravity from only parsing one adlist URL ... * Redirect `grep` correctly to $sources (instead of using `awk`) * Redirect $sourceDomains correctly * Replace use of ${COL_LIGHT_BLUE} * Add numeric count informing user of unique source domains being whitelisted	2017-09-20 22:25:33 +10:00
Adam Warner	8d8482d60b	<<<$() back to < <() ... Signed-off-by: Adam Warner <adamw@rner.email>	2017-09-19 19:02:50 +01:00
WaLLy3K	d02bf258af	Improve non-standard list parsing ... * Add 504 status (Gateway connection timed out) * Add text for non-standard list parsing * Improve adblock parsing * Ensure adblock exception rules are removed from file * Ensure "www." is not treated as a URL-format list * Corrected typo * Ensure script does not fail if "-f" is used when there are no blocklists generated Signed off by WaLLy3K <wally3k@pi-hole.net>	2017-09-18 17:36:03 +10:00
WaLLy3K	c957124fad	Optimised parsing of domains on IPv6 servers ... * Remove WHITELIST_COMMAND * Place IPv4/IPv6 availability test underneath setupVars.conf source * Improved clarity on comments * Define default lookupDomain on local line * Use `getent hosts` instead of nslookup (faster) * Make gravity_DNSLookup() function more readable * Use bold on "Neutrino emissions detected" * Swap conditionals around on adlists file handling * Add comments to both gravity_Collapse() `awk`s * Removed unnecessary "${str}" from gravity_Pull() * Merge function variables into local line * Place .phgbp suffice on mktemp, so patternbuffers can be cleaned up all at once in gravity_Cleanup() * Removed success="false" from $httpCode case, placed empty success var in local * Reordered $httpCode case numerically because I can * Provide error if Dnsmasq format list is being parsed * Remove IPv4 check when determining URL list (too slow on large lists) * Check ${#sources[@]} to ensure we're checking the number of entries and not the character count * Define empty plural in local line, removing unnecessary plural=; * Optimised readability of gravity_Whitelist() * Removed uninformative "Nothing to blacklist"/"No wildcards used" text * Optimised parsing of domains into hosts format on IPv6 enabled servers * Ensure /etc/hostname is non-zero * Use `: >` instead of `rm` as consistent with the rest of the script * Ensured that gravity_Cleanup() removes ${localList}.tmp * Optimised readability of gravity_ParseUserDomains() * Moved dnsRestart to ${var} case statement, renaming it to dnsRestartType for readability * Set default $listType to ensure script passes "bash strict mode"	2017-09-15 22:39:17 +10:00
WaLLy3K	ff5411a93a	Add 'Connection Refused' for 000 status ... * Shift default dnsRestart value into unset default parameter expansion value * Change nslookup timeout to 5 seconds * Use &> instead of > * Standardise plural code * Update some comments * Add "000" when connection is refused * Condense adblock detection logic * Add Dnsmasq format detection and parsing logic * Removed unnecessary echo * Add dnsWasOffline variable to ensure that if DNS service has been stopped, that it doesn't start and also get reloaded	2017-09-14 20:23:49 +10:00
WaLLy3K	d3073e5e23	Fix array of unique $sourceDomains	2017-09-14 17:09:52 +10:00
WaLLy3K	8191ec01e5	Gravity Bugfixes ... * Merge development OpenVPN code * Determine which domain to resolve depending on existence of $localList * Re-add code to remove $localList, preventing duplicate local entries * Minor shellcheck validation fix	2017-09-14 16:39:30 +10:00
WaLLy3K	0a00936e99	Update resolver test & added more comments ... * Add/update code comments * Change resolver check to test for pi.hole * Make resolver check timeout after 10 seconds * Use > instead of &> where appropriate * Make resolver check sleep for 30 seconds (effectively waiting up to 50s for dnsmasq to be resolvable) * Provide confirmation upon success of resolver check availability * Quotes and Braced remaining variables as appropriate * Removed duplicate local	2017-08-28 11:36:02 +10:00
WaLLy3K	f24ab8508e	WIP cleanup ... * Changed supernova/eventHorizon variables to match their purpose * Add gravity_DNSLookup() function * Ensure all comments are clear and relevant * Use && instead of || in gravity_Collapse() * Renamed existing functions, and placed them in order of script execution * Use \t instead of literal tab in gravity_ParseFileIntoDomains() * Replace instances of "truncate" with : > (e.g: gravity_Schwarzschild()) * Ensure correct variables are local'd * Use phrase "Cleaning up stray matter" when gravity_Cleanup() is called * Add black/white/wildcard switches for list.sh * Ensure necessary functions are called when modifying black/white/wildcards Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	2017-07-27 12:34:35 +10:00
WaLLy3K	6830b08723	Clean up and optimise Gravity ... * Shellcheck validation * Made variable names, function names, comments and output clearer to understand * Quoted and braced variables and conditionals * Fix adlists.list handling logic, and remove any CR line endings * Make CP/MV/RM provide user-friendly output upon failure * Change adlists.list retrieval logic * Moved and fixed adlists.list domain parsing logic * Create gravity_ParseFileAsDomains() function to handle parsing of source files * If no changes to a list is detected, print no output * Ensure each source blocklist has a final newline * Format number output as currency * Make array of adlists domain sources unique to prevent redundant whitelisting * Merged bash IPv4/IPv6 hosts formatting IF statement into an awk one-liner * Trap Ctrl-C cancellations and run gravity_Cleanup() * Use new gravity_Cleanup() function on errors and script completion * Ensure that dnsmasq uses force-reload when gravity is invoked * Add --wildcard option to ensure dnsmasq is restarted upon b/wlisting of a wildcard Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	2017-07-24 21:24:34 +10:00
Mcat12	1e31fa89aa	Remove /* from IPv6 as well as IPv4 ... Fixes Discourse issue: https://discourse.pi-hole.net/t/ipv6-aaaa-dns-issue/3830	2017-06-26 09:51:21 -04:00
Adam Warner	536585b846	Colourise Core Output Text (#1471) ... * Define colours within COL_TABLE * Do not output colours for non-terminal instances * Removed ":::" * Fixed indenting & spacing * Made output consistent throughout project * Reworded text to fit on standard 80 char wide Terminal screen * Made 'sudo raspi-config' warning (insufficient disk space) only show on RPi * Make "Installation/Update Complete" the final msg * Remove redundant messages * Simplify update available message * Confirm user would like to begin uninstall * If "git pull" string says "Already up-to-date.", place [i] before it * Colour Temp/Interface output * Made `pihole disable 5z` invalid * Added error fallback if invalid argument (not s/m) is detected * Quoted "$2" for consistency * Updated help text * L185/286: Replaced echo with redirect * User agents for adblock.mahakala.is/adaway.org unnecessary * Print newline on confirmation of repository reset * Add output to admin-related dnsmasq restarts * Return error message for "pihole -q" * Imply default checkout behaviour with y/N * Fix uninstall failing to remove pihole user * Print checkout 'git remote show origin' STDERR on new line * Replaced checkout "AdminLTE" wording with "Web Admin"	2017-06-21 21:49:05 +10:00
DL6ER	05798fe07a	cp + rm === mv (well, almost)	2017-06-19 20:22:03 +02:00
DL6ER	8bad56e897	Improve displayed messages and overall logic	2017-06-17 14:24:30 +02:00
DL6ER	92e691408f	Remove useless cat	2017-06-17 14:14:07 +02:00
DL6ER	0a9c234127	Add "pihole -g -b" to *only* update black.list (saves a bunch of time when adding/changing only blacklisted files - won'tdownload lal lists, but only processes the blacklist and restars dnsmasq)	2017-06-17 13:57:27 +02:00
DL6ER	0283a1ab74	Introduce new file black.list for blacklist content	2017-06-17 13:50:10 +02:00
Dan Schaper	6a2b885988	Update default User Agent to modern browser. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-04-27 11:41:08 -07:00
Mcat12	5e308dbd51	Delete the temp files created by gravity	2017-04-18 20:35:06 -04:00
Mcat12	a96b4d28e1	Merge pull request #1365 from pi-hole/adlistImprovements ... Adlist improvements	2017-04-06 16:15:50 -04:00
Mcat12	ce86205df0	Use correct agent when downloading adaway.org list ... See https://discourse.pi-hole.net/t/2278	2017-04-02 12:44:00 -04:00
Adam Warner	02040cd25d	We no longer need to do this, either	2017-03-31 19:23:26 +01:00
Adam Warner	bdc6bd4135	Don't need this comment anymore	2017-03-31 19:18:28 +01:00
Adam Warner	e720de401d	One file to rule them all, same functionality (made changes and want to go back to default? Delete your adlists.list)	2017-03-31 19:16:09 +01:00
Adam Warner	ce97896ffd	account for new adlists.custom file	2017-03-31 19:00:04 +01:00
DL6ER	d7b5870ba6	Use absolute path for pihole command in gravity.sh. Fixes #1318	2017-03-12 23:15:23 +01:00
Jacob Salmela	7a1a2dec67	update license to EUPL on core files	2017-02-22 11:55:20 -06:00
Markus Napp	66616eb0f0	Rename missing plurals check	2017-02-01 19:55:33 +01:00
Markus Napp	72a1fc3f64	Fix output for wildcards in gravity.sh	2017-02-01 00:07:47 +01:00
DL6ER	a8ac212ee6	Show number of wildcard blocked domains in gravity's summary	2017-01-29 13:46:27 +01:00
Promofaux	c2e1819098	This should not have been commented out. It's stopping any changes we make to the default lists getting out.	2017-01-17 19:48:20 +00:00
DL6ER	322cb2387b	Also accept the last line of the adlist file if there is no newline at the end	2017-01-13 11:02:51 +01:00
DL6ER	cd0c3f9418	Better output if file has not been downloaded because it has not been changed	2016-12-17 23:46:28 +01:00
DL6ER	efaee2b68b	Improvements for gravity (errors shouldn't be able to escape the black hole if even light cannot do this!)	2016-12-17 23:33:09 +01:00
Promofaux	a3d519b671	no need to remove list, because of echo >	2016-12-14 19:33:15 +00:00
Promofaux	8591f9d576	check for list before removing it	2016-12-14 19:31:57 +00:00
Promofaux	db89fa9881	initial support for additional hosts file	2016-12-14 19:26:55 +00:00
Mcat12	d8912fd0a7	Merge pull request #952 from pi-hole/fix/exit_codes ... Fix/exit codes	2016-12-01 18:24:30 -05:00
Dan Schaper	d92646324c	Double worded ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2016-12-01 13:59:58 -08:00
Dan Schaper	c9fe62a691	Clarify what the command is doing. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2016-12-01 13:58:40 -08:00
Dan Schaper	2ec4acfe52	Begin fixing exit values. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2016-12-01 12:21:08 -08:00
Adam Warner	c97cfde9f9	Update gravity.sh ... Only include domain part of lines that contain `/` e.g `www.fakenewswatch.com/megynkelly`	2016-11-21 22:51:59 +00:00
DL6ER	cdee6d55d3	Minor change	2016-11-20 17:40:22 +01:00
DL6ER	e5a1afaa26	Added another missing "done"	2016-11-20 17:31:27 +01:00
Mcat12	08e7b7e0ad	Fix typo	2016-11-19 14:00:56 -05:00
DL6ER	4945f33254	Added "-n" to first echo call	2016-11-18 17:39:34 +01:00
DL6ER	3fa05293fc	Fixed file permissions	2016-11-18 17:37:13 +01:00
DL6ER	27e5f2798d	Added missing "done." output	2016-11-18 17:33:46 +01:00
Adam Warner	99057ed859	Update var names from setupVars.conf in gravity.sh	2016-11-02 04:21:54 -07:00
Adam Warner	21fc6344bf	Merge pull request #849 from pi-hole/aManHasNoNameResolution ... [BugFix] A man has no name resolution	2016-10-27 19:41:07 +01:00
Promofaux	9e4e1d1cb2	improve comments	2016-10-27 11:09:24 +01:00
Promofaux	60142cd960	remove reference to whitelist.sh (no longer exists) replace with pihole -w	2016-10-27 11:06:11 +01:00
Promofaux	4c853defb2	add if traps to check for existence of whitelist.txt / blacklist.txt	2016-10-25 22:27:35 +01:00
Adam Warner	e0ac109dd1	remove hostname insertion into gravity.list from gravity.sh	2016-10-25 15:07:29 +01:00
Adam Warner	7653b3d088	Remove pi.hole references in gravity.sh	2016-10-25 15:01:16 +01:00
Promofaux	d0826b2c33	Merge branch 'development' of https://github.com/airencracken/pi-hole into airencracken-dev	2016-10-23 19:33:28 +01:00
Marcus Hildum	ebbe1fc236	More consistency ... Odd mix of variables quoted with and without no-op parameter expansion (i.e. ${thing}) More ${thing} than not, make that the standard	2016-10-21 23:11:17 -07:00
Marcus Hildum	aac8e45397	Imbue gravity.sh with some consistency ... Mish-mash of tabs and spaces used for indentation. Mostly tabs though, so going with those. Also indenting blocks and enforcing the loop statement; do done style over the newline for do since it seemed to be more common.	2016-10-21 23:02:45 -07:00
Adam Warner	8f9ff930b3	Merge pull request #823 from tuplink/EnableOrDisable ... Enable or disable	2016-10-21 11:02:10 +01:00
Promofaux	9ab6df0e54	Merge branch 'development' into promoTweaksTheSecond ... # Conflicts: # advanced/Scripts/blacklist.sh # advanced/Scripts/whitelist.sh	2016-10-20 21:06:28 +01:00
Tommy Huff	15d68467a1	attempt to fix	2016-10-20 10:12:02 -04:00
Tommy Huff	3b6ecc573e	fix conflict ... Merge remote-tracking branch 'upstream/promoTweaksTheSecond' into EnableOrDisable	2016-10-20 10:09:23 -04:00
Tommy Huff	3ca3eaa62c	change restartdnsmasq to restartdns	2016-10-20 09:40:45 -04:00
Tommy Huff	dda448e050	use finction in pihole to restart dnsmasq	2016-10-20 09:15:03 -04:00
Tommy Huff	60873144ea	make last line of script return a new line been bugging me for awhile	2016-10-20 09:09:35 -04:00
Tommy Huff	a9d17c96be	include status at end of gravity so if it is disabled you will see it when running	2016-10-20 09:03:20 -04:00
Tommy Huff	7d7e17b351	add toggle to enable or disable pi-hole	2016-10-20 08:45:20 -04:00
Adam Warner	c71a976e76	kill off an old ugly hack	2016-10-20 13:37:07 +01:00
Marcus Hildum	0efda04920	Use heredocs instead of multiple calls to echo ... There were a lot of places (like in help functions) that used multiple echo calls instead of heredocs. Personal opinion but this seems cleaner.	2016-10-19 20:46:37 -07:00
Marcus Hildum	28eeaf201b	Standardize function declaration ... There were no fewer than three styles of function declaration going on in these files, so I attempted to standardize them to the typical myfucn() { } style.	2016-10-19 19:47:45 -07:00
Promofaux	9aa38cf0ae	mv patternbuffer instead of cp, then no need to clean up	2016-10-19 23:57:43 +01:00
Promofaux	a7fa7466fb	remove no longer needed code	2016-10-19 23:54:43 +01:00
Promofaux	3f73c61cee	cache event horizon before white/blacklists are applied for quicker processing on white/blacklist calls of gravity	2016-10-19 23:52:54 +01:00
Promofaux	b88fe572fe	Whitelist/Blacklist domains directly in the Event Horizon.	2016-10-19 23:15:05 +01:00
Promofaux	59ba6f8aec	add flag to skip download of lists	2016-10-19 22:06:19 +01:00
Promofaux	25343da6b7	wrong variable name	2016-10-19 20:03:29 +01:00
Promofaux	60d17b97f5	spacing	2016-10-19 19:51:32 +01:00
Promofaux	8cb72d87e4	make IPv4/IPv6 checking more robust in gravity	2016-10-19 19:50:21 +01:00
Promofaux	49f48e2aaa	wrong word. #admincrimes	2016-10-17 22:24:59 +01:00
Promofaux	8c0f860601	Use systemctl/service calls instead of killall to restart/reload dnsmasq	2016-10-16 17:16:59 +01:00
Promofaux	7ee1110351	ugh. pihole.conf.	2016-10-15 20:09:38 +01:00
Promofaux	51c4c51d9e	Add trap to check existence of setupVars	2016-10-15 20:03:33 +01:00
Promofaux	fc4fe54099	standardise function naming	2016-10-15 20:02:57 +01:00
Promofaux	4c42f00a86	remove uses of ${SUDO} and root check from gravity. As this is handled by pihole command.	2016-10-15 18:42:53 +01:00
Promofaux	4f35aac6dd	transpose $ and "	2016-10-10 22:32:30 +01:00
Dan Schaper	4418ca9e9f	Missing quote replacement.	2016-10-10 11:41:29 -07:00
Dan Schaper	07b7e8a1a6	Track down a couple more variable name changes.	2016-10-10 06:33:56 -07:00
Dan Schaper	7ae2fc37c0	Match up descriptive variable names with setupVars.conf. Rectifies Ubuntu 16.04 gravity.list bug.	2016-10-10 06:23:17 -07:00
Adam Warner	ac49e639bd	Fix #718	2016-09-26 11:58:07 +01:00
bcambl	21d4199a38	Merge branch 'development' into dns-hostname-fixes	2016-09-19 17:33:32 -06:00
Promofaux	3ed62d45f5	Source IP addresses from /etc/pihole/setupVars.conf	2016-09-16 23:05:08 +01:00
bcambl	640af300cb	additional hostname checks in gravity.sh ... - Test if /etc/hostname exists before attempting to cat the file. - Add alternative hostname discovery via hostname command - Add an error message to stdout if unable to determine host fqdn	2016-09-07 21:16:52 -06:00
Promofaux	6796b8bdad	pass argument from pihole command to gravity for -f check	2016-08-19 23:06:56 +01:00
Promofaux	475d016029	hmmm	2016-08-19 22:52:55 +01:00
Promofaux	201304e678	fix variables in gravity to stop it using -f wether it's set or not	2016-08-19 22:51:09 +01:00
Promofaux	f6ac0d73b4	Add force delete option	2016-08-17 19:08:55 +01:00
Promofaux	ae47be0ce9	Add HelpFunc	2016-08-17 18:59:00 +01:00
Dan Schaper	024b741552	Merge pull request #490 from bcambl/fedora-armhf7 ... Fedora Support	2016-06-29 14:25:23 -07:00
Mcat12	4e95f4678f	Merge pull request #540 from pi-hole/bugfix/curl-redirect ... Have `curl` auto-redirect	2016-06-26 13:42:40 -04:00
Dan Schaper	7670b4e380	Mahakala User Agen modernization ... Update Curl User Agent for Maha list.	2016-06-25 06:00:49 -07:00
Dan Schaper	636a9123b8	Have curl auto-redirect ... This should solve the redirection issue if a list is moved.	2016-06-23 18:37:45 -07:00
bcambl	27a9642090	check for sudo via 'command -v' instead of dkpg-query	2016-06-11 15:58:49 -06:00
Jim Liu	08e95ed606	Update gravity.sh ... Change piholeIPfile to a permanent location.	2016-04-22 01:40:42 +08:00
Jim Liu	a5ad48aa18	Update gravity.sh	2016-04-21 23:40:44 +08:00
Promofaux	ad574f5e90	Replace kill with killall	2016-04-16 15:52:38 +01:00
Promofaux	4941a657bf	remove -s switch, as it turns out it worked afterall.	2016-04-16 12:59:40 +01:00
Promofaux	3d4bff9414	Add -s switch to kill command to increase compatability	2016-04-16 10:56:49 +01:00
Adam Warner	99a5b3a98a	remove all mentions of spinner	2016-04-11 11:29:14 +01:00
Promofaux	8514f42d0d	Correct variable name (Missing capital letter! whoops!)	2016-04-05 08:53:52 +01:00
Promofaux	0c0dd914f7	Fix source lists not being skipped if they are already up to date	2016-04-04 23:48:34 +01:00
Promofaux	c6405bc93b	Ensure addn-hosts value is updated in /etc/dnsmasq.d/01-pihole.conf if user has a custom value set in pihole.conf	2016-04-04 23:38:46 +01:00
nate	5347ee4896	Write verbose status of processes to debug log & Minor UI Fixes	2016-04-04 00:59:24 -05:00
Promofaux	d710b97276	Fix issue raised in #421 (Use variable instead of hardcoded path, do not delete user created pihole.conf!)	2016-04-03 22:10:04 +01:00
Promofaux	0e6e8040ba	Change spinstr to match install and uninstall scripts	2016-04-03 21:54:16 +01:00
nate	767b72fbfa	Merged branch development into PiHoleController	2016-04-02 17:34:41 -05:00
Mcat12	0fbf72bb09	Change dummy domain and show device's hostname in ping ... * Change dummy domain Allows users to access Pi-hole console with my.pi-hole.net instead of the IP address * Cleaned up formatting * Put device hostname at the top of the list Changed my.pi-hole.net to pi.hole and placed it under the device hostname. This way, ping will return the device hostname but you still can access the web interface with pi.hole/admin	2016-04-01 20:19:47 -04:00
nate	bb66d559e7	Merge branch 'development' ... Conflicts: gravity.sh	2016-04-01 11:08:46 -05:00
nate	7b8fa3b922	Permissions changed for /etc/pihole and cleaned up some output	2016-04-01 01:11:59 -05:00
nate	28f2a1309e	Merge branch 'development' ... Conflicts: automated install/uninstall.sh	2016-03-31 20:25:54 -05:00
nate	45f24c8a85	Readded cats that were originally considered UUOC	2016-03-30 19:56:11 -05:00
nate	f8427ab789	Merge remote-tracking branch 'refs/remotes/pi-hole/development' ... Conflicts: README.md advanced/Scripts/blacklist.sh advanced/Scripts/whitelist.sh automated install/basic-install.sh gravity.sh	2016-03-29 12:57:22 -05:00
Nate	31fc2bfeb7	Modified gravity.sh to point to new file locations and fixed permission issue	2016-03-29 00:25:40 -05:00
nate	37c1999965	Merged branch ScriptCleanup-Dev into development	2016-03-28 18:46:08 -05:00
nate	86dd4dd784	New spinner for gravity.sh ... Spinner in gravity.sh now matches basic-install.sh and uninstall.sh	2016-03-28 18:45:55 -05:00
nate	00b65abd09	Minor changes to reflect new tool usage ... Removed symlink of scripts to u/l/b Added copy for setupLCD to /opt/pihole/ New spinner added to gravity.sh to reflect new spinner in basic-install.sh and uninstall.sh	2016-03-28 18:44:54 -05:00
nate	f2150ee7e1	Merge conflict resolution	2016-03-28 13:07:51 -05:00
nate	2311b42bca	Merge branch 'ScriptCleanup-Dev' ... Conflicts: README.md advanced/Scripts/blacklist.sh advanced/Scripts/piholeDebug.sh advanced/Scripts/whitelist.sh automated install/basic-install.sh gravity.sh	2016-03-28 12:58:44 -05:00
nate	8ef4c12f97	Merge branch 'ScriptCleanup' ... Conflicts: README.md advanced/Scripts/blacklist.sh advanced/Scripts/whitelist.sh automated install/basic-install.sh gravity.sh	2016-03-28 12:21:18 -05:00
nate	0b9e78df2c	Cleaned code and added prompt for purge on uninstall	2016-03-26 16:57:01 -05:00
Carter Maxwell	e4ddf8bc33	remove trailing whitespace gravity.sh	2016-03-05 21:13:43 -08:00
Adam Warner	88674e21cf	Update gravity.sh ... Clear out `pihole.*` files from `/etc/pihole` as they are no longer needed.	2016-02-21 20:45:56 +00:00
Promofaux	bffc77e478	Add support for comments and blank lines in adlists.default/adlists.list	2016-02-21 17:45:25 +00:00
Adam Warner	b7cb3df9bc	Merge pull request #305 from fayetted/Issue_304 ... Set file permisions on `/etc/pihole` directory. fixes #304	2016-02-16 22:54:54 +00:00
Adam Warner	3a887af513	Addresses #313 ... path to white and blacklist scripts moved to variables and updated to include full path	2016-02-14 22:24:21 +00:00
Mcat12	af360a1a20	Merge pull request #298 from fayetted/Issue_297 ... Fixes gravity_transport variable interpretation.	2016-02-10 20:10:05 -05:00
Daniel Fayette	73bfbba5f7	Set file permisions on /etc/pihole ... Ensures file permisions on $piholeDir before reload/restart of dnsmasq	2016-02-10 15:07:31 -06:00
Daniel Fayette	a734927591	Fixes gravity_transport variable interpretation. ... Adding (") around Variables passed to function ensures spaces are handled and that missing arguments are accounted for.	2016-02-09 19:51:03 -06:00
Promofaux	5111880edf	remove erroneous -o	2016-01-27 22:35:52 +00:00
Promofaux	b75b290351	adlists.default copied on each run of gravity. In case it has been overwritten	2016-01-27 21:14:23 +00:00
Promofaux	352ebc3193	outsource list of adlists to a file in /etc/pihole/.	2016-01-26 20:26:09 +00:00
Adam Warner	e87443b3e4	add 'http://mirror1.malwaredomains.com/files/justdomains' to list of ad-list sources, can be removed if it causes problems	2016-01-25 15:53:49 +00:00
Adam Warner	74ea597bd8	Cosmetic enhancement. Add the domain 'Pi-Hole.IsWorking.OK' to the top of the domain list to return a friendlier looking domain when pinging a blocked host!	2016-01-25 15:52:22 +00:00
Promofaux	6b76270889	Remove spinner call when adding URLs of adlist to array.. seems to break it.	2016-01-24 22:30:12 +00:00
Promofaux	cebdcc71a7	Add $SUDO call to spinner() in gravity.sh	2016-01-24 21:27:25 +00:00
Promofaux	39507b9d0d	Added echo ':::' to the top of the file	2016-01-24 16:47:38 +00:00
Promofaux	a539dc41f3	Tidy up gravity output to match install script	2016-01-24 15:25:24 +00:00
Leo	8b18fdd322	Update gravity.sh	2016-01-21 17:19:09 -05:00
Leo	1349f584be	Use Sudo Detection from Installer in Gravity.sh Also ... Prevents errors from being thrown when gravity.sh is run as root and the user doesn't have sudo installed (just like install.sh does)	2016-01-21 17:14:55 -05:00
Adam Warner	5d842a7533	Merging	2016-01-15 18:45:12 +00:00
Adam Warner	2284a27814	Consumes blacklist.sh now, too.	2016-01-15 15:54:11 +00:00
Adam Warner	cc62d984d2	Changed whitelist function to outsource to whitelist.sh	2016-01-15 14:49:16 +00:00
jacobsalmela	ca5e34a9a9	Merge branch 'master' into whitelist ... # Conflicts: # gravity.sh	2016-01-14 18:12:45 -06:00
Jacob Salmela	3fc1817e7a	Merge branch 'master' into ipv6	2016-01-01 18:34:33 -06:00
Clinton	987e4e02a9	Fix bug in gravity.sh where IPv6 list was not always populated ... Failed to be populated if /tmp/piholeIP does not exist. This may happen under the following conditions: - was not generated during install - gravity.sh being run again after the original install (the file is deleted during the installation process)	2016-01-01 14:11:46 +00:00
Salmela	d646612a25	Block ads over IPv6 ... I’m pretty sure this works well. Maybe someone else can try it out.	2015-12-31 20:26:05 -06:00
Jacob Salmela	26dcbfc1f9	hide minor error ... An error shows up on the first install that `latentWhitelist.txt` doesn't exist and can't be removed. Redirecting STDERR should fix this.	2015-12-27 12:25:35 -06:00
klaas01	a6313c9e9e	Update gravity.sh ... Fix kill command and only run as last step.	2015-12-26 14:37:51 -04:00
Jacob Salmela	c88982d0d5	chmod doesn't apply at initial install	2015-12-09 15:52:53 -06:00
Dan Schaper	d215fa9ade	Resolve merge confict	2015-12-06 20:22:34 -08:00
Dan Schaper	cb91b8f5fa	Add copyright headers	2015-12-06 05:55:50 -08:00
Dan Schaper	a230df0032	Fix errant )	2015-12-06 05:33:22 -08:00
Dan Schaper	b391afef49	Interface pull for multiple platforms	2015-12-06 04:45:04 -08:00
Dan Schaper	d068593582	Get last IP for selected interface	2015-12-06 00:30:16 -08:00
Dan Schaper	d8034f4156	Get last IP listed for interface	2015-12-05 22:17:28 -08:00
Jacob Salmela	0c3409a028	fixes #111 ... Also clears out some errors users don't need to see	2015-12-04 21:41:37 -06:00
Jacob Salmela	3b9f7031d5	Merge pull request #96 from dschaper/feature/AtomicFunctions ... Feature/atomic functions	2015-11-27 18:10:51 -06:00
Jacob Salmela	9fe531d1aa	Merge pull request #94 from dschaper/bug/CleanupFiles ... Bug Fix - Cleanup remnant files	2015-11-27 11:59:47 -06:00
Dan Schaper	9892d06c0d	Code format cleanups	2015-11-26 15:56:37 -08:00
Dan Schaper	d1e475da89	Move black/white list check to pulsar	2015-11-26 15:48:52 -08:00
Dan Schaper	c45dc277b6	Tighten themeatics	2015-11-26 15:29:13 -08:00
Dan Schaper	29ae57465b	Bug Fix - Cleanup Files	2015-11-25 19:51:07 -08:00
Dan Schaper	23856d65e2	IP address detection update	2015-11-25 16:35:36 -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
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	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	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
dschaper	689426180a	Resolve merge conflicts	2015-11-15 13:59:51 +00:00
Dan Schaper	763aa6aa5c	Change shebang to environment ... Find bash in the environment, not hard coded to path	2015-11-11 00:43:00 -08:00
Jacob Salmela	a7d1b0b42c	Revert "theme addition" ... This reverts commit e1b8419a07.	2015-11-06 17:17:14 -06:00
Jacob Salmela	e1b8419a07	theme addition ... Further adherence to the science/star trek theme	2015-11-06 17:16:14 -06:00
Jacob Salmela	932d410b66	anal retentive changes ... OCD	2015-11-06 17:14:05 -06:00
Jacob Salmela	c297a86211	decluttering output ... I love the adherence to the theme, but this line makes it difficult to quickly read what is happening.	2015-11-06 17:10:17 -06:00
Jacob Salmela	1b65193fe4	new hostsfile url ... This seems to be the more appropriate URL: http://hosts-file.net/ad_servers.txt. I compared it to the original URL using opendiff and they are exactly the same.	2015-11-06 17:05:04 -06:00
Jacob Salmela	a06098bb16	remove filename from whitelist output ... I also cleared the whitespace (or rather, Atom did). I moved the pinhole.conf to it's current location I commented out mahakala	2015-11-06 17:03:55 -06:00
Dan Schaper	15b9fb68d7	Remove filename from wc ... Line 118 and Line 127 changed wc to remove filename from output.	2015-11-06 10:24:12 -08:00
Dan Schaper	642c31c361	Theme changes	2015-11-05 18:33:05 -08:00
Dan Schaper	8e21488542	hawson memory reductions	2015-11-05 18:22:17 -08:00
Dan Schaper	23eece9443	Upstream Branch pseudo-rebase	2015-11-05 18:11:34 -08:00
Jacob Salmela	a36352dfb6	Merge pull request #58 from Giermann/patch-1 ... add whitespace after $piholeIP	2015-11-04 21:02:58 -06:00
Jacob Salmela	4ad2b68ee1	reverting IPv6 so I can merge lighttpd.conf	2015-10-27 17:16:17 -05:00
Sven Giermann	d5ffec64f2	add whitespace after $piholeIP ... In my case there had been no whitespace in piholeIP (I configured it statically because 'hostname -I' returns multiple IP addresses, which ends in errornous hosts file), so it's more safe to add one between IP and hostname. Further, I removed the obsolete latentBlacklist variable.	2015-10-22 15:17:44 +02:00
Jacob Salmela	963eacfe05	commenting out mahakala list ... Due to so many users having issues with this list blocking legitimate domains such as microsoft.com, apple.com, xkcd.com and more, I am turning it off by default. While this drastically reduces the amount of domains blocked, ad-blocking performance still seems to function quite well. Long-time users can simply uncomment the list, but this will make it so new users have a more pleasant experience. If you already have the mahakala list, you will need to remove it first with this command: sudo rm /etc/pihole/list.2.adblock.mahakala.is.domains There are a few other lists I am looking at including, but this will provide an immediate fix.	2015-10-11 09:28:11 -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	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	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
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
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	e19a6c3624	Merge pull request #38 from korhadris/master ... Fixes #32 and fixes #35	2015-09-06 10:11:39 -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
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
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
jacobsalmela	563db80b6d	resolves #25 ... Will not count blank lines if they happen to exist.	2015-07-17 20:49:03 -05:00
jacobsalmela	8f961c1aaa	resolves #22 ... This lets dnsmasq re-read the hosts file without disturbing the daemon. So any new entries can be used as soon as gravity.sh is finished running	2015-07-17 13:05:38 -05:00
rmceoin	f6ccb4b658	Merge remote-tracking branch 'upstream/master'	2015-07-13 09:55:53 -07:00
rmceoin	37e926ce84	Parses host only file formats now. Previously only handled hosts file format. ... Specifically, it can now handle the following list: 'http://mirror1.malwaredomains.com/files/justdomains'	2015-07-13 09:28:45 -07:00
jacobsalmela	5c4bfb84b0	uses a variable for hostname instead of raspberrypi ... Some people use a hostname other than raspberrypi, so their hostname did not resolve to 127.0.0.1. I replaced that hardcoded value with a variable so that does not happen. I also added a few comments and minor formatting adjustments,.	2015-07-13 06:59:22 -05:00
rmceoin	552f980430	blacklist was being concatenated with wrong matter	2015-06-22 13:33:02 -07:00
rmceoin	66bb0e7bb3	Strip carriage returns on matter so that whitelists work correctly. Lines that had \r would not match.	2015-06-22 13:03:15 -07:00
rmceoin	e9324f8316	Use double brackets for the test.	2015-06-19 17:54:12 -07:00