3096 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Daniel (Fourdee)	47c1071bb8	Minor ... + Add info in regards to disabling web server install: https://github.com/pi-hole/pi-hole/pull/2115	2018-04-18 04:24:48 +01:00
Daniel (Fourdee)	e401651f09	Update https://github.com/pi-hole/pi-hole/pull/2115 ... + Patch existing systems with the new variable changes using 'accountForRefactor' + Prompt user to install webserver	2018-04-18 04:11:32 +01:00
Daniel (Fourdee)	3a483a1b20	install_web_server ... + Splits web interface and server into two variables. + Option to disable forced install of Lighttpd.	2018-04-15 02:08:16 +01:00
Adam Warner	36d9af10f0	Merge pull request #2108 from LudovicRousseau/fix_No_such_file_or_directory ... Fix sed: can't read /etc/pihole/pihole-FTL.conf: No such file or directory	2018-04-13 16:47:59 +01:00
Dan Schaper	0c8fcbc684	Merge pull request #2105 from pi-hole/feature/self_dco ... Do not require DCO for Pi-hole Org members with GPG signed commits.	2018-04-13 05:42:04 -07:00
Ludovic Rousseau	7edab27e53	Stylistic change to use an explicit if/then/fi ... Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>	2018-04-13 12:19:55 +02:00
Ludovic Rousseau	9b3531f634	Fix stylistic issue ... Expand variable using ${FTLconf} Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>	2018-04-13 11:48:34 +02:00
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>	2018-04-13 11:16:58 +02:00
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>	2018-04-13 11:16:50 +02:00
Mark Drobnak	c2fcbbb0c6	Merge pull request #2090 from Razvici/master ... Update pihole locahost probe for DNS status	2018-04-12 11:17:33 -04:00
Dan Schaper	952f1271b4	Do not require DCO for Pi-hole Org members with GPG signed commits. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-04-11 10:13:09 -07:00
Mark Drobnak	331472b592	Merge pull request #1999 from pi-hole/tweak/RedundantInstallCode ... adlists.default no longer used. No need to reference it.	2018-04-06 00:17:45 -04:00
Razvan Radu	7361d5d3ea	Update pihole lolcahost probe for DNS status ... Signed-off-by: Razvan Radu <ramset@gmail.com>	2018-04-05 11:14:39 -06:00
Jacob Salmela	fbee18e24d	Merge pull request #2056 from pi-hole/release/v3.3.1 ... Pi-hole core v3.3.1	2018-04-02 19:29:39 -05:00
Mark Drobnak	1200a77b22	Merge pull request #2075 from everettsouthwick/development ... Add support for public Cloudflare DNS servers.	2018-04-02 00:03:50 -04:00
Mark Drobnak	bb9a18ef08	Merge pull request #1987 from ryanknapper/patch-1 ... Proper output for debug CPU detection	2018-04-02 00:00:14 -04:00
Everett Southwick	a8b493cb7d	Add support for public Cloudflare DNS servers. ... Signed-off-by: Everett Southwick <everett@everettsouthwick.com>	2018-04-01 17:59:16 -05:00
Mark Drobnak	971e6f2664	Merge pull request #2064 from Perflyst/chronometer-1 ... Add RaspberryPi 3B+ to Chronometer	2018-03-30 17:42:50 -04:00
Mark Drobnak	a1d6ef04ec	Merge pull request #1758 from mettacrawler/fix-for-RHELish-ifcfg ... basic-install.sh - no CIDR in ifcfg-*	2018-03-30 17:28:52 -04:00
Dan Schaper	a97e361661	Merge pull request #2061 from dflamand/development ... Remove dead link from CONTRIBUTING.md	2018-03-28 20:10:11 -07:00
Dan Schaper	34d84522dd	Merge pull request #2054 from theLMGN/patch-1 ... Link to the admin panel on the splash page.	2018-03-28 20:08:39 -07:00
Perflyst	3390fbf238	Add RaspberryPi 3B+ ... Signed-off-by: Perflyst <mail@perflyst.de>	2018-03-27 12:23:01 +02:00
Mark Drobnak	98ad1feaeb	Merge pull request #2060 from pi-hole/tweak/debug-xheader ... add label to x-header so you know which one is being evaluated	2018-03-26 13:23:31 -04:00
Dillon Flamand	37e8a91d5b	Remove dead link from CONTRIBUTING.md ... Removed a link to a github repo that no longer exists. Signed-off-by: D. Flamand <dflamand@users.noreply.github.com>	2018-03-25 21:59:35 -07:00
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>	2018-03-25 21:27:40 -05:00
Mark Drobnak	d31a498e6c	Merge pull request #2031 from pi-hole/tweak/BegonePullApprove ... Remove PA YAML file	2018-03-23 22:16:12 -04:00
Leo MG Nesfield (LMGN)	bfcbd72e4b	Link to the admin panel on the splash page.	2018-03-23 16:17:31 +00:00
Mark Drobnak	e131395cce	Merge pull request #2037 from justinamcafee/master ... Adds FamilyShield DNS server address to the "Choose DNS" screen in installer.	2018-03-21 17:47:24 -04:00
justinamcafee	30af6e73be	added ;; to line 825 ... Misformated case. Updated correct case	2018-03-10 17:36:47 -06:00
justinamcafee	2895b9bfb7	Added support for FamilyShield from OpenDNS ... With a very minor code change, individuals can now implement restrictions on dangers, disturbing, or otherwise adult oriented content without the need for managed restrictions. This is a fairly non-invasive change and will benefit users who intend to use VPN for home or small business uses where access to such material may be undesirable.	2018-03-10 17:33:31 -06:00
Adam Warner	71d8f5f96f	remove PA YAML file ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-03-07 22:00:14 +00:00
Adam Warner	856a2096eb	Merge pull request #2030 from pi-hole/new/StickFTLCheckoutBranch ... Store checked out FTL branch in /etc/pihole/ftlbranch	2018-03-07 21:51:52 +00:00
Adam Warner	76cb129d3c	don't forget master and development branches! ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-03-07 21:48:09 +00:00
Adam Warner	246d5cd587	store checked out FTL branch in /etc/pihole/ftlbranch ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-03-07 21:41:00 +00:00
Adam Warner	aed20cf7c6	Merge pull request #2017 from pi-hole/fix/NoWhitelistGravity ... Gravity falls over when there is no whitelist file	2018-03-06 20:39:32 +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
Mark Drobnak	e3e5e016d5	Merge pull request #2016 from pi-hole/bugfix/mktemp ... Bugfix mktmp > mktemp	2018-03-02 16:03:11 -05:00
Dan Schaper	3425b9a82e	Fix mktmp > mktemp ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-03-02 12:28:53 -08:00
Dan Schaper	6011dd7372	Merge pull request #2000 from pi-hole/fix/FTL_Install ... Use pushd/popd and create random temporary directory	2018-02-26 21:55:12 -08:00
Dan Schaper	41d9d57c84	Merge pull request #1996 from pi-hole/fix/AlternativeWhitelistFromWebFix ... Specifty `LC_ALL=C` when dealing with sorted lists.	2018-02-24 07:22:44 -08:00
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>	2018-02-22 20:13:38 -08:00
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>	2018-02-22 14:45:31 +00: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
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>	2018-02-19 10:22:28 -05:00
Mark Drobnak	f14184df30	Merge pull request #1982 from LudovicRousseau/master ... Create blacklist.txt if not existant	2018-02-18 15:32:01 -05:00
Ludovic Rousseau	47bbea9ba7	Use " " to protect parameter substitution ... Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>	2018-02-18 21:20:04 +01:00
Mark Drobnak	7265935cd4	Merge pull request #1915 from ryanknapper/development ... Add conditional forwarding options to webpage.sh	2018-02-18 12:51:46 -05:00
DL6ER	40bda4b3d1	Merge pull request #1981 from pi-hole/fix/always_repair_pihole-FTL.service ... Always replace pihole-FTL.service	2018-02-18 17:26:17 +01:00
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>	2018-02-18 14:19:49 +01:00