Commit Graph

  • e27f50b8e5 Try to obtain PID from PIDFILE. If this fails (file does not exist or is empty), fall back to using pidof + awk DL6ER 2019-05-31 09:18:12 +02:00
  • 484f618685 Use last PID in case pidof returns multiple PIDs for pihole-FTL DL6ER 2019-05-30 15:26:27 +02:00
  • da398c3d9c Print an error message if the FTL release metadata download fails Mcat12 2019-07-19 17:35:21 -07:00
  • 4e0ad52001 Fix ShellCheck issue by refactoring a bit Mcat12 2019-06-28 20:57:05 -07:00
  • c9829dd3e4 Fix pihole -up showing FTL update when network is down Mcat12 2019-06-28 20:49:56 -07:00
  • 35cf863f4b Create FUNDING.yml Dan Schaper 2019-05-31 22:12:54 -07:00
  • c53be459c6 quick fix for when dig also returns a CNAME Andreas 2019-08-04 21:21:08 +02:00
  • ab1ea5a366 This change fixes issue #145 "stty: standard input: Inappropriate ioctl for device ".It checks if a real terminal exist, if not it sets the screen size to a fixed value. This helps to avoid nasty and unnecessary logs when running "pihole -up" via e.g. cron. B. Olausson 2019-07-29 18:34:00 +02:00
  • 97e11bd94e ensure installation dependencies for FTL tests which rely on /etc/init.d bcambl 2019-07-06 11:06:08 -06:00
  • 10de7f649b add chkconfig to INSTALLER_DEPS (CentOS/Fedora) bcambl 2019-07-06 10:58:19 -06:00
  • d793ef1ab8 Merge conflict Fedora Dockerfile for tests pinned to 30 bcambl 2019-07-06 10:57:57 -06:00
  • d3d45a8776 Fix 404 error when browsing to pi.hole (without /admin) (for fedora) Jeroen Baert 2019-07-03 04:28:23 +02:00
  • 9f86fd0cb4 Fix for 404 error when browsing to pi.hole (without /admin) Jeroen Baert 2019-07-01 03:42:02 +02:00
  • 71d5b42726 Remove the ZeusTracker blocklist from the defaults Mcat12 2019-07-12 20:03:36 -07:00
  • 3e78ed95d4 Fix displaying options for table "group" in the debugger. DL6ER 2019-08-17 15:04:04 +02:00
  • 20a839fef5 fixed local declaration before assignment snapsl 2019-08-15 11:20:55 +02:00
  • b2d8c4374b tweaked code style of webpage.sh snapsl 2019-08-14 23:28:13 +02:00
  • 251c9fee98 Simplify restarting code for "pihole restartdns". This fixes #2869. DL6ER 2019-08-14 20:58:18 +02:00
  • 9f77810ca8 Merge pull request #2774 from pi-hole/meta/funding Mark Drobnak 2019-08-12 10:30:33 -04:00
  • 741c19b975 Use compression (if available) when downloading the ad lists. v4.3.4int DL6ER 2019-08-10 13:33:30 +02:00
  • dc93462d42 Group table has only two columns DL6ER 2019-08-06 20:28:00 +02:00
  • 4371c9ba03 Ensure proper permissions are set for gravity.db after creation. DL6ER 2019-08-05 21:20:07 +02:00
  • 6e2e825a5f Rename options "pihole --whiteregex" to "pihole --white-regex" for the sake of readability. The same applied for "whitewild" -> "white-wild" DL6ER 2019-08-05 21:10:52 +02:00
  • af754e3fc4 Rearrange group tables directly next to the tables they refer to. DL6ER 2019-08-05 21:08:36 +02:00
  • 06860ed5b4 Group tables have only two columns. DL6ER 2019-08-05 21:07:39 +02:00
  • 09190c1735 Only check once for if this is a regex list or not. DL6ER 2019-08-05 21:03:47 +02:00
  • a95b473417 Rearranage if statements to ensure the proper output is shown for wildcard-style filters. DL6ER 2019-08-05 20:56:01 +02:00
  • 56e3565a9e Merge pull request #2865 from ryrun/patch-1 Mark Drobnak 2019-08-05 10:58:27 -04:00
  • 63230cb72d quick fix for when dig also returns a CNAME Andreas 2019-08-04 21:21:08 +02:00
  • f81e57d5b8 Merge pull request #2862 from bolausson/mybranch Mark Drobnak 2019-07-30 14:58:56 -04:00
  • ecd6817aaf This change fixes issue #145 "stty: standard input: Inappropriate ioctl for device ".It checks if a real terminal exist, if not it sets the screen size to a fixed value. This helps to avoid nasty and unnecessary logs when running "pihole -up" via e.g. cron. B. Olausson 2019-07-29 18:34:00 +02:00
  • 6f58d58cae Add --whitewild to help texts and man pages. DL6ER 2019-07-22 22:26:27 +02:00
  • 40d0caa70b Add undocumented --whitewild option that does the same --wild does for the whitelist. DL6ER 2019-07-22 21:03:42 +02:00
  • 0692be9bae Fix small mistake in 2->3 upgrade script. DL6ER 2019-07-22 20:59:52 +02:00
  • 0d28dce326 Print group table contents in debug log. DL6ER 2019-07-22 20:18:15 +02:00
  • 96031214c6 Add support for whitelist regex filter management via CLI. DL6ER 2019-07-22 19:35:16 +02:00
  • 3420439f31 Merge pull request #2820 from pi-hole/fix/ftl-update-no-network Mark Drobnak 2019-07-20 14:55:48 -04:00
  • ab3f6dfcc6 Merge pull request #2831 from pi-hole/fix/block-page-adlists Mark Drobnak 2019-07-20 14:55:37 -04:00
  • 3ebd43ebf0 Remove outdated adlists.list check and fix empty adlists error message Mcat12 2019-07-19 17:39:00 -07:00
  • 38ff343134 Print an error message if the FTL release metadata download fails Mcat12 2019-07-19 17:35:21 -07:00
  • 6a8d3100d2 Merge pull request #2846 from pi-hole/fix/zeus-dead-adlist Mark Drobnak 2019-07-18 13:43:57 -04:00
  • c3ec2e68ad Remove the ZeusTracker blocklist from the defaults Mcat12 2019-07-12 20:03:36 -07:00
  • bfe714e985 Merge pull request #2840 from pi-hole/fix/valid_ip-quote-error Mark Drobnak 2019-07-11 23:06:39 -04:00
  • 1d5755a4c2 Add tests for valid_ip Mcat12 2019-07-10 21:18:58 -07:00
  • 445127accc Merge pull request #2832 from pi-hole/new/audit_database Mark Drobnak 2019-07-10 22:55:48 -04:00
  • c156af020c Use suggested array creation to fix linter error Mcat12 2019-07-10 19:52:17 -07:00
  • fa8751f9ad Fix error when checking if IP address is valid Mark Drobnak 2019-07-10 19:42:51 -07:00
  • 420f60b5c7 Add timeout to migration script (1->2). DL6ER 2019-07-10 11:56:39 +02:00
  • 65fdbc85d5 Add timeout to migration script (2->3). DL6ER 2019-07-10 12:01:38 +02:00
  • 87f75c737a Review comments. DL6ER 2019-07-10 12:00:38 +02:00
  • 5ff9052200 Review comments DL6ER 2019-07-09 11:41:44 +02:00
  • 9641e268ea Merge pull request #2837 from pi-hole/fix/debug-use-FTL-file-locations DL6ER 2019-07-09 07:54:57 +02:00
  • b154dd5f07 Quote calls to read FTL config Mcat12 2019-07-08 19:48:50 -07:00
  • 0683842ec3 Fix typo in 2->3 migration script. DL6ER 2019-07-08 21:43:49 +02:00
  • f5121c64be We should still add the regex lines (initially) to the regex table as the renaming will happen only after the importing. DL6ER 2019-07-08 21:39:30 +02:00
  • 054c7a2c05 Create new table + view regex_whitelist + rename old regex table to regex_blacklist. This updates the gravity.db version to 3. DL6ER 2019-07-08 21:23:46 +02:00
  • 3d3fc2947e Review comments DL6ER 2019-07-08 19:22:35 +02:00
  • e8e5d4afda Get file locations of FTL files from the config Mcat12 2019-07-07 18:10:39 -07:00
  • 8382f4d727 Rename table to domain_audit and simplify subroutine addAudit(). DL6ER 2019-07-07 21:21:56 +02:00
  • be3e198f9a Address linting errors. DL6ER 2019-07-07 10:46:20 +02:00
  • acc50b709e Only migrate files once (domain and adlist lists druing initial creation of gravity.db auditlog.list on database upgrade from version 1 to 2. DL6ER 2019-07-07 10:33:08 +02:00
  • 5a6763f90d Merge pull request #2833 from bcambl/fedora30_tests Mark Drobnak 2019-07-06 19:27:02 -04:00
  • 218476fab0 ensure installation dependencies for FTL tests which rely on /etc/init.d bcambl 2019-07-06 11:06:08 -06:00
  • ec850dc820 add chkconfig to INSTALLER_DEPS (CentOS/Fedora) bcambl 2019-07-06 10:58:19 -06:00
  • c48b03584f update Fedora Dockerfile to 30 bcambl 2019-07-06 10:57:57 -06:00
  • efe8216445 Fix further stickler complaint. DL6ER 2019-07-06 09:45:07 +02:00
  • 0405aaa3da Review comments and fixing stickler complaints. DL6ER 2019-07-06 09:32:41 +02:00
  • 6bb213e56f Merge pull request #2826 from Forceflow/development Mark Drobnak 2019-07-05 17:18:50 -04:00
  • 2fb4256f84 Rename table to "auditlist" DL6ER 2019-07-05 16:28:36 +02:00
  • 82476138c1 Instead of calling sqlite3 multiple times within a loop, we use the ability to add multiple rows within one INSERT clause. This is supported since sqlite3 3.7.11 (2012-03-20) and should be available on all systems. DL6ER 2019-07-05 16:09:13 +02:00
  • 5293beeb77 Update audit script to store domains in new database table. DL6ER 2019-07-05 14:10:33 +02:00
  • 0c8f5f1221 Remove comment field from audit table DL6ER 2019-07-05 14:06:05 +02:00
  • 4f4a12bb40 Upgrade database if necessary and store audit domains therein. DL6ER 2019-07-05 14:03:57 +02:00
  • 1dbe6c83c3 Add database upgrading mechanism for adding the audit table. DL6ER 2019-07-05 13:54:18 +02:00
  • 2b5033e732 Add missing spaces found by linter Mcat12 2019-07-04 13:49:39 -07:00
  • 8d9ff550d4 Fix blockpage error if whitelisted, blacklisted, or regex filtered Mcat12 2019-07-04 13:44:14 -07:00
  • f1733f9c5d Fetch adlists for the block page from gravity.db Mcat12 2019-07-04 13:11:46 -07:00
  • 92c3c86be4 Merge pull request #2769 from pi-hole/new/arp-flush Mark Drobnak 2019-07-04 14:00:16 -04:00
  • ada8b53423 Merge pull request #2803 from pi-hole/new/gravity.db_domain_groups Mark Drobnak 2019-07-04 13:52:52 -04:00
  • 7a1b6fd205 Merge branch 'development' into new/gravity.db_domain_groups DL6ER 2019-07-03 19:21:55 +02:00
  • b78cbb98d8 Merge pull request #2830 from mmotti/fix/regexp_query DL6ER 2019-07-03 19:16:04 +02:00
  • 04abcb71f6 Fix potential invalid result for pihole -q MMotti 2019-07-03 13:04:57 +01:00
  • 1fe3507bc5 Adlists table was renamed to Adlist. Adapt further places in the code to match the new name. DL6ER 2019-07-03 07:56:10 +02:00
  • 9fedafed15 Fix 404 error when browsing to pi.hole (without /admin) (for fedora) Jeroen Baert 2019-07-03 04:28:23 +02:00
  • 23b3a9a650 Add DISTINCT to the view\'s SELECT queries to avoid domain duplication in case they are enabled in multiple groups at the same time. DL6ER 2019-07-01 09:44:20 +02:00
  • 7b2ac25a52 Fix for 404 error when browsing to pi.hole (without /admin) Jeroen Baert 2019-07-01 03:42:02 +02:00
  • f91421418a Rename adlists -> adlist table. DL6ER 2019-06-30 23:21:10 +02:00
  • 3a14e8b013 Check whitelist_by_group.group_id instead of group.enabled against NULL. DL6ER 2019-06-30 23:07:03 +02:00
  • ad97e95f2f Add required name column in group table. DL6ER 2019-06-30 23:06:15 +02:00
  • 5b01facd73 Fix logix on the views: AND ( OR ) DL6ER 2019-06-30 20:03:22 +02:00
  • 6fe637b9ee Rename groups -> group DL6ER 2019-06-30 19:43:18 +02:00
  • 94d83dbb2d Unify the two group tables into a single "groups" table. This allows managing adlists and domains together. DL6ER 2019-06-30 19:33:02 +02:00
  • c9a843b417 Merge pull request #2823 from pi-hole/fix/lighttpd-mime Mark Drobnak 2019-06-30 13:27:55 -04:00
  • b986c5585d Merge pull request #2822 from akurth/development Mark Drobnak 2019-06-30 13:11:20 -04:00
  • 87c115fc86 Change implementation to use linking tables (domain_groups, adlists_groups). This allows adding domains to multiple lists conveniently. DL6ER 2019-06-30 18:58:47 +02:00
  • acee97916e Fix pihole manpage to match code. Andreas Kurth 2019-06-30 08:02:51 +02:00
  • 1a741f696e Merge pull request #2816 from RamSet/hotfix/lighttpdMime v4.3.1 Mark Drobnak 2019-06-29 15:45:33 -04:00
  • 37e7cd5211 Fix ShellCheck issue by refactoring a bit Mcat12 2019-06-28 20:57:05 -07:00
  • 91a2d052a7 Fix pihole -up showing FTL update when network is down Mcat12 2019-06-28 20:49:56 -07:00
  • 06134d3ffc Merge pull request #2817 from pi-hole/tweak/gravity_db_timeout Mark Drobnak 2019-06-27 17:34:34 -04:00