pi-hole

Commit Graph

Author	SHA1	Message	Date
Mcat12	868948509a	Split declaration and assignment of random_url Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mark Drobnak	e71492a2b3	Update debug script for simple list format Gravity is now just a list of domains, not IP addresses and domains separated by a space. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Rob Gill	23adbf9540	remove quotes Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Rob Gill	a7347238e6	$adListsList replace filename in text Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Rob Gill	bf55666492	Appease stickler. Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
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
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	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

1 2 3 4 5 ...

1018 Commits (88e4b6390c77f641cf15fceea77c1d453aa0e0d7)