Commit Graph

  • 8ad37af70e CentOS install re-worked to include PHP7 via Remi repository bcambl 2018-05-01 00:28:55 -06:00
  • c102d359f8 Merge pull request #2159 from pi-hole/tweak/removeDnsmasqRefs Mark Drobnak 2018-04-30 19:26:59 -04:00
  • a07891e3e6 0 is not 1!! Adam Warner 2018-04-30 23:53:51 +01:00
  • e946a35b18 Move dnsmasq check into FTLcheckUpdate Adam Warner 2018-04-30 23:50:35 +01:00
  • 68d7337f98 switch up dnsmasq detection logic Adam Warner 2018-04-30 23:42:41 +01:00
  • 8b4198fd8d Merge pull request #1835 from Fauxsys/development Adam Warner 2018-04-30 23:06:46 +01:00
  • 9c795fa40d Merge pull request #2157 from pi-hole/fix/EmptyAdlist Adam Warner 2018-04-30 22:02:34 +01:00
  • 5f2217a079 Fix for gravity.list not being emptied with an empty/missing adlist file. Variable output depending on content of /existence of adlist Adam Warner 2018-04-30 21:45:03 +01:00
  • 0cda4b7f23 Merge pull request #2123 from pi-hole/new/RemoveDefaultBlocklists Adam Warner 2018-04-29 22:06:47 +01:00
  • e17e69604c Merge branch 'development' into new/RemoveDefaultBlocklists Adam Warner 2018-04-29 18:40:53 +01:00
  • e1bf4d4344 Merge pull request #2155 from pi-hole/tweak/DontStopServices Adam Warner 2018-04-29 18:38:34 +01:00
  • 0c8a32b9ae No need to stop services This causes issues on a pihole -r reconfigure Adam Warner 2018-04-29 18:27:10 +01:00
  • d8c60aaae7 Merge pull request #2142 from bcambl/fix_fedora_ip_check Adam Warner 2018-04-29 14:36:07 +01:00
  • 3216d65353 Merge branch 'development' into new/RemoveDefaultBlocklists Adam Warner 2018-04-29 13:39:17 +01:00
  • 0df8d0a4e2 Merge pull request #2153 from MichaIng/patch-1 Mark Drobnak 2018-04-28 20:17:18 -04:00
  • 43f19034b9 "INSTALL_WEB" renamed to "INSTALL_WEB_INTERFACE" #2115 MichaIng 2018-04-28 15:17:29 +02:00
  • 2e6a937240 Merge pull request #2151 from pi-hole/FTLDNS-gravity-simplelists Adam Warner 2018-04-25 06:57:49 +01:00
  • 05d8a7f6be Merge pull request #2147 from pi-hole/fix/borkedUpdate Adam Warner 2018-04-23 21:14:26 +01:00
  • ceaf4bc6bc Some extra code made it's way into the dev branch. Not entirely sure how that happened... related to #2115 Adam Warner 2018-04-23 20:46:57 +01:00
  • f2cc2f433c Merge pull request #2140 from pi-hole/FTLDNS-gravity-simplelists Adam Warner 2018-04-23 20:29:32 +01:00
  • 858aa6255c Merge pull request #2145 from pi-hole/fix/2115 Dan Schaper 2018-04-23 07:19:14 -07:00
  • 1d8ea9e869 Fix static IP checking on Fedora bcambl 2018-04-22 13:53:15 -06:00
  • 8ead0b5483 @fourdee dropped this: / Adam Warner 2018-04-23 11:59:39 +01:00
  • 72c081cfd6 Fix for unattended installations #1767 #1768 #1834 Fauxsys 2017-12-10 23:51:54 -05:00
  • 1f701c94a7 Merge pull request #2115 from Fourdee/Install-Web-Server Mark Drobnak 2018-04-22 15:56:11 -04:00
  • acfc49fd41 Merge branch 'development' into Install-Web-Server Dan 2018-04-22 09:23:11 +01:00
  • 9c29bd627e fix user blacklisting Adam Warner 2018-04-21 23:55:33 +01:00
  • d24b141d8b Get rid of numBlocked file, FTLDNS can now determine number of domains thanks to the new lists format DL6ER 2018-04-21 23:58:42 +02:00
  • bac9e005ae Generate gravity.list and black.list in simple domain lists format for FTLDNS. Leave local.list in HOSTS format DL6ER 2018-04-21 23:27:36 +02:00
  • 60bcca54eb Minor Daniel (Fourdee) 2018-04-21 08:29:21 +01:00
  • eccea8a911 Minor Daniel (Fourdee) 2018-04-21 08:27:31 +01:00
  • 0833d0d8d5 Merge pull request #2133 from mbologna/patch-1 Mark Drobnak 2018-04-20 13:17:46 -04:00
  • 55fce489bc Fix: add psmisc as dependency Michele Bologna 2018-04-19 23:31:43 +02:00
  • 2ce40c3c07 Merge pull request #2132 from rwky/development Adam Warner 2018-04-19 19:49:29 +01:00
  • 255cfb7d62 Fixed typo in README Rowan 2018-04-19 19:30:30 +01:00
  • 8a327be400 Merge pull request #2130 from pi-hole/FTLDNS Adam Warner 2018-04-18 22:09:31 +01:00
  • 1cae76b443 Merge pull request #2126 from pi-hole/FTLDNS-recursive-resolver DL6ER 2018-04-18 22:01:43 +02:00
  • 828e8d2ae4 Merge pull request #2040 from pi-hole/FTLDNS DL6ER 2018-04-18 20:20:39 +02:00
  • ce35509a40 Change command to "pihole -a localdnsport X" DL6ER 2018-04-18 17:30:51 +02:00
  • 24b8b4e904 Add backend changes for supporting a local recursive DNS server DL6ER 2018-04-18 17:12:20 +02:00
  • c2c1dc7469 Ensuring bot pleasure Daniel (Fourdee) 2018-04-18 04:38:07 +01:00
  • 47c1071bb8 Minor Daniel (Fourdee) 2018-04-18 04:24:48 +01:00
  • e401651f09 Update https://github.com/pi-hole/pi-hole/pull/2115 Daniel (Fourdee) 2018-04-18 04:11:32 +01:00
  • 1449def040 Merge pull request #2049 from pi-hole/tweak/readme Mark Drobnak 2018-04-17 20:25:09 -04:00
  • d4d1ec2568 Merge pull request #2124 from pi-hole/development Dan Schaper 2018-04-17 11:54:50 -07:00
  • 7455ac9bfb Run chooseBlocklists on EVERY reconfigure, not only if the adlist file does not esist. Adam Warner 2018-04-17 19:46:36 +01:00
  • b6b1dcb275 delete adlists.list if user cancels out of this dialog Adam Warner 2018-04-17 19:35:46 +01:00
  • 2e4f49a223 Default all to on, change up wording. This commit can be rolled back, it's just an option! Adam Warner 2018-04-17 16:22:10 +01:00
  • 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 Adam Warner 2018-04-17 09:50:25 +01:00
  • c9f3c02cb7 Merge pull request #2027 from ravron/ravron-urls-in-query-strings Dan Schaper 2018-04-16 17:31:51 -07:00
  • 557372b312 Merge pull request #2119 from pi-hole/new/sticklerCI-extras Dan Schaper 2018-04-15 18:28:00 -07:00
  • 18b24535fe Lets try the correct name for csslint Adam Warner 2018-04-15 23:46:52 +01:00
  • 20e0bca71d add some more linters to stickler Adam Warner 2018-04-15 23:45:36 +01:00
  • 6977f655e3 fix a typo comment out some unused variables, but not deleting them in case there is a plan for them in future... Adam Warner 2018-04-15 22:08:55 +01:00
  • e6fc9dc75d disable 2016 in two places and declare local variables Adam Warner 2018-04-15 21:52:09 +01:00
  • b57b3f4588 Disable SC2001 for generation of the_os Adam Warner 2018-04-15 21:36:50 +01:00
  • 776ae92416 fix some shellcheck/stickler compaints in debug script Adam Warner 2018-04-15 21:33:10 +01:00
  • 6ba53c1ac0 Merge branch 'development' into FTLDNS Adam Warner 2018-04-15 20:46:13 +01:00
  • 699d419c71 Merge pull request #2116 from pi-hole/FTLDNS_UpdateCheck Adam Warner 2018-04-15 20:42:29 +01:00
  • d4870b3854 Merge pull request #2053 from pi-hole/tweak/debug-logs Mark Drobnak 2018-04-15 14:23:25 -04:00
  • e49a9096a5 accidentally a 'shift' Adam Warner 2018-04-15 18:37:32 +01:00
  • 33148ba832 Add help text to pihole command to document new flag Adam Warner 2018-04-15 18:30:13 +01:00
  • 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... Adam Warner 2018-04-15 18:25:35 +01:00
  • 3a483a1b20 install_web_server Daniel (Fourdee) 2018-04-15 02:08:16 +01:00
  • 310d33b8ee Merge dev > FTLDNS fix merge conflicts Adam Warner 2018-04-13 17:01:54 +01:00
  • 8b5dcc3872 Match change made by 7edab27 to prevent merge conflict Adam Warner 2018-04-13 16:53:57 +01:00
  • 36d9af10f0 Merge pull request #2108 from LudovicRousseau/fix_No_such_file_or_directory Adam Warner 2018-04-13 16:47:59 +01:00
  • 0c8fcbc684 Merge pull request #2105 from pi-hole/feature/self_dco Dan Schaper 2018-04-13 05:42:04 -07:00
  • 7edab27e53 Stylistic change to use an explicit if/then/fi Ludovic Rousseau 2018-04-13 12:19:55 +02:00
  • 9b3531f634 Fix stylistic issue Ludovic Rousseau 2018-04-13 11:48:34 +02:00
  • d8f85a8981 Avoid a "No such file or directory" error Ludovic Rousseau 2018-04-13 11:08:02 +02:00
  • 3b229489c2 Fix regex to find DBFILE= from configuration file Ludovic Rousseau 2018-04-13 09:19:31 +02:00
  • c2fcbbb0c6 Merge pull request #2090 from Razvici/master Mark Drobnak 2018-04-12 11:17:33 -04:00
  • 8e82bf69d8 update wallet addresses Jacob Salmela 2018-04-11 20:40:35 -05:00
  • 284f9e3f2f implement mcats request. removed 'the' Jacob Salmela 2018-04-11 20:38:56 -05:00
  • 5ffc3561ed implement dschapers suggestions--better command, less subshells, and finer formatting Jacob Salmela 2018-04-11 20:35:51 -05:00
  • 952f1271b4 Do not require DCO for Pi-hole Org members with GPG signed commits. Dan Schaper 2018-04-11 10:13:09 -07:00
  • 250b445eee Split declaration and population for stickler. Dan Schaper 2018-04-10 21:37:04 -07:00
  • 331472b592 Merge pull request #1999 from pi-hole/tweak/RedundantInstallCode Mark Drobnak 2018-04-06 00:17:45 -04:00
  • 82d5afe996 Silence error in log flush subroutine when no pihole-FTL.conf can be found DL6ER 2018-04-05 22:28:55 +02:00
  • 7361d5d3ea Update pihole lolcahost probe for DNS status Razvan Radu 2018-04-05 11:09:07 -06:00
  • 6086614274 Add "-l, privacylevel" description to "pihole -a" DL6ER 2018-04-04 18:10:23 +02:00
  • 6bb4780d32 Merge pull request #2077 from pi-hole/tweak/FTLDNSExperiments Adam Warner 2018-04-04 17:00:03 +01:00
  • 631f5b4848 Change order of updatable components to match the end output Adam Warner 2018-04-04 16:34:31 +01:00
  • 0f17712f6c Merge pull request #2085 from pi-hole/FTLDNS-privacylevels DL6ER 2018-04-04 14:41:16 +02:00
  • 4941e0f8ad Backend changes needed to be able to set the privacy level DL6ER 2018-04-04 13:12:39 +02:00
  • fbee18e24d Merge pull request #2056 from pi-hole/release/v3.3.1 v3.3.1 Jacob Salmela 2018-04-02 19:29:39 -05:00
  • f37b2bc7c1 move call to get_binary_name into FTLcheckUpdate() to avoid having to run that first Adam Warner 2018-04-02 23:22:06 +01:00
  • 56278c6394 Fix shellcheck complaints Adam Warner 2018-04-02 22:06:36 +01:00
  • 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) Adam Warner 2018-04-02 21:53:32 +01:00
  • 1200a77b22 Merge pull request #2075 from everettsouthwick/development Mark Drobnak 2018-04-02 00:03:50 -04:00
  • bb9a18ef08 Merge pull request #1987 from ryanknapper/patch-1 Mark Drobnak 2018-04-02 00:00:14 -04:00
  • a8b493cb7d Add support for public Cloudflare DNS servers. Everett Southwick 2018-04-01 17:59:08 -05:00
  • 1a275ba184 debug user locale; improve function to parse variables and files Jacob Salmela 2018-04-01 06:40:48 -05:00
  • 187848660c try another fix for #2028 Jacob Salmela 2018-03-31 16:12:29 -05:00
  • c3f391dc5a maybe fixes #2028 by deleting null bytes Jacob Salmela 2018-03-31 14:08:48 -05:00
  • 971e6f2664 Merge pull request #2064 from Perflyst/chronometer-1 Mark Drobnak 2018-03-30 17:42:50 -04:00
  • a1d6ef04ec Merge pull request #1758 from mettacrawler/fix-for-RHELish-ifcfg Mark Drobnak 2018-03-30 17:28:52 -04:00
  • ff47ab12fb Save number of effectively blocked domains in /etc/pihole/numBlocked DL6ER 2018-03-30 21:01:51 +02:00
  • a97e361661 Merge pull request #2061 from dflamand/development Dan Schaper 2018-03-28 20:10:11 -07:00