Commit Graph

  • 0d1b3cee4f Enable FTL service before starting it Realtebo 2018-08-16 17:52:47 +02:00
  • 0b44cb4426 Merge branch 'development' of https://github.com/pi-hole/pi-hole into development Realtebo 2018-08-16 17:48:35 +02:00
  • eb8e4496b2 Merge pull request #2354 from realtebo/development Mark Drobnak 2018-08-16 11:26:07 -04:00
  • 30f45d4df7 Merge branch 'development' of https://github.com/pi-hole/pi-hole into development Realtebo 2018-08-16 16:52:18 +02:00
  • 24e1c78d52 Merge pull request #2358 from pi-hole/fix/restart_FTl_on_logflush Mark Drobnak 2018-08-16 10:34:25 -04:00
  • 476fecbcf5 Fixed typos as suggestes Mirko Tebaldi 2018-08-14 14:59:41 +02:00
  • 327b58fa03 Merge pull request #1 from pi-hole/development Mirko Tebaldi 2018-08-14 14:55:18 +02:00
  • d3eea9404d Merge pull request #2331 from pi-hole/tweak/improve_FTL_download_errormsg DL6ER 2018-08-14 13:20:47 +02:00
  • ca309d3b28 Restart pihole-FTL after log flushing to force reloading history. Fixes #2339 DL6ER 2018-08-14 13:14:39 +02:00
  • 0ebd68f17f Review comments DL6ER 2018-08-14 09:55:16 +02:00
  • 3696373609 Merge pull request #2345 from pi-hole/NXDOMAIN-tail Mark Drobnak 2018-08-13 15:01:35 -04:00
  • 165affc39b list.sh writes into blacklist.txt not black.list so does not need to account for a possibly changed list location DL6ER 2018-08-13 18:53:31 +02:00
  • f794018e0c Acknowledge temporary file if disabled for "pihole -b" command DL6ER 2018-08-13 18:17:14 +02:00
  • 337cc5ca18 BLOCKING -> BLOCKING_ENABLED DL6ER 2018-08-13 17:22:10 +02:00
  • 4e4d6b5d1f Adjust "pihole status" command DL6ER 2018-08-13 15:01:46 +02:00
  • b011adc453 Use new setupVars BLOCKING variable to determine which file to update via gravity DL6ER 2018-08-13 14:19:59 +02:00
  • d8abc1d266 Storing BLOCKING=true/false in setupVars.conf DL6ER 2018-08-13 13:49:47 +02:00
  • 6cde066edd Have gravity detect the presence of files like gravity.list.bck and update this file if present (assuming blocking is disabled) DL6ER 2018-08-13 13:43:14 +02:00
  • d163e38380 Ensure regex-blocked lines are red WaLLy3K 2018-08-13 14:56:38 +10:00
  • d9195970b7 Create adlist file while running unattended setup Realtbo 2018-08-12 23:19:16 +02:00
  • 20b946eae5 Instead of changing the dnsmasq configuration, we replace gravity.list and black.list by empty files for disabling. When pihole-FTL receives SIGHUP, it will clear its cache and reload all configured lists. If the files are empty, blocking will be disabled as no content to be blocked will be imported. DL6ER 2018-08-12 19:31:00 +02:00
  • c00357663b Reload pihole-FTL instead of restart the entire service on "pihole enable/disable" DL6ER 2018-08-12 18:36:07 +02:00
  • 2feb5f22cc Signed-off-by Gusher123 2018-08-12 10:05:58 +02:00
  • f3aee056ad Merge branch 'patch-1' of https://github.com/Gusher123/pi-hole into patch-1 Gusher123 2018-08-12 09:59:34 +02:00
  • 91ff5ca0ca Merge branch 'patch-1' of https://github.com/Gusher123/pi-hole into patch-1 Gusher123 2018-08-12 03:07:07 +02:00
  • 4238e36d7f Merge branch 'patch-1' of https://github.com/Gusher123/pi-hole into patch-1 Gusher123 2018-08-12 03:07:07 +02:00
  • 03a9d3bc5b Not hardcoding dns and covering all blockingmodes Gusher123 2018-08-12 01:15:42 +02:00
  • fe46dee194 Mode double brackets Gusher123 2018-08-12 02:06:32 +02:00
  • 1c6c35f861 Using double brackets Gusher123 2018-08-12 01:50:23 +02:00
  • 926b25fd54 Not hardcoding dns and covering all blockingmodes Gusher123 2018-08-12 01:15:42 +02:00
  • e58142b4ac Added comments Gusher123 2018-08-11 15:14:45 +02:00
  • 3e5c6afaee Don't let one blocklist, block an other Gusher123 2018-08-11 14:33:33 +02:00
  • a1bf9fad98 Fix colour tail for use with new blocking methods WaLLy3K 2018-08-11 12:55:18 +10:00
  • afdc4219d0 Merge pull request #2343 from pi-hole/tweak/audit_log Mark Drobnak 2018-08-10 18:06:23 -04:00
  • 94e4ed6644 Add facility to add multiple audit list entries at once and to nuke audit list DL6ER 2018-08-10 18:22:55 +02:00
  • ef8aaba014 Merge pull request #2320 from TronPaul/fix/no-tty Mark Drobnak 2018-08-08 19:28:12 -04:00
  • d2ae07e69b Merge pull request #2334 from pi-hole/fix/gravity-count-regex Mark Drobnak 2018-08-08 16:22:50 -04:00
  • 760dd01b50 Use grep invert-match DL6ER 2018-08-07 18:36:06 +02:00
  • 5bf90cb77d Use alternative logic for counting regex file entries, skipping commented out lines DL6ER 2018-08-07 18:02:01 +02:00
  • f5c3dc5d9d Improve download error message that is shown when downloading or verifying the binary failed DL6ER 2018-08-07 16:51:58 +02:00
  • f2b820079a Merge pull request #2329 from pi-hole/tweak/remove-ppc DL6ER 2018-08-07 16:02:11 +02:00
  • 083024496a Merge pull request #2327 from pi-hole/header-fix WaLLy3K 2018-08-07 12:29:45 +10:00
  • e01eea8ba8 Remove PowerPC from FTL binaries Mcat12 2018-08-06 21:15:16 -04:00
  • eef948d797 Fix header newlines WaLLy3K 2018-08-07 10:45:30 +10:00
  • 8017be7d09 Merge pull request #2322 from pi-hole/release/v4.0 DL6ER 2018-08-06 09:57:28 +02:00
  • 5b628a4c77 Merge branch 'development' into release/v4.0 Dan Schaper 2018-08-05 21:16:19 -07:00
  • ddbdb51d20 Merge pull request #2308 from pi-hole/release/v4.0 v4.0 Dan Schaper 2018-08-05 10:40:22 -07:00
  • 0081a7ca92 set noninteractive during unattended install Mark McGuire 2018-08-05 10:09:56 -05:00
  • e80ae4906f Merge pull request #2318 from pi-hole/tweak/wildcard-regex-format Dan Schaper 2018-08-01 01:01:08 -07:00
  • e4e22fb58e Fix permissive regex Mcat12 2018-07-31 22:16:40 -04:00
  • 7086a400e8 Use simpler regex format for wildcards Mcat12 2018-07-31 21:36:29 -04:00
  • a25a13fde0 Merge pull request #2317 from pi-hole/fix/parse_pihole-FTL.conf Mark Drobnak 2018-07-31 19:51:34 -04:00
  • 993beab3b7 Changed wording. Dan Schaper 2018-07-31 11:14:26 -07:00
  • 06875f2cc9 Merge branch 'release/v4.0' into fix/parse_pihole-FTL.conf Dan Schaper 2018-07-30 14:32:29 -07:00
  • 448fc7231c Installed to /etc/pihole as PI_HOLE_CONFIG_DIR variable. Dan Schaper 2018-07-30 14:26:07 -07:00
  • d0d030bafc Moved file creation to proper function. Included bash variables for file location. Set to pihole:pihole ownership with 644 permissions. Dan Schaper 2018-07-30 14:02:18 -07:00
  • 833131e15f Merge pull request #2315 from pi-hole/fix/regex-file-ownership Dan Schaper 2018-07-30 06:36:20 -07:00
  • fb2810557a Allow web user group to access regex.list Dan Schaper 2018-07-29 16:09:03 -07:00
  • 82a64db42b Merge pull request #2313 from pi-hole/fix/pihole-man-usage Dan Schaper 2018-07-29 15:43:19 -07:00
  • 57af0ba0a4 Use install to make the regex file Mcat12 2018-07-29 18:26:00 -04:00
  • 17c1e64f7e Moved FTL configuration copy in to scripts copy function. Dan Schaper 2018-07-29 09:06:51 -07:00
  • af13ceac24 Touch file as ${USER} instead of copying template. Dan Schaper 2018-07-29 08:42:59 -07:00
  • af2ec61965 Convert [] to () Dan Schaper 2018-07-29 08:17:57 -07:00
  • a55cc55338 Only touch the regex file if it doesn't already exist Mcat12 2018-07-28 23:07:35 -04:00
  • b2fb3fd35a Merge pull request #2310 from pi-hole/feature/pihole-FTL.conf Dan Schaper 2018-07-28 20:04:39 -07:00
  • 94b7c8eb59 Added header for file. Not using standard Pi-hole copyright header. Dan Schaper 2018-07-28 19:58:23 -07:00
  • 6d671007dd Merge pull request #2314 from pi-hole/fix/ftl-install-error-output Dan Schaper 2018-07-28 19:53:04 -07:00
  • 1a8d5fb4a9 Allow PHP to edit the regex file if installed Mcat12 2018-07-28 21:56:18 -04:00
  • f90c412b35 nroff checked pihole.8 for formatting. nroff -man pihole.8 Dan Schaper 2018-07-28 18:28:25 -07:00
  • c73b5456eb Fix "which" error leaking Mcat12 2018-07-28 21:12:05 -04:00
  • 3d87398721 Fix check_service_active leaking error output Mcat12 2018-07-28 20:50:04 -04:00
  • 96681887b8 Fix wildcard/regex usage formatting Mcat12 2018-07-28 20:35:15 -04:00
  • f2c675cff6 Formatted pihole-FTL.conf for readability. Dan Schaper 2018-07-28 16:16:16 -07:00
  • 1844bf17a7 Merge pull request #2311 from pi-hole/fix/git-head-flag Dan Schaper 2018-07-28 10:48:29 -07:00
  • 47b56d6123 Fix wrong git command flag Mark Drobnak 2018-07-27 23:20:59 -04:00
  • 814d5f6d6c Merge pull request #2307 from borats/development Mark Drobnak 2018-07-27 22:36:20 -04:00
  • 512d2dd5f8 Source git repo and not /opt location. Dan Schaper 2018-07-27 15:47:20 -07:00
  • ad20d5ac1c Remove -t SOURCE and DIRECTORY reversal flag on install. Dan Schaper 2018-07-27 15:39:37 -07:00
  • b79ff05e29 Move template files to own subdir. Include pihole-FTL.conf in templates. Dan Schaper 2018-07-27 15:21:25 -07:00
  • 32b50f8188 Change the word "folder" to "directory" since the pi-hole is intended to run on rpi with Linux on it. Borats Nolan 2018-07-28 02:35:39 +10:00
  • a44096a26d Merge pull request #2303 from pi-hole/development Dan Schaper 2018-07-26 22:30:51 -07:00
  • 32cf94fc74 Merge pull request #2297 from pi-hole/bugfix/locales Dan Schaper 2018-07-26 16:44:52 -07:00
  • 39e28cd80a Merge pull request #2302 from pi-hole/revert/2282 Dan Schaper 2018-07-26 16:38:44 -07:00
  • 9b1356ad01 Revert #2282 Adam Warner 2018-07-27 00:27:06 +01:00
  • 45521b377a Use ip route rather than old net-tools route in chronometer.sh Peter Robinson 2018-07-26 17:46:51 +01:00
  • 46a366635c Fixed locale issue, do not parse for string. Dan Schaper 2018-07-26 05:30:05 -07:00
  • 384b588a2d Merge pull request #2291 from pi-hole/merge/FTLDNS-to-development Dan Schaper 2018-07-24 11:51:56 -07:00
  • 03e5a78d8f Merge remote-tracking branch 'origin/FTLDNS' into development Mcat12 2018-07-22 15:18:26 -04:00
  • e32c76b059 Merge pull request #2289 from pi-hole/feature/space_tab Dan Schaper 2018-07-20 19:23:50 -07:00
  • ba7782f867 Space/Tab piholeDebug.sh Dan Schaper 2018-07-20 15:25:35 -07:00
  • c5091b0e49 Space/Tab wildcard_regex_converter.sh Dan Schaper 2018-07-20 14:00:34 -07:00
  • b54e32f0ca Space/Tab webpage.sh Dan Schaper 2018-07-20 13:57:15 -07:00
  • 328e7738d5 Space/Tab version.sh Dan Schaper 2018-07-20 13:27:30 -07:00
  • aca359c2e2 Space/Tab updatecheck.sh Dan Schaper 2018-07-20 13:24:05 -07:00
  • 1cd40dc9e5 Space/Tab update.sh Dan Schaper 2018-07-20 13:22:37 -07:00
  • dc9407281f Space/Tab setupLCD.sh Dan Schaper 2018-07-20 13:17:10 -07:00
  • 8f727c1f35 Space/Tab query.sh Dan Schaper 2018-07-20 13:13:42 -07:00
  • a08ea28feb Space/Tab piholeLogFlush.sh Dan Schaper 2018-07-20 13:07:54 -07:00
  • c5535dd9a0 Space/Tab piholeCheckout.sh Dan Schaper 2018-07-20 12:54:24 -07:00
  • 3519cc5e44 Space/Tab list.sh Dan Schaper 2018-07-20 12:42:11 -07:00