981 Commits (4cfe463dfaf2be13dc499e3b9b9dab79e45b56a1)

Author	SHA1	Message	Date
Adam Warner	84bd86f1ee	- Test to see if dnsmasq service is enabled before stopping and disabling it. ... - Some formatting tweaks to the `start_service` `stop_`service` `disable_service` and `enable_service` commands Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	7193f40b87	remove libnettle, missed a >/dev/null ... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	acd69fa4b0	silence push/popd ... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	6584933e92	fix stickler complaints ... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	8cf8da4c78	- Check file /etc/pihole/ftlbranch for current FTL branch, download from github if master, or pi-hole.net if other ... - Check if downloaded binary file can resolve queries, if so stop and disable dnsmasq - Add service_disable function - Add dependency libcap2-bin on debian to enable setcap. Need to check other distos -Always download FTL binary if /etc/pihole/ftlbranch does not contain "master" - Change some strings/variables that reference dnsmasq and change them to pihole/pihole-FTL Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	cadab61a21	Merge branch 'development' into FTLDNS	6 years ago
Dan Schaper	3425b9a82e	Fix mktmp > mktemp ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
DL6ER	fcdc85eab8	Remove dnsmasq from dependencies ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Dan Schaper	4606693e62	Use pushd/popd and create random temporary directory to prevent potential backdoor binary injection. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Adam Warner	e61d8e4fb8	adlists.default no longer used. No need to reference it. ... Use --force switch of gravity to force the cache refresh Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
DL6ER	8b79017d0f	Always replace pihole-FTL.service ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	5465ac9ba0	Merge pull request #1929 from pi-hole/fix/flushDB ... pihole -f: Flush database	6 years ago
Mark Drobnak	3472241289	Merge pull request #1962 from floek/master ... Fixes https://github.com/pi-hole/pi-hole/issues/1772	6 years ago
Florian Freund	a944b6ff79	Fixes https://github.com/pi-hole/pi-hole/issues/1772	6 years ago
Sebastian Pucilowski	c5a2ca5c98	Trivial spelling mistakes in basic-install.sh comments ... Signed-off-by: Sebastian Pucilowski <smopucilowski@gmail.com>	6 years ago
Elias Ojala	2b6d9c34c9	Fixed a typo ... Signed-off-by: Elias Ojala <ojala.s.elias@gmail.com>	6 years ago
DL6ER	158ea1d43b	Add sqlite3 dependency ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Mark Drobnak	535b8458d4	Merge pull request #1901 from bcambl/epel_check ... Fix epel-release install for CentOS	6 years ago
Dan Schaper	9543203610	Echo the right location for the log. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	cacfe4d387	Linting changes ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	a7f0137e5f	Use more secure installation log process. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	b2eb364a4b	Update header ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	bb3b1bc6ba	Move ascii berry to after root check, stops the double berry for the sudo refire. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
bcambl	cc47bf8f6c	Fix epel-release install for CentOS ... Signed-off-by: bcambl <blayne@blaynecampbell.com>	6 years ago
DL6ER	a154f1540f	Merge pull request #1778 from loganaden/development ... Add secondary quad9 server	6 years ago
DL6ER	677033afca	Force update of "remote" part in th update checker (may take up to 24hrs for new installs otherwise) ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Adam Warner	95e5baa967	Source setup vars before we attempt to do anything on an update/repair ... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
DL6ER	f89f7ecd3e	Randomize GitHub API update check time ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
Dan Schaper	29ee8250e9	Change package install notification from CROSS to TICK. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	863ea7294f	Merge pull request #1815 from pi-hole/release/3.2 ... Merge Release 3.2 in to development. GitFlow	7 years ago
bcambl	f89d69b081	check NetworkManager status prior to using the cli (#1653) ... Closes #1653 Signed-off-by: bcambl <blayne@blaynecampbell.com>	7 years ago
Adam Warner	79aada0b87	travis didn't like that ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	69dc22c10f	fix some codacy and intelliJ idea complaints ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	dd6a9a0b84	supress output of `which command` on centos/fedora as per https://github.com/pi-hole/pi-hole/pull/1776#discussion_r155156819 ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	945dcc6c2b	Indent two spaces as per https://github.com/pi-hole/pi-hole/pull/1776#discussion_r155157116 ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	f60791ac7c	Add dependencies as per https://github.com/pi-hole/pi-hole/pull/1776#discussion_r155149349 ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	b64155a165	Add in an extra check to enable lighttpd. ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Loganaden Velvindron	9c8526db49	Add secondary quad9 server	7 years ago
Terror	616962200a	Update the list size to show all the options	7 years ago
Terror	eb9c44a347	Add support for Quad9 secure dns server ... See www.quad9.net	7 years ago
Jacob Salmela	f63267a7f9	Merge pull request #1757 from Mausy5043/development ... Various small fixes	7 years ago
Jacob Salmela	9631519eb1	Merge pull request #1752 from pi-hole/new/bashupdatechecker ... Add bash / cron based update checker for Pi-hole	7 years ago
mettacrawler	35dc4800e0	basic-install.sh - no CIDR in ifcfg-* ... Do not expect CIDR format IP addresses in /etc/sysconfig/network-scripts/ifcfg-* files as it is not a requirement. Expect only: IPADDR=10.10.10.10 Do not expect: IPADDR=10.10.10.10/24	7 years ago
Mausy5043	ec4e4d3b72	fix indentation	7 years ago
Mausy5043	63312ac4b8	removed duplicate word	7 years ago
Mausy5043	d158a7d51e	spelling corrected	7 years ago
Mausy5043	209a2ab3ec	grammar corrected (double negative)	7 years ago
DL6ER	06764d0f36	Randomize gravity update time between 03:01 - 04:58 (excluding 04:00) ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	7362416afb	Force an update of the updatechecker after update/install ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	c34c3eb016	Shift randomized time interval from 00:00-01:59 to 02:00-03:59	7 years ago
DL6ER	85d159bdd1	Randomize gravity update time ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
WaLLy3K	a9ad8d67aa	Remove superseded index.js ... Signed off by WaLLy3K <wally3k@pi-hole.net>	7 years ago
Mcat12	7884423e05	Merge pull request #1719 from 19wolf/patch-1 ... Update basic-install.sh	7 years ago
Eric Wolf	1615fa63e3	Update basic-install.sh ... Fixed comment line 40	7 years ago
WaLLy3K	feb2150d9b	Fix `LIGHTTPD_ENABLED` dupes in `setupVars.conf` ... * Fix issue merged [here](fdf2649f2f (diff-689793e68cde6270d074695b71c969afL1488))	7 years ago
Adam Warner	a0bd517380	Merge pull request #1694 from pi-hole/fix/qf-opt ... Slow query fix & queryFunc optimisation	7 years ago
WaLLy3K	911596daf8	Start and enable FTL prior to running Gravity	7 years ago
WaLLy3K	d56beedd7a	Add idn2 dependency	7 years ago
Adam Warner	5f4be0de35	adjust lighttpd config depending on whether or not custom.php exists ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	6c605f55f9	always overwrite default blockpage, so that changes can be rolled out ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	6b6d105c2f	Merge branch 'development' into sqlite-dependency	7 years ago
WaLLy3K	2f36acae49	Remove errornous space	7 years ago
Adam Warner	64f29120c8	indent nested function in basic-install.sh ... fix dependency in uninstall.sh Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	d92434b1e9	Merge branch 'development' into sqlite-dependency ... Signed-off-by: Adam Warner <adamw@rner.email> # Conflicts: # automated install/basic-install.sh	7 years ago
Adam Warner	01cd056bcc	Work out correct SQLITE version for php-sqlite ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	56f2ea3ec2	Add Fedora/Centos dependency ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
WaLLy3K	fdf2649f2f	Clean up known remaining colour output issues (#1613) ... * Print newline on error message * Output last three lines of error if update fails * Consistent error messages & housekeeping * Add shellcheck directive to ignore COL_TABLE * Quoted and braced variables for codebase consistency * Escaped newlines correctly * Made error messages consistent (indenting and wording) * Removed consecutive echos * Conditional formatting consistency * Braced, quoted and used [[ on conditionals * Fix specific ShellCheck issues * Fixed issues that could be safely changed without extensive testing * Update SELinux whiptail behaviour & more * Colourised some strings * Fixed multiple line string indenting * Made output consistent with existing codebase * Removed sequential echos * Make SELinux whiptail use "--defaultno", and change text wording * Add help text for hostrecord, and colourise output * this should fix the tests... Signed-off-by: Adam Warner <adamw@rner.email> * revert changes to `update_package_cache()` to prove tests Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Mcat12	b09c660833	Always process DNS and DHCP settings in installer (#1630) ... * Always process DNS and DHCP settings in installer * Make sure dnsmasq config exists before modifying it Signed-off-by: Mcat12 <newtoncat12@yahoo.com> * Make sure the dnsmasq config directory exists Signed-off-by: Mcat12 <newtoncat12@yahoo.com> * Only remove the DHCP config if it exists (fixes tests, hopefully) Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	7 years ago
Adam Warner	c02a24cf71	Fix/unbreak development (#1635) ... * Always process DNS and DHCP settings in installer * change where finalExports is called and where LIGHTTPD_ENABLED is set. Signed-off-by: Adam Warner <adamw@rner.email> * this may or may not work. If it does, can be functionised to reduce code duping Signed-off-by: Adam Warner <adamw@rner.email> * This will fix the tests, but break the patch Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Mcat12	a77136bd1d	Merge pull request #1600 from pi-hole/tweak/OnlyDownloadFTLNew ... Only download FTL if a newer version than currently installed is detected (or if no version is detected)	7 years ago
Adam Warner	a293b5a371	prevent `./automated install/basic-install.sh: line 1886: /usr/bin/pihole-FTL: No such file or directory` on new install, or if pihole-FTL is missing for whatever reason. ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	1c93868ae1	Adjust wording of echos ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
WaLLy3K	c9a98b68c8	Avoid reactivating a deactivated lighttpd service (#1485) ... * Do not activate disabled lighttpd upon update * Fixes #1362 * Use systemctl when available * Move `finalexports` to the very end of the install script set value of LIGHTTPD_ENABLED to 1 or 0 depending on whether or not lighttpd is enabled or disabled. actually save LIGHTTPD_ENABLED value to setupvars.conf Signed-off-by: Adam Warner <adamw@rner.email> * add [[ -z "${LIGHTTPD_ENABLED}" ]] back in! Signed-off-by: Adam Warner <adamw@rner.email> * Ensure "Loaded:" is the line being checked * Colourise disabled lighttpd message * Prevent disabled lighttpd triggering error * change of plan, don't need that [[ -z "${LIGHTTPD_ENABLED}" ]] Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	edb594461d	Remove CIDR from IPv6 address when detecting it in the install script ... Signed-off-by: Adam Warner <adamw@rner.email> # Conflicts: # automated install/basic-install.sh	7 years ago
Adam Warner	bf70c2c660	initial changes to tests to take into account changes to strings ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	74b912a0b7	Check if FTL is already installed, do not download if it is detected, and the sha1sum matches the remote ... This will probably break some tests. I'll work that out in a bit Signed-off-by: Adam Warner <adamw@rner.email> Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Dan Schaper	2778d88e8a	Fix missing `then` clause	7 years ago
Jacob Salmela	e7ad972783	fix thre spelling errors	7 years ago
Jacob Salmela	2f939d8c56	fix two spelling errors	7 years ago
Jacob Salmela	aad39c5ffc	add comments for nearly every line of code.	7 years ago
WaLLy3K	c6ba03802f	Add "php5-sqlite" to dependencies	7 years ago
Adam Warner	b3eb5c4f0e	Colour Tweaks (#1549)	7 years ago
Adam Warner	ab1a6d8829	Fix install script using IPv6 CIDR notation (#1570)	7 years ago
Mcat12	0de15f7a97	Merge branch 'development' into patch-1	7 years ago
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"	7 years ago
Adam Warner	ecde222512	[Staging] 3.1 (#1502) ... * Fix handling of wildcard help text * Rewrite help text for better handling of params * Replace misleading letter variable * stash changes on branch switch, else it fails if any changes have been made. * Make changes according to comment in #1384 * Update queryFunc() * Allow scanList() to search files using a wildcard by removing quotes wrapped around `${list}` * scanList() will not provide a domain ouput on each string if exact is specified (`grep -l`) * Remove unused processWildcards() function * Return a message if no domain is specified * IDN domains are converted to punycode when running a `pihole -q` search if the `python` package is available, otherwise will revert to current behaviour * Scan Blacklist & Wildcards first, exiting from search if a match is found (Fixes #1330) * Use one `grep` subshell to search for all "*.domains" lists at once (opposed to looping to get every matching file name, and then spawning a `grep` instance for every matching file) * queryFunc() will not return "(0 results)" output from files where no match is found * Sort results based off list number * Return a message if no results are found * Update basic-install.sh * Update block page. Allow for setupVars setting of CUSTOMBLOCKPAGE (bool) to prevent it being overwritten * simplify * further simplify * fix inteliJ IDEA complaints * even further simplify * tidy up output * revert line, looks tidyer * clarify * Revert "Ensure any changes to blocking page are updated." * We test for dpkg lock on line 830 directly, no need for the check also in the template section. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net> * Display FTL version & version.sh rewrite While testing to make sure `pihole -v` would output `pihole-FTL version`, I noticed some options didn't work how I expected them to. For example, if I use `pihole -v -p`, I would expect to see the version output of Pi-hole Core. Instead, I'm informed that it's an invalid option. I've had the following things in mind while rewriting this: * I'm operating under the assumption that FTL is only installed if the Admin Console is (Line 113 exit 0) * I have modified the help text to only output with `pihole -v --help` * I have modified all output to be more similar to the output style of `grep` and `curl` (Ditching ":::") Testing output: ``` w3k@MCT:~$ pihole -v Pi-hole version is v3.0.1-14-ga928cd3 (Latest: v3.0.1) Admin Console version is v3.0-9-g3760482 (Latest: v3.0.1) FTL version is v2.6.2 (Latest: v2.6.2) w3k@MCT:~$ pihole -v -c Current Pi-hole version is v3.0.1-14-ga928cd3 Current Admin Console version is v3.0-9-g3760482 Current FTL version is v2.6.2 w3k@MCT:~$ pihole -v -l Latest Pi-hole version is v3.0.1 Latest Admin Console version is v3.0.1 Latest FTL version is v2.6.2 w3k@MCT:~$ pihole -v -p --hash Current Pi-hole hash is a928cd3 w3k@MCT:~$ pihole -v -a --hash Current Admin Console hash is 3760482 w3k@MCT:~$ pihole -v --help Usage: pihole -v [REPO | OPTION] [OPTION] Show Pi-hole, Web Admin & FTL versions <Shows all Repositories and Options> w3k@MCT:~$ pihole -v -foo Invalid Option! ``` * Update -h to work as --hash Also provide error output as per https://github.com/pi-hole/pi-hole/pull/1447#issuecomment-300600093 * Perform EXACT searches on HOSTS lists correctly `\s` on the end may be overkill, but it is the existing scanList() behaviour. * Fixed indentation * Minimise string duplication & other minor changes Instead of duplicating output strings, rewrite core/web/ftlOutput() into one neat versionOutput(). * Modified syntax to be valid for Shellcheck * Log and echo gateway responses * Update queryFunc() to search Whitelist If there is a match in Whitelist/Blacklist/Wildcards, `[ ! -t 1 ]` will cause the search to end if the terminal is closed when the script is called. This has the intended effect of allowing a user to search for a W/B/W domain (as well as all the adlists it's found in) using `pihole -q` via Terminal, but the script will stop searching after a W/B/W match when called by the block page. * Wrap in double brackets * Provide remote hashes for version.sh * Provide remote hashes for comparison * Use double braces for all conditions (for consistency) * Suppress potential "cd" error output * Provide "not applicable" output upon any hash request for FTL * whitelist on website blocked doesnt work (#1452) Since Pi-hole redirects ad domains to itself, accessing the script via de.ign.com is the same as pi.hole in this case. The fix should be as simple as adding a / before admin on this line. * Solve piholeLogFlush.sh having to be issued 2 x to clear logs (#1460) Simplified the command -v syntax, and added a sleep 3 timer to the first execution of the log rotation. The second execution was being issued while the first was still running, thus it would fail and you would have to issue the "Flush Logs" command a second time. * Use `echo "ABC" | pihole tricorder` to upload to Pi-hole's medical tricorder. Uses SSL if available. * Update list.sh I believe this has feature parity with `sed /foo/ Id` but also supports busybox, and my alpine docker ;) * Document `sed` substitution for user readability Comment the oneliner with explanations of what each step does. * Update Help Output (#1467) * File consistency * Tabs to 2 spaces * Corrected indenting * Double braced conditionals * Quoted variables within conditionals * Standardise core help text * Added help text for disable command * Added help text for logging command * Clean up * Fixed certain new lines and spaces * Sync with development branch * Formatting consistency * Tabs to 2 spaces * Corrected indenting * Double braced conditionals * Quoted variables within conditionals * Fixed certain newlines and spaces * Admin help text * Added help text for interface command * Sync with development branch * Formatting consistency * Tabs to 2 spaces * Fixed some wording * Fixed certain spaces * Formatting consistency * Minor wording changes * Tabs to 2 spaces * Corrected indenting * Double braced conditionals * Quoted variables within conditionals * Fixed certain newlines and spaces * Blacklist help text * Formatting consistency * Tabs to 2 spaces * Corrected indenting * Cronometer help text * Formatting consistency * Fixed certain newlines and spaces * Corrected indenting * Checkout warning alteration * Add checkout help text * Corrected help output * Show help for "pihole -a -i --help" * Fix "pihole disable --help" and "pihole -l --help" * Show help for "pihole -v -h" * Indent output text * Minor help text change * Show help for "pihole checkout --help" * Tricorder: Insecure Opt-out * Check to see if Tricorder is being called directly * Provide opt-out for insecure transmission of debug log * Remove mention of internal function from help menu * 🌮 is the new :shipit: squirrel * Wording changes and bug fix * Fix wildcard help text * -wild is not a valid option since we're already using -wild * Fix logrotation: manual flushing should be done twice, but automated rotation at midnight should only be done *once*! * Print echos only when manual flushing is requested * Add "quiet" mode + update comments in the cron file * Confirm Tricorder is online * Scan port 9998 to confirm the availability of "tricorder.pi-hole.net" * Exit codes for upload process * Formatting consistency * Add link to Windows DNS Swapper See #1400 * Install loopback firewall rules for FTL (#1419) * Install loopback firewall rules for FTL * FirewallD FTL ports Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net> * Remove firewallD FTL local rules. Local rules should not be blocked in firewallD, not requred for internal service FTD> * Reinstate https rules, and delete FTL rules Fixes earlier commit. * Retrieve local repos on repair (#1481) * Retrieve local repos on repair * Change conditional to check for repair * Change wording of Update/Reconfigure message * Fixed indenting * Perform "git reset --hard" on reconfigure * Change directory before trying to reset repository. Fixes #1489 * No need to `cd $PWD` as it doesn't affect flow of caller script. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net> * Refine output of password status in basic-install.sh:displayFinalMessage(). Fixes #1488 (#1490) * Rewrite Chronometer to output more stats * Fix output IPv4 addr when removing CIDR notation (#1498) * Move wildcards file if blocking is disabled (#1495) * Move wildcards file if blocking is diabled * Delete newline * Roll back merge #1417 (#1494) * Update ISSUE_TEMPLATE.md * Remove Question option * Prefer ULA over GUA addresses [IPv6] (#1508) * On installs with GUA and ULA's we should prefer ULA's as it's been demonstrated that GUA's can and often are rotated by ISPs. Fixes #1473 * Add test for link-local address detection * Add ULA-only and GUA-only tests * Add test_IPv6_GUA_ULA_test and test_IPv6_ULA_GUA_test * Add "" * Add mock_command_2 command that can mock a command with more than one argument (as "ip -6 address") and result multiple lines of results * Make mock_command_2 more similar to the original mock_command * Correct comments * Fixed remaining comments * Fixed one last comment... * Fixed a comment... * Add weekly logrotation of FTL's log (#1509) * Update LICENSE of the project to EUPL v1.2 * Make clear that NO is the default if the user just hits return (#1514) * Add tricorderFunc back as usable function (#1515) As per #1464 * Don't update FTL when there is a core update (as this will update FTL a second time). Fixes #1516 * Add FTL tests to the test suite (#1510) * Add first version of FTL tests * Wait one second to allow FTL to start up and analyze our mock log * Add test_FTL_telnet_statistics * Added test_FTL_telnet_top_clients * Add test_FTL_telnet_top_domains * Revert "Add FTL tests to the test suite (#1510)" (#1519) This reverts commit cf6a1ac9ad. * Trim version output when update is successful (#1527) * Change ownership of /etc/pihole to user/group pihole. Fixes #1529 (#1530) * Delete temporary files after installing the FTL binary. Fixes #1525 * Change from admin to approvers teams * Introduce new file black.list for blacklist content * 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) * Remove useless cat * Improve displayed messages and overall logic * Disable black.list on "pihole disable" * cp + rm === mv (well, almost)	7 years ago
Terror	5b472ff67c	Add support for PowerPC architecture ... Related to https://github.com/pi-hole/FTL/pull/88	7 years ago
DL6ER	3d7582faec	Delete temporary files after installing the FTL binary. Fixes #1525	7 years ago
DL6ER	8ef64dbe74	Add weekly logrotation of FTL's log (#1509)	7 years ago
DL6ER	01e091fd17	Prefer ULA over GUA addresses [IPv6] (#1508) ... * On installs with GUA and ULA's we should prefer ULA's as it's been demonstrated that GUA's can and often are rotated by ISPs. Fixes #1473 * Add test for link-local address detection * Add ULA-only and GUA-only tests * Add test_IPv6_GUA_ULA_test and test_IPv6_ULA_GUA_test * Add "" * Add mock_command_2 command that can mock a command with more than one argument (as "ip -6 address") and result multiple lines of results * Make mock_command_2 more similar to the original mock_command * Correct comments * Fixed remaining comments * Fixed one last comment... * Fixed a comment...	7 years ago
WaLLy3K	98fdb95645	Merge pull request #1491 from pi-hole/fix/ResetInRepoDir ... Change directory before trying to reset repository	7 years ago
DL6ER	3035c9a366	Refine output of password status in basic-install.sh:displayFinalMessage(). Fixes #1488 (#1490)	7 years ago
Dan Schaper	5004cf331a	No need to `cd $PWD` as it doesn't affect flow of caller script. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
DL6ER	74eb8c8622	Change directory before trying to reset repository. Fixes #1489	7 years ago
WaLLy3K	2ef87ad110	Retrieve local repos on repair (#1481) ... * Retrieve local repos on repair * Change conditional to check for repair * Change wording of Update/Reconfigure message * Fixed indenting * Perform "git reset --hard" on reconfigure	7 years ago
DL6ER	c655e6ea73	Install loopback firewall rules for FTL (#1419) ... * Install loopback firewall rules for FTL * FirewallD FTL ports Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net> * Remove firewallD FTL local rules. Local rules should not be blocked in firewallD, not requred for internal service FTD> * Reinstate https rules, and delete FTL rules Fixes earlier commit.	7 years ago
Dan Schaper	c793295be0	Merge pull request #1446 from pi-hole/tweak/install_lockcheck ... Clarify error message on apt failures.	7 years ago
Dan Schaper	dfc32b26a6	We test for dpkg lock on line 830 directly, no need for the check also ... in the template section. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Adam Warner	89fd962615	Revert "Ensure any changes to blocking page are updated."	7 years ago
Adam Warner	a928cd3fa1	Merge pull request #1437 from pi-hole/blockPage ... Ensure any changes to blocking page are updated.	7 years ago
Adam Warner	525a1228c3	clarify	7 years ago
Adam Warner	19fd25c7cd	revert line, looks tidyer	7 years ago
Adam Warner	5b0927ca4b	tidy up output	7 years ago
Adam Warner	324d4433c3	even further simplify	7 years ago
Adam Warner	615ca56ea3	fix inteliJ IDEA complaints	7 years ago
Adam Warner	41dd163453	further simplify	7 years ago
Adam Warner	5cd2c77d98	simplify	7 years ago
Adam Warner	f270f7430c	Update block page. Allow for setupVars setting of CUSTOMBLOCKPAGE (bool) to prevent it being overwritten	7 years ago
Dan Schaper	99b23627d0	Update basic-install.sh	7 years ago
Adam Warner	b13171cc45	$1 is not $pw. Seriously, who let me onto this project	7 years ago
Adam Warner	9c645e2010	Seriously.	7 years ago
Adam Warner	bb6f409e89	dropped a "	7 years ago
Adam Warner	61ec7723f6	use function in install script	7 years ago
Adam Warner	9c136a5579	functionise Hashing	7 years ago
Adam Warner	a5733508ae	Double hash the password directly in the install script	7 years ago
Dan Schaper	8c657910ae	Merge pull request #1280 from technicalpyro/development ... fixes missing dialog package from some distros	7 years ago
Mcat12	57e8b7f924	Merge pull request #1355 from pmo3/development ... Mask password input when changing password	7 years ago
DL6ER	474881e4c7	Merge pull request #1346 from pi-hole/varChanges ... Clean up previous PR	7 years ago
Flo	7e0aa822b6	Match the Pi-hole brand (#1358) ... * Update README.md * Update index.php * Update basic-install.sh * Update piholeCheckout.sh * Update update.sh * Update CONTRIBUTING.md * Update the Pi-hole brand tip in CONTRIBUTING.md Use a better formulation. * Update README.md 2	7 years ago
Patrick O'Brien	94f15f1b3c	Merge remote-tracking branch 'upstream/development' into development	7 years ago
Patrick O'Brien	ee296f36c1	mask password input on command line	7 years ago
Dan Schaper	af1d1bd9c2	One more change ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	f32ad7699d	Merge pull request #1320 from georou/development ... Use Firewalld --add-service instead of port	7 years ago
Dan Schaper	79294bb6ca	Merge pull request #1332 from pi-hole/varChanges ... replace instances of "/etc/.pihole" with ${PI_HOLE_LOCAL_REPO}	7 years ago
Dan Schaper	2834f2ccc2	Let `ip` determine which links are candidates. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
georou	0d794226ab	Removed unsupported POSIX brace expansion	7 years ago
Adam Warner	83662c9e50	additional requested changes	7 years ago
Adam Warner	6c1d52199f	Merge branch 'master' of https://github.com/jftuga/pi-hole into jftuga-master	7 years ago
John Taylor	76bd53ef1f	replace instances of "/etc/.pihole" with ${PI_HOLE_LOCAL_REPO}	7 years ago
georou	e45559da20	Use Firewalld services instead of ports	7 years ago
Jacob Salmela	5e16487ef6	add ascii berry to beginning of installer	7 years ago
DL6ER	f2fe84c9d3	Merge pull request #1292 from pi-hole/master ... Merge patches back into devel	7 years ago
DL6ER	f626406685	Revert #1273	7 years ago
Dan Schaper	8776b822db	Merge pull request #1287 from pi-hole/fix/update_fail ... Exit script immediately if we can't update package cache.	7 years ago
DL6ER	fc76b1a6a3	Merge pull request #1244 from pi-hole/new/FTL-binary ... FTL	7 years ago
DL6ER	9502356980	Move test_dpkg_lock to initial UPDATE_PKG_CACHE. There was unpredictable interference with debconf-apt-progress	7 years ago
DL6ER	a535ca9db4	Some tweaks to the new dpkg lock detector	7 years ago
DL6ER	2c762899de	Add loop to wait if package manager is blocked externally	7 years ago
Dan Schaper	24fd23493d	Exit script immediately if we can't update package cache. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
DL6ER	66b7d04b82	Merge branch 'development' into new/FTL-binary	7 years ago
Technicalpyro	93dea7b942	Moved to installers dependencies	7 years ago
Dan Schaper	ca24f7c143	Merge pull request #1273 from pi-hole/new/no_fixed_interface ... Don't save `interface=` line to `dnsmasq`s config file	7 years ago
Technicalpyro	697b0295f3	fixes missing dialog package from some ditros	7 years ago
DL6ER	ae24f1255f	Bugfix: Delete INSTALL_WEB line before adding new one	7 years ago
DL6ER	ec7e75a6e3	Don't save `interface=` line to `dnsmasq`s config file	7 years ago
Jacob Salmela	7a1a2dec67	update license to EUPL on core files	7 years ago
DL6ER	af2893d2ce	Updater implementation for FTL	7 years ago
Dan Schaper	4dcee5cd84	`arch` is not portable. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
DL6ER	1645677c3a	Cosmetics	7 years ago
DL6ER	77b3764481	Remove resundant code (FTL will later be enabled by enable_service)	7 years ago
DL6ER	90ccbef431	pihole-FTL init.d script	7 years ago
Dan Schaper	4cd598ae10	Check support files installed and permissions. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	2ffb103acb	Move binary to final home. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	a0c17368ed	`cd` to directory to sha1sum ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	6023984703	Silence sha check ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	cde7b53de3	Check sha1 of transferred file. ... Sha1sum file in temp directory. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	e087797edc	Test for format of tag version. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	5e6f8489a9	Find 404 errors and relay message. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	48351fed79	Remove trailing newline from curl'd variable. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	875a5d309d	Check downloaded file for binary or text. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	70e876ee13	Download tests. ... Make sure we download a binary and not just get the GitHub page. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	7a269e757e	Debian buildpack image for docker (Need `curl` for testing, using scm version to add `curl` and `git`.) ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	87edbeaf58	Factor out downloader from detector function. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	339f95b00c	Change from `uname -m` to straight `arch` ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
DL6ER	70a6a79b8c	Detect library differently	7 years ago
DL6ER	f24f77c5bd	Detect if architecture is *aarch* + use hf binary only if ARMv7+ is detected	7 years ago
DL6ER	378338c684	Install pihole-FTL to /usr/bin instead of /usr/local/bin	7 years ago
Adam Warner	36166c129a	Merge pull request #1253 from Skittels0/even_more_dns ... Adds DNS.WATCH to default dns servers	7 years ago
Skittels	4e7a485e23	Update basic-install.sh	7 years ago
Skittels	9e5795bf55	Added DNS.WATCH to default dns servers	7 years ago
DL6ER	4035c933df	Moved echo to else block	7 years ago
DL6ER	abd44dd284	Add 32bit message	7 years ago
DL6ER	95d7fe76b5	Make comments more pretty	7 years ago
DL6ER	a052f397fe	Be more verbose during install	7 years ago
DL6ER	09d6e73b0a	Don't print error message on 32bit platforms	7 years ago
DL6ER	7fb6b71d52	Fix install path	7 years ago
DL6ER	07e37d7fc3	Proper error handling	7 years ago
DL6ER	fbe3dc0dcd	Have to get latest tag via GitHub API for downloading the binaries	7 years ago
DL6ER	6018c0c2fc	Add FTLinstall()	7 years ago
DL6ER	52a2f166fd	Add FTLdownload() subroutine	7 years ago
Mcat12	ba67144e34	Merge branch 'development' into adminPageAsOption	7 years ago
Dan Schaper	34f326c559	Update basic-install.sh	7 years ago
DL6ER	8fb6ba19a1	Remove double echos	7 years ago
Dan Schaper	314f7e7889	Merge pull request #1183 from pi-hole/tweak/update_cache_trap ... Trap for package cache update failures.	7 years ago
Promofaux	4fcf8fd23f	Merge in `development` branch - resolve conflict in update.sh	7 years ago
Promofaux	1206dda347	testing putting `runGravity` at a different part of the script	7 years ago
Promofaux	e57425df5f	0.0.0.0 instead of pi-holes IP address for redirect purposes	7 years ago
Dan Schaper	b8d0e5e5a1	Merge pull request #1210 from pi-hole/fix/dhcpcd_int ... Remove comment leaders from DHCPCD interface	7 years ago
Dan Schaper	26ad23f01e	Remove comment leaders from DHCPCD interface ... We need to set the interface in DHCPCD, comments were inadvertently added a while ago.	7 years ago
Mcat12	18eb8a2159	Merge pull request #1185 from pi-hole/cleanup/git_functions ... Move git functions to one script	7 years ago
DL6ER	8b22f435ad	Change how user and group are stored in the logrotate config file (necessary on Ubuntu 16.04.1)	7 years ago
Dan Schaper	3861b57dc6	Start moving reused utility functions to one script.	7 years ago
Dan Schaper	7291aa07ca	Silenc cache updater.	7 years ago
Dan Schaper	409f76aa34	Error check.	7 years ago
Dan Schaper	a281d87315	Eval variable. (Not a fan.)	7 years ago
Dan Schaper	2d18b2d784	Start test templates.	7 years ago
Promofaux	c31b4383e6	add back in code to stop `dnsmasq` and `lighttpd` during install.	7 years ago
Promofaux	35828f9cea	Source setupvars earlier in update/repair process	7 years ago
Promofaux	90af12fdb8	Remember the [@]	7 years ago
Promofaux	5fede23cf7	trying another tactic	7 years ago
Promofaux	bc4762f270	no need to stop dnsmasq/lighttpt if we're going to reload them at the end anyway.	7 years ago
Promofaux	01429d59bd	more web checks	7 years ago
Promofaux	731d15f9b5	don't display web admin info in final dialog if it's not selected	7 years ago
Promofaux	f0bd7fae5c	) not }	7 years ago
Promofaux	f8322cc2d4	use the web install flag. Could be optimised	7 years ago
Promofaux	dfdb9e393b	move repo clone to function	7 years ago
Promofaux	bd07d7f32e	Only install web dependenices if flag is true	7 years ago
Promofaux	f588c6f93c	introduce web toggle flag	7 years ago
Promofaux	d9ec3d2c22	spelling	7 years ago
Promofaux	e2b87759d8	split out web dependencies	7 years ago
Dan Schaper	52e0aa11af	Have install create directory	7 years ago
Dan Schaper	1421c31179	`install` index and blockingpage assets.	7 years ago
Dan Schaper	91bcc18e6a	Make full path to directory for pihole web page.	7 years ago
Dan Schaper	5b43f13935	Fresh install web page directory tests	7 years ago
DL6ER	2c16a75ef1	Use stat to get owner of /var/log	7 years ago
DL6ER	6fd7e0311c	Install customized version of logrotate script	7 years ago
Dan Schaper	cec214f900	User decline to install shouldn't be an error return.	7 years ago
Dan Schaper	b16f797317	`firewall-cmd --state` returns 0 on 'running' non 0 on 'not running', ... so check retval and not text returned. FirewallD conversion to multicall IPTables test	7 years ago
Dan Schaper	8bba3a257c	Merge branch 'tweak/firewall_tests' into tweak/firewall_warning	7 years ago
Dan Schaper	31aa42c35e	Transparency in `sudo` refire.	7 years ago
Dan Schaper	f7a17248b7	Warn with whiptail if `firewall-cmd` is running.	7 years ago
Adam Warner	77554fbd13	Merge pull request #1145 from pi-hole/cleanup/more_shellcheck ... Cleanup/more shellcheck	7 years ago
Dan Schaper	eaf6938c35	DNS whiptail from radio to menu	7 years ago
Dan Schaper	0635309f23	Move distribution check to function. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	cef0211c00	Merge pull request #1151 from pi-hole/fix/CIDR ... Include CIDR notation for IPv4 non-natural blocks.	7 years ago
Dan Schaper	86052540d9	Add back CIDR notation for non-natural blocks. Includes multi-address ... configs. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	62a5e36afd	Remove firewall configuration from update portion of script. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	00b28f0aed	IPTables Whiptal option to install. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	ec8c40b69b	Fix array declaration for Fedora package management. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	34df34ba27	Actually rm the Pi-hole scripts. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	2689b37c35	Combine multiple calls to interface length code. ... && || Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	9b6427144f	|| && conversion. ... Fedora deps array. Use full name of `source` Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	9212eea8bd	Only ignore DOWN interfaces, `tun` interfaces are UNKNOWN. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
DL6ER	0b72c639fb	Check for existance of iptables command. Fixes #1125	7 years ago
Dan Schaper	c58a95ca2e	`setDNS` whiptail direct, not in array. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	80a3bce6d5	PI_HOLE_INSTALL_DIR global variable ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net> `"${pw}"` Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net> Absolute path for pihole Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net> Debian PKG_INSTALL as array Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	6f0289de49	Vestigial variable that was never populated. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	0966d7660e	Take out some whiptail subshells that aren't needed. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net> Take out some whiptail subshells that aren't needed. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	27e90cc4e6	Repetitive `ip route get` was resetting counts. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	b785213c3a	Shellcheck for Test for $? -eq 0 ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net> Shellcheck for Test for $? -eq 0 Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	0e4d5e9103	Bash splitting and globin ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Mcat12	76531da340	Merge pull request #1067 from pi-hole/fix/firewall_redux ... Fix/firewall redux	7 years ago
Adam Warner	12bec1df68	Merge pull request #1048 from pi-hole/tweak/simplify_webpage.sh ... Major simplification of webpage.sh + extend DHCP to IPv6	7 years ago
DL6ER	85f0241c0d	Reprocess DHCP settings after update	7 years ago
Dan Schaper	8ee2bdec4d	Plain grep, escape the special characters. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	de6ce276d0	Merge branch 'development' of github.com:pi-hole/pi-hole into fix/firewall_redux	7 years ago
Dan Schaper	fbea81dcd7	Merge pull request #1068 from pi-hole/fix/anti_glob ... Misc tweaks to the installer script. Defensive git cloning, and ability to source the installer script.	7 years ago
Dan Schaper	502c349b8b	Merge branches 'development' and 'fix/firewall_redux' of github.com:pi-hole/pi-hole into fix/firewall_redux	7 years ago
Adam Warner	5fb0aa70de	Merge pull request #1008 from pi-hole/feature/track_pre-installed_packages ... Feature/track pre installed packages	7 years ago
Dan Schaper	7750e1344c	DRY `displayFinalMessage` ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago