pi-hole

Commit Graph

Author	SHA1	Message	Date
Rob Gill	8ab0b0e460	colfile Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Rob Gill	b8e1849cec	wildcardlist Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Rob Gill	45a8eda49b	Stop grep leak in query Fix grep error leak from #1805 Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Rob Gill	d61fd01d61	Split queryFunc() into query.sh Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Alex Villarreal	e422f4154f	Clean error message on successful response Signed-off-by: Alejandro Villarreal <alex@alexvy86.com>	6 years ago
Rob Gill	cabb06230c	--json not --jason Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
DL6ER	d254d6075a	First step from wildcards to regex lists for blocking Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Rob Gill	8004080643	Additional command-line completion Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Mark Drobnak	d232f08933	Merge pull request #2208 from pi-hole/tweak/checkout Don't run the installer when doing ftl checkout, instead just run the…	6 years ago
Adam Warner	f5541860bc	Don't run the installer when doing ftl checkout, instead just run the ftl install functions Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Rob Gill	83ff0055b6	Test and indicate status This added function tests if pihole-FTL is running when the sysV. Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Mark Drobnak	ab45360808	Merge pull request #1954 from ryanknapper/adlist.lists Prevent redundant entries from being added to Adlists.list	6 years ago
Mark Drobnak	9fd70cbdf9	Merge pull request #2057 from pi-hole/fix/debug-empty-ports debug script: fix empty ports on some systems	6 years ago
Mark Drobnak	3f3254a4df	Merge pull request #2176 from rrobgill/php5fix Fix block page crash on PHP 5.4	6 years ago
Mark Drobnak	f568012b9d	Merge pull request #2070 from pi-hole/new/debug-locale Get user locale when debugging	6 years ago
Rob Gill	382c19024f	oh stickler bot... accidentally a space Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Rob Gill	9379487942	changes as requested changes as requested Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Rob Gill	5e99baf7b9	Update index.php thanks stickler-ci ....... Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Rob Gill	31951dae4c	Update index.php Avoiding calling empty() on a function allows this to work under PHP5. Making the check for blocklist generation in this way instead is compatible with both PHP5 and PHP7. Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
DL6ER	2ef76d5e31	Remove LOCAL_DNS_PORT support Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Adam Warner	a6e4b0fea5	- Test for existence of remote non-master branch of FTL before attemtping to check for update - Move some functions from checkout to basic-install - provide helpful error message on downlaod not existing Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
MichaIng	43f19034b9	"INSTALL_WEB" renamed to "INSTALL_WEB_INTERFACE" #2115 + Small fix, as due to PR https://github.com/pi-hole/pi-hole/pull/2115 variable "INSTALL_WEB" was renamed into "INSTALL_WEB_INTERFACE".	6 years ago
Adam Warner	ceaf4bc6bc	Some extra code made it's way into the dev branch. Not entirely sure how that happened... related to #2115 Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Dan	acfc49fd41	Merge branch 'development' into Install-Web-Server	6 years ago
DL6ER	ce35509a40	Change command to "pihole -a localdnsport X" Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	24b8b4e904	Add backend changes for supporting a local recursive DNS server Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Adam Warner	6977f655e3	fix a typo comment out some unused variables, but not deleting them in case there is a plan for them in future... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	e6fc9dc75d	disable 2016 in two places and declare local variables Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	b57b3f4588	Disable SC2001 for generation of `the_os` Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	776ae92416	fix some shellcheck/stickler compaints in debug script Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	6ba53c1ac0	Merge branch 'development' into FTLDNS	6 years ago
Mark Drobnak	d4870b3854	Merge pull request #2053 from pi-hole/tweak/debug-logs Get head and tail of pihole-FTL.log during debug process	6 years ago
Adam Warner	bca23dd896	Allow passing of --check-only to update script. Don't run installer for updating web files, it's handled by getGitFiles. I think this works... Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Daniel (Fourdee)	3a483a1b20	install_web_server + Splits web interface and server into two variables. + Option to disable forced install of Lighttpd.	6 years ago
Adam Warner	310d33b8ee	Merge dev > FTLDNS fix merge conflicts Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	8b5dcc3872	Match change made by `7edab27` to prevent merge conflict Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Ludovic Rousseau	7edab27e53	Stylistic change to use an explicit if/then/fi Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>	6 years ago
Ludovic Rousseau	9b3531f634	Fix stylistic issue Expand variable using ${FTLconf} Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>	6 years ago
Ludovic Rousseau	d8f85a8981	Avoid a "No such file or directory" error Check the file /etc/pihole/pihole-FTL.conf exists before trying to use it. without the patch I get, each day, in my logs: sed: can't read /etc/pihole/pihole-FTL.conf: No such file or directory I use a variable FTLconf to not repeat the file name twice. Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>	6 years ago
Ludovic Rousseau	3b229489c2	Fix regex to find DBFILE= from configuration file The regex ^\s^.DBFILE\s=\s does not work to match "DBFILE=" I don't know what the second '^' is used for. With the change I now have the results: DBFILE=/foo/bar -> /foo/bar DBFILE=/foo/bar -> /foo/bar # DBFILE=/foo/bar -> /etc/pihole/pihole-FTL.db xDBFILE=/foo/bar -> /etc/pihole/pihole-FTL.db Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>	6 years ago
Jacob Salmela	5ffc3561ed	implement dschapers suggestions--better command, less subshells, and finer formatting Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>	6 years ago
Dan Schaper	250b445eee	Split declaration and population for stickler. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
DL6ER	82d5afe996	Silence error in log flush subroutine when no pihole-FTL.conf can be found Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	6086614274	Add "-l, privacylevel" description to "pihole -a" Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Adam Warner	6bb4780d32	Merge pull request #2077 from pi-hole/tweak/FTLDNSExperiments FTLDNS tweaks	6 years ago
Adam Warner	631f5b4848	Change order of updatable components to match the end output Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
DL6ER	4941e0f8ad	Backend changes needed to be able to set the privacy level Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Adam Warner	f37b2bc7c1	move call to `get_binary_name` into `FTLcheckUpdate()` to avoid having to run that first Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	56278c6394	Fix shellcheck complaints Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	b1d6c03190	Break out binary name funtion to it's own function Remove duplicate code. get_binary_name is now in the install script Add some "version" checking to ftl download when using an alt branch, uses checksum Greatly simplify update process. Source pihole-FTL version checker from basic-install.sh Always run install script to finalise changes. Install script now outputs versions after an update (This is a Squash of previous work into one commit) Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Mark Drobnak	bb9a18ef08	Merge pull request #1987 from ryanknapper/patch-1 Proper output for debug CPU detection	6 years ago
Jacob Salmela	1a275ba184	debug user locale; improve function to parse variables and files Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>	6 years ago
Mark Drobnak	971e6f2664	Merge pull request #2064 from Perflyst/chronometer-1 Add RaspberryPi 3B+ to Chronometer	6 years ago
Dan Schaper	34d84522dd	Merge pull request #2054 from theLMGN/patch-1 Link to the admin panel on the splash page.	6 years ago
Perflyst	3390fbf238	Add RaspberryPi 3B+ Signed-off-by: Perflyst <mail@perflyst.de>	6 years ago
Jacob Salmela	68c27eb2a1	add label to x-header so you know which one is being evaluated Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>	6 years ago
Jacob Salmela	143e75d213	fix empty ports on some systems Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>	6 years ago
DL6ER	295ac49f83	Add capability CAP_NET_RAW to allow pihole-FTL to use RAW sockets for being able to create an ICMPv6 socket for IPv6 handling in the DHCP service Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Adam Warner	fbab930cb1	Allow install script to install FTL instead of the checkout script. Utilises the /etc/pihole/ftlbranch file. Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Leo MG Nesfield (LMGN)	bfcbd72e4b	Link to the admin panel on the splash page.	6 years ago
Jacob Salmela	d9d3caec22	new head tail function and get head tail of pihole-FTL.log instead of just head Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>	6 years ago
Jacob Salmela	7159ecb632	reduce ping times for faster script completion Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>	6 years ago
Adam Warner	5584a9ce5d	Merge branch 'development' into FTLDNS	6 years ago
Adam Warner	76cb129d3c	don't forget `master` and `development` branches! Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Adam Warner	246d5cd587	store checked out FTL branch in /etc/pihole/ftlbranch Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Ryan Knapper	5ecfc58e5f	Require exact match Updated to require an exact match to reduce false-positives, as suggested by DL6ER. Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>	6 years ago
DL6ER	56a2924a33	Unprivileged processes are subject to full permission checking based on the process's credentials, we have to explicitly allow pihole-FTL to bind to ports < 1024 (port 53 for DNS) and for various advanced network-related operations (to allow for handling DHCP requests) Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	09886a3f11	Add resolveconf config to pihole-FTL.service Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	b87bcc8f5f	Modifications in pihole-FTL.service for FTLDNS Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Ryan Knapper	c17d95bfed	Proper output for debug CPU detection Inserted "log_write" to properly output CPU detection lines. Signed-off-by: Ryan Knapper (ryanknapper@gmail.com>	6 years ago
Mark Drobnak	f14184df30	Merge pull request #1982 from LudovicRousseau/master Create blacklist.txt if not existant	6 years ago
Ludovic Rousseau	47bbea9ba7	Use " " to protect parameter substitution Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>	6 years ago
Mark Drobnak	7265935cd4	Merge pull request #1915 from ryanknapper/development Add conditional forwarding options to webpage.sh	6 years ago
Ludovic Rousseau	b7891f92a5	Create blacklist.txt if not existant Closes: https://github.com/pi-hole/pi-hole/issues/1888 Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>	6 years ago
DL6ER	5465ac9ba0	Merge pull request #1929 from pi-hole/fix/flushDB pihole -f: Flush database	6 years ago
DL6ER	b8eaa9a527	Use double quotes to precent globbing and word splitting Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	5d274008db	Use possibly user-defined database location when flushing Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Mcat12	8a42ef431b	Fix Javascript warning when no password is set Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	2cf1f0e8fc	Hide the password input when there is no password Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Ryan Knapper	f2b3752f3d	lan to local Reduced differences. Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>	6 years ago
Ryan Knapper	36945a67d0	Prevent redundant entries in to adlists.list Grep ${args[3]} and only add if grep -c -eq 0 Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>	6 years ago
Mcat12	1a5c86d32e	Revert "Hide password textbox if there is no password" This reverts commit `009fa2f1b7`.	6 years ago
Mcat12	c7219fbdff	Merge remote-tracking branch 'origin/development' into tweak/block-page-no-password	6 years ago
DL6ER	4c249a1186	Flush most recent 24 hours from FTL's database Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	158ea1d43b	Add sqlite3 dependency Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	52cc8e2fcf	Use "lan" as fallback TLD for DHCP generated domains Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
ryanknapper	607664c860	Update webpage.sh Updated webpage.sh to include conditional forwarding options.	6 years ago
Adam Warner	80307a3bcd	Remove update line from cron Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Vasilis Gerakaris	939806f021	piholeDebug.sh: Correct typo mistake Signed-off-by: Vasilis Gerakaris <vgerak@gmail.com> By submitting this pull request, I confirm the following: `{please fill any appropriate checkboxes, e.g: [X]}` - [x] I have read and understood the [contributors guide](https://github.com/pi-hole/pi-hole/blob/master/CONTRIBUTING.md), as well as this entire template. - [x] I have made only one major change in my proposed changes. - [] I have commented my proposed changes within the code. - [] I have tested my proposed changes, and have included unit tests where possible. - [] I am willing to help maintain this change if there are issues with it later. - [x] I give this submission freely and claim no ownership. - [x] It is compatible with the [EUPL 1.2 license](https://opensource.org/licenses/EUPL-1.1) - [x] I have squashed any insignificant commits. ([`git rebase`](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html))	6 years ago
DL6ER	793bdd9743	No need for cat \| sed here as we source setupVars.conf, so we can use interface="${PIHOLE_INTERFACE}" Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	9d50f52bb2	Add fallback interface for DNS listening behavior in case PIHOLE_INTERFACE is not set in setupVars.conf Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	4efb533d2e	Create directories /etc/{var,log}/pihole on startup of pihole-FTL and set proper ownership Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	afa2e9c2f7	Exchange hard-coded domain "localhost" by hard-coded address "127.0.0.1" Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	a4c8f1a0a4	Merge pull request #1859 from pi-hole/new/extra-logging Enable dnsmasq's extra logging feature	7 years ago
Adam Warner	8e0d76b63b	initiated -> initialized Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
DL6ER	cca8412921	Use "echo -n" to avoid haveing newlines in the files Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	d15a5ad5c1	Add required documentation in the source code Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	8ed75dd176	Add extra entry to the end of the saved branches and versions such that PHP's explode() subroutine can correctly disentangle the first three entries and does not get confused by the newline character at the end of the FTL version/branch... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
Dan Schaper	8ca0582afc	Merge branch 'release/v3.2.1' into fix/DNSSEC_trustanchor	7 years ago
DL6ER	5c2dcb5e74	Enable dnsmasq's extra logging feature Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	be0c457445	Sleep 30 seconds after reboot to be sure that the system is ready Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	3c04dbb4ed	Update remote version at 17:59 as well as on reboot Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	cfca367eef	Quickly verified in dnsmasq's source code: It has to be "trust-anchor" (with "-") Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	8a243c5872	Insert also old trust anchor Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	b30b3f3aeb	Update DNSSEC trust anchor Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
Mark Drobnak	e3fa06d7ff	Merge pull request #1829 from keithbentrup/development Must send HTTP headers before html	7 years ago
Dan Schaper	423280cee1	Merge pull request #1817 from jjssoftware/development pihole.log permissions	7 years ago
Keith Bentrup	45ab2a3d7a	send HTTP headers before HTML Signed-off-by: Keith Bentrup <keith@keithbentrup.com>	7 years ago
DL6ER	05d015169c	Check for local version and branches every 10 minutes, check for remote versions only once a day Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
Jacob Salmela	28bed0041e	remove comment Signed-off-by: Jacob Salmela <github@decoy.email>	7 years ago
Jacob Salmela	6f03e30151	fixes #1537 by checking if systemctl is found Signed-off-by: Jacob Salmela <github@decoy.email>	7 years ago
Joe	6ecd93d0c9	pihole.log permissions This change makes pihole more friendly to the non-existence of the pihole.log file. This can help with systems that are configured to mount /var/log as a tmpfs volume. It may also help with systems where the pihole.log file is accidentally/unintentionally removed. Further discussion around the details of this change are in https://github.com/pi-hole/pi-hole/issues/1798	7 years ago
Adam Warner	a9a40ca46c	Useless cat. Consider 'cmd < file \| ..' or 'cmd file \| ..' instead. Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	162a7b56fe	force mode is no longer referenced. Regression. Same with `domToRemoveList` Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
WaLLy3K	2dc1851892	Allow passwords with spaces e.g: `pihole -a -p "foo bar"` Signed off by WaLLy3K <wally3k@pi-hole.net>	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
DL6ER	90efa3b610	Simplify git subroutines Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
Mcat12	009fa2f1b7	Hide password textbox if there is no password	7 years ago
Adam Warner	5221767a70	Merge pull request #1735 from bcambl/debug_selinux add SELinux checks to debug script	7 years ago
DL6ER	9492ff26c6	Merge pull request #1747 from pi-hole/tweak/gravity_update_time Randomize gravity update time	7 years ago
DL6ER	0db76aada0	Silence errors when directory to be checked does not exist (system may have been installed without a web interface!) Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	9be854031f	Don't store FTL branch until the next release of FTL which supports returning the branch in an easy way Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	709851503f	Use "pihole-FTL branch" to get FTL's branch Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	6ca47dc3b3	Add bash / cron based update checker for Pi-hole	7 years ago
WaLLy3K	2390b80359	Silence non-numeric domains_being_blocked output * Round $cpu_mhz to 1 decimal place * Remove ".0" from $cpu_freq * Silence non-numeric domains_being_blocked output * Use "Core" and "Web" as appropriate Signed off by WaLLy3K <wally3k@pi-hole.net>	7 years ago
DL6ER	85d159bdd1	Randomize gravity update time Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
bcambl	0f868f7649	remove un-used DONE variable (still available via sourced COL_TABLE on line 29)	7 years ago
bcambl	31730e7197	add missing colors to COL_TABLE fallback	7 years ago
bcambl	7d76db00ac	update 'SELinux not detected' message	7 years ago
bcambl	8aceb8bf53	replace deprecated colors in debug script - COL_LIGHT_GREEN -> COL_GREEN - COL_LIGHT_RED -> COL_RED - COL_LIGHT_PURPLE -> COL_PURPLE	7 years ago
bcambl	a17d1be7a4	simplify selinux debug variables	7 years ago
bcambl	1e6cc63abe	add SELinux checking to debug script	7 years ago
WaLLy3K	3e727c5e5d	Merge pull request #1721 from pi-hole/fix/lightyconf Add comment for include_shell feature	7 years ago
DL6ER	e0edac32c7	Merge pull request #1728 from pi-hole/new/nuke_lists Add nuclear option to list.sh	7 years ago
WaLLy3K	e4b3bc4209	Minor spacing corrections Signed off by WaLLy3K <wally3k@pi-hole.net>	7 years ago
WaLLy3K	51b09efceb	Fix minor typo Signed off by WaLLy3K <wally3k@pi-hole.net>	7 years ago
WaLLy3K	2dabacd024	Fix minor typo Signed off by WaLLy3K <wally3k@pi-hole.net>	7 years ago
WaLLy3K	0613dcc87b	Merge pull request #1692 from andofrjando/cors_mixed_content_fix Fix for bug on block page (#1416) caused by CORS mixed content when behind reverse proxy using SSL	7 years ago
WaLLy3K	d59a2a4cfc	Merge pull request #1729 from pi-hole/fix/email-help-argument Allow emails which include `-h` in them (Fix for #1691)	7 years ago
WaLLy3K	2c091f3a3c	Merge branch 'development' into cors_mixed_content_fix	7 years ago
WaLLy3K	cfcdc53185	Merge pull request #1722 from pi-hole/fix/bpfqdn Improve FQDN Authorized Hosts functionality (Fix for #1416)	7 years ago
WaLLy3K	bd33018660	Shellcheck OR validation Signed off by WaLLy3K <wally3k@pi-hole.net>	7 years ago
Mcat12	e7589945a2	Disable password field if no password is set For someone to actually whitelist a domain without a password, more changes will be needed on the PHP side.	7 years ago
Mcat12	67a5594909	Allow emails which include `-h` in them For example, mcat12@pi-hole.net would previously spit out the help message	7 years ago
DL6ER	70ad656af0	Save backup as ".bck~" to prevent reading of the file by dnsmasq Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	f22b83d379	Create a backup before emptying the list Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	114f84c948	Add --nuke option to list.sh that can be used e.g. by Teleporter to empty out lists before importing new content Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
WaLLy3K	43e1121618	Match current style of Web Interface * Remove border from about menu Signed off by WaLLy3K <wally3k@pi-hole.net>	7 years ago
WaLLy3K	97dd1b4cf3	Improve FQDN Authorized Hosts functionality * Use inverse if statement, instead of IF/ELSE when checking setupVars.conf * Remove $svFQDN * Add or elaborate on more comments * Add $serverName to $authorizedHosts if admin has specified `setenv.add-environment = ("fqdn" => "true")` within lighttpd's external.conf * e.g: `$HTTP["host"] == "pihole.domain.com" { setenv.add-environment = ("fqdn" => "true") }` * Move "No exact results" check to top of exception handling * Remove unnecessary IF/ELSE when handling $queryAds error Signed off by WaLLy3K <wally3k@pi-hole.net>	7 years ago
WaLLy3K	288635abc9	Add comment for include_shell feature * Capitalise first letter for Lighttpd * Fix spacing * Add comment for include_shell feature	7 years ago
Celly	3f20981aab	Update access rules to block all root '.' files	7 years ago
Celly	f54a812ad5	Update access rules to block all root '.' files	7 years ago
andofrjando	6323d5afed	Use PHP short echo tag to avoid Codacy expecting an escaping function	7 years ago
Celly	e3e3b4da58	Add in some exclusions form some leaky files in the admin	7 years ago
Adam Warner	ef1ce7d4d6	Merge pull request #1631 from pi-hole/tweak/gravity Clean up and optimise Gravity	7 years ago
DL6ER	ee2169dd13	Merge branch 'development' into tweak/gravity	7 years ago
WaLLy3K	11282aaca3	Decrease `local-ttl` to 2 * Decreasing value should benefit clients when whitelisting blocked sites, [as per this discussion](https://github.com/pi-hole/pi-hole/pull/1698#issuecomment-331134576).	7 years ago
WaLLy3K	f3cc8c71c4	Merge pull request #1691 from pi-hole/new/adminemail Add `pihole -a email` functionality for Block Page contact email	7 years ago
WaLLy3K	500a755250	Delete superseded file * Functionality is reproduced from within the Block Page	7 years ago
andofrjando	5e48b3f7f7	Fix one mistake where `$proto` would not be created if `$_SERVER['HTTPS']` exists but is not set to `on`	7 years ago
andofrjando	00d62b3423	This fixes the following bug: If Pi-Hole is behind a reverse proxy that uses SSL, then the block page will not load resources such as `blockingpage.css` and `jquery.min.js` as the insecure `http://` is hard coded. Browsers will block attempts to load insecure resources if the page is loaded of SSL. The fix is acheived by checking `$_SERVER['HTTPS']` and setting the variable `$proto` to either `http` or `https`. The harcoded `http` is replaced by the contents of this variable.	7 years ago
WaLLy3K	28063aa7f7	Add administrative contact address functionality * Disable shellcheck for SC1090	7 years ago
WaLLy3K	c458e4a93b	Merge pull request #1420 from WaLLy3K/new/https Disable Let's Encrypt HTTPS & shift functions to block page	7 years ago
WaLLy3K	e7ae62ba76	Merge pull request #1416 from WaLLy3K/blockpage2 Block Page 2.0	7 years ago
WaLLy3K	34ae4844fa	Merge branch 'development' into tweak/gravity	7 years ago
DL6ER	b8fedf76cd	Merge pull request #1572 from pi-hole/gedetil-development Add web frontend shutdown command	7 years ago
DL6ER	c9d4995900	Update to comply with current development code Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	279e809aaf	Use `poweroff` instead of `halt` Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	0d037e96fb	Merge branch 'development' into gedetil-development Signed-off-by: DL6ER <dl6er@dl6er.de> Conflicts: advanced/Scripts/webpage.sh	7 years ago
WaLLy3K	bea99abd8d	Ensure colour consistency between terminal themes * Comment file for review-ability * Add BOLD and UNDERLINE options * Select most readable colours out of LIGHT/DARK options * Provide empty variables for `set -u` * Deprecate unnecessary variables * Correct colours for TICK/CROSS/DONE * Escape r twice and add ESC to OVER	7 years ago
WaLLy3K	bab44c52ae	Merge branch 'development' into blockpage2	7 years ago
WaLLy3K	7cac207c00	Merge branch 'development' into tweak/gravity	7 years ago
Adam Warner	199de9ebc0	Merge branch 'development' into new/https	7 years ago
Adam Warner	504ae0193f	Merge branch 'development' into blockpage2	7 years ago
WaLLy3K	1ae403b742	Merge pull request #1667 from pi-hole/install-space Remove erroneous space	7 years ago
Adam Warner	18b41adbf6	Merge branch 'development' into tweak/gravity	7 years ago
Mcat12	898fdf7a60	Merge pull request #1602 from molikuner/development Fix URL extension parsing	7 years ago
Adam Warner	78143c2ff4	Merge branch 'development' into blockpage2	7 years ago
Adam Warner	7b1524ad01	Merge branch 'development' into new/https	7 years ago
Adam Warner	5799485b0f	Merge branch 'development' into development	7 years ago
Adam Warner	0a9965292c	Additional check to fix any existing cases of "24h" in setupVars.conf automatically. Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	4fb66e632f	The other h	7 years ago
Adam Warner	5787895794	stop an extra `h` being added to leasetime of DHCP server. We already storethe `h` in `setupVars.conf` Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	d90489b31d	Include branch we're switching from Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	f38912a0c9	- Correctly overwrite ${INFO} boxes with ${CROSS} etc - Notify user that branch has been changed Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
WaLLy3K	2d8fff099f	Pass correct options to gravity.sh * Optimise $validDomain function by using bashism and `grep` * Add black/white/wildcard variables to pass to Reload() * Revert reload variable behaviour * Ensure Reload() function passes correct options to gravity.sh Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	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
WaLLy3K	714fd93292	Provide correct FTL stats (#1619 ) * Provide correct FTL stats * Use the correct lines in the array when displaying FTL stats * Treat ads_blocked_today/dns_queries_today as currency, like domains_being_blocked is on large screens * Chronometer Shellcheck validation * Remove unnecessary \ from CPU usage readout	7 years ago
WaLLy3K	61ff0452e1	Remove duplicate code * Make RestartDNS() use `pihole restartdns` Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	7 years ago
WaLLy3K	406098e55a	Speed up refresh time * Add "--blacklist-only" to only run essential gravity functions * Pass "--wildcard" option to `gravity.sh` to ensure dnsmasq is restarted Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	7 years ago
WaLLy3K	49aee8b931	Fixed development branch check	7 years ago
WaLLy3K	f2a3b557c8	Updated Block Page to work with queryFunc output	7 years ago
Adam Warner	0a062d26e6	Merge pull request #1611 from pi-hole/developmentNew Sort out Merge conflicts with master	7 years ago
Adam Warner	eb8333c772	Merge branch 'development' into developmentNew	7 years ago
Adam Warner	247d3ed729	list availible branches for FTL Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	031c6428d5	Merge branch 'tweak/checkout_FTL' of https://github.com/pi-hole/pi-hole into tweak/checkout_FTL Signed-off-by: Adam Warner <adamw@rner.email> # Conflicts: # advanced/Scripts/piholeCheckout.sh	7 years ago
Adam Warner	f2e9d585f7	* Add helptext for `pihole checkout ftl` * Only attempt to install FTL if branch was found * ~~corebranches~~ webbranches (web branches now actually listed) Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
WaLLy3K	8af9853b9a	Fixed minor formatting issues * Removed useless echo * Quoted and braced conditionals * Explicit escaping of newline * Fixed arrays implicitly concatenating (SC2199) * Fixed incorrect variable used in checkout web	7 years ago
Adam Warner	783f50657b	Merge branch 'development' into tweak/checkout_FTL Signed-off-by: Adam Warner <adamw@rner.email> # Conflicts: # advanced/Scripts/piholeCheckout.sh	7 years ago

... 2 3 4 5 6 ...

1168 Commits (545b6605bc03dacc31e3f96d20beea5065c50bfe)