Commit Graph

  • 540c57f755 Add comment for automigrated list entries DL6ER 2019-05-01 17:51:25 +02:00
  • 5e26e8245b Order results of queries to list views by id key DL6ER 2019-05-01 17:50:36 +02:00
  • 983117d788 Add id (primary key, autoincrement) field to lists tables DL6ER 2019-05-01 17:31:34 +02:00
  • b372f808dd Fix lint errors DL6ER 2019-05-01 17:06:14 +02:00
  • bc9b623638 Modify query.sh to use the gravity database DL6ER 2019-05-01 16:56:16 +02:00
  • d5781fb110 Fix extra space in front on END statement in CREATE TRIGGER commands DL6ER 2019-05-01 16:38:41 +02:00
  • 487718512d Remove DISTINCT attribute from views. They are not needed as the corresponding data is obtained from fields with UNIQUE attribute so duplications are already prevented at domain insertion. The elimination of the duplication check on imort through the views slightly reduces the load during import (I observed about 8 percent time saved on my NanoPi NEO). DL6ER 2019-05-01 16:37:23 +02:00
  • 8a92fb24c4 Incorporates changes requested by @Mcat12 pvogt09 2019-05-01 11:20:26 +02:00
  • 5c575e73c7 Adds world readable attribute to files created by Pi-hole to circumvent #2724 pvogt09 2019-04-30 22:41:12 +02:00
  • 2180531a84 Add trigger for automatic updates of the date_modified column and improve formating in the gravity.db template DL6ER 2019-04-29 19:43:35 +02:00
  • 6812e8880e Merge pull request #2705 from pi-hole/fix/chronometer-refresh-arg Mark Drobnak 2019-04-29 11:43:07 -04:00
  • a932209143 Set default for date_modified to be the current time DL6ER 2019-04-29 17:19:02 +02:00
  • 4946b5907b Move migrated files to backup directory instead of deleting them. This has the benefit that gravity.db can be recreated at any time by: 1. deleting gravity.db, 2. copying all files from the migration_backup directory back to /etc/pihole, 3. running pihole -g again. DL6ER 2019-04-28 22:15:47 +02:00
  • efeba594ae Add support for manipulating adlists from the CLI DL6ER 2019-04-28 21:39:06 +02:00
  • b27e4c3dc3 Merge pull request #2725 from pi-hole/fix/get-ip-similar-subnets Mark Drobnak 2019-04-28 14:24:47 -04:00
  • 5e1241acd2 Merge branch 'new/gravitydb' of github.com:pi-hole/pi-hole into new/gravitydb DL6ER 2019-04-28 14:44:34 +02:00
  • 126f7101ff Add (optional) date_modified field and use vw_whitelist view in vw_blacklist DL6ER 2019-04-28 14:42:52 +02:00
  • b320e74921 Improve argument handling Mcat12 2019-04-27 14:05:04 -07:00
  • add5e4ca5e Explicitly allow only -r and --refresh in argument handler Mcat12 2019-04-27 13:39:44 -07:00
  • 466fd79c66 Fix getting IP address in the presence of similar subnets Mcat12 2019-04-27 12:39:45 -07:00
  • 4596d9a577 Merge branch 'development' into new/gravitydb Mark Drobnak 2019-04-26 23:40:28 -04:00
  • b4ae142149 Remove printf escaping (we will realize it differently) and ensure we're using single quotes for strings (although double quotes are possible, too) DL6ER 2019-04-26 20:54:01 +02:00
  • 3fe43ce1d9 Rely on default value (database provided) for date_added when adding a new domain DL6ER 2019-04-26 18:15:53 +02:00
  • 8524aecfed Don't set gravity database permissions DL6ER 2019-04-26 17:56:11 +02:00
  • e04dc9d2bb Remove sqlitekey variable as the first column of the regex table is now called domain as well DL6ER 2019-04-26 17:44:42 +02:00
  • 3dcb9722d3 Remove global haveSourceUrls variable and just skip downloading and processing adlists if there aren't any to be downloaded DL6ER 2019-04-26 17:39:35 +02:00
  • bd0215524b Add vw_adlists view which returns only enabled adlists DL6ER 2019-04-26 17:36:00 +02:00
  • 53e3ff2b24 Only add non-empty lines when moving file content into database tables DL6ER 2019-04-26 17:32:05 +02:00
  • 5bb8163674 Change type of whitelist, blacklist, regex, and adlists time column to INTEGER and insert a DEFAULT clause that returns the current Unix time as such an integer DL6ER 2019-04-26 17:17:21 +02:00
  • a891d64395 We should always exit after displaying a list, even if it is empty DL6ER 2019-04-26 17:13:36 +02:00
  • 6b1d2523e8 Also print datetime a domain was added when listing the domains on the CLI DL6ER 2019-04-26 17:07:16 +02:00
  • 08ee9526ad Review comments DL6ER 2019-04-26 17:06:01 +02:00
  • 0efc46260f Use both old and new strings for detecting whether this is a Pi-hole dnsmasq config file DL6ER 2019-04-26 16:16:30 +02:00
  • 6a01a1257f Merge pull request #2597 from xCh12i5/RegEx-Fix DL6ER 2019-04-25 15:27:35 +02:00
  • a2a7e80007 Add --web for sending a confirmation string when executed from the web interface. This is necessary as the "Reloading DNS service" message does not always propagate through to the web interface when reloading pihole-FTL takes a while. DL6ER 2019-04-25 15:01:13 +02:00
  • cce66a13b6 Fix output in list.sh when adding a domain that is already present in the target list DL6ER 2019-04-25 14:54:41 +02:00
  • 43bced7997 Add more comments DL6ER 2019-04-25 12:45:08 +02:00
  • 788cd78321 Reduce code duplication and add special handling of | character as it might appear in regex filter string DL6ER 2019-04-25 12:30:38 +02:00
  • e5d1cb5a2e Rewrite list.sh to operate on database-based lists DL6ER 2019-04-25 12:10:42 +02:00
  • d94bbfca7f Finish migrating gravity.db to using our new gravity database. This removes the --skip-download, --blacklist-only, --whitelist-only, and --wildcard-only options as it is not necessary to run gravity when modifying them from now on (gravity really only builds the gravity database and the local.list file). DL6ER 2019-04-25 11:18:54 +02:00
  • 465a39427b Source adlists from gravity database DL6ER 2019-04-25 10:46:18 +02:00
  • 2664ac0efc Improve error reporting DL6ER 2019-04-25 10:18:37 +02:00
  • c1277705d8 Copy existing whitelist.txt, blacklist.txt, regex.list, and adlists.list to the database. We remove the files afterwards as the content lives in the database now DL6ER 2019-04-24 19:55:05 +02:00
  • 61cfd2f9f9 Add adlists table DL6ER 2019-04-24 19:48:06 +02:00
  • ee4dabeca6 Merge branch 'development' into new/gravitydb DL6ER 2019-04-24 19:12:04 +02:00
  • e57d0fb93c Remove the empty templates gravity.list, white.list, black.list. The old source files whitelist.txt, blacklist.txt, and regex.list still exist and need to be removed in a follow-up commit DL6ER 2019-04-24 19:05:08 +02:00
  • ee20164207 Remove detect_pihole_blocking_status() as we can modify the database at any time DL6ER 2019-04-24 19:01:31 +02:00
  • d7ee44960e Remove moving around of the gravity and blacklist files as we do not use them any longer DL6ER 2019-04-24 18:56:44 +02:00
  • c13ebd3a9d Replace Pi-hole ID string with another line we intend to keep DL6ER 2019-04-24 18:54:55 +02:00
  • 6594a0a6e7 Fix detection of blocked query in pihole -t DL6ER 2019-04-24 18:53:20 +02:00
  • de44563301 Remove addn-hosts from 01-pihole.conf DL6ER 2019-04-24 18:51:38 +02:00
  • e3d9cf0ac1 Merge pull request #2718 from Piskvor/basic-install-package-manager-typo DL6ER 2019-04-24 10:17:23 +02:00
  • bd572d8843 Merge pull request #2717 from pi-hole/fix/teleporter-extension Mark Drobnak 2019-04-23 13:23:43 -04:00
  • 037737d653 Show $UPDATE_PKG_CACHE content in error message. Jan Piskvor Martinec 2019-04-23 16:02:25 +02:00
  • d2c7c426de Fix teleporter backup file extension Mark Drobnak 2019-04-22 19:43:26 -07:00
  • 1d09c6e47d Merge pull request #2709 from pi-hole/fix/checkout_indentation Mark Drobnak 2019-04-16 22:51:01 -04:00
  • 84244b7cd5 Fix indentation in display of branches available during pihole checkout DL6ER 2019-04-16 18:30:04 +02:00
  • 422680ee9f Fix chronometer refresh incorrectly reading the long argument sleep time Mcat12 2019-04-14 13:03:25 -07:00
  • 42c7653e99 Merge pull request #2696 from pi-hole/tweak/FTL-privacy-doc-link Mark Drobnak 2019-04-07 15:12:10 -04:00
  • 78c0c58946 Add a link to the documentation on FTL privacy levels during install Mcat12 2019-04-07 12:00:43 -07:00
  • cae61614f4 Merge pull request #2688 from pi-hole/fix/2687 Mark Drobnak 2019-03-28 23:20:41 -04:00
  • a7f6c9b3a0 Ignore matches that start # using negative lookbehind Adam Warner 2019-03-29 00:08:04 +00:00
  • 5950b4bb78 Merge pull request #2646 from pi-hole/fix/FTL_arch_detect_rpm Mark Drobnak 2019-03-24 15:23:05 -04:00
  • 817b19888f Merge branch 'development' into fix/FTL_arch_detect_rpm DL6ER 2019-03-23 08:55:46 +01:00
  • b64fb578fc Merge pull request #2674 from NiGhTTraX/development Mark Drobnak 2019-03-15 22:11:34 -04:00
  • e9e92368b0 Fix uninstalling lighttpd when it's not installed Andrei Picus 2019-03-15 14:47:41 +01:00
  • ffcb173a7f Merge pull request #2672 from pi-hole/fix/test-version-pinning Dan Schaper 2019-03-15 07:04:40 -07:00
  • b9c9c2797f Pin Python package versions to the versions in the last successful build Mcat12 2019-03-13 20:14:21 -07:00
  • 204a4e459b Merge pull request #2637 from TheNoim/patch-1 Mark Drobnak 2019-03-13 22:12:00 -04:00
  • 0a53e966ea Merge pull request #2659 from pi-hole/tweak/warn_if_FTL_not_on_master DL6ER 2019-03-03 09:34:11 +01:00
  • 2e17c23333 Don't warn if user is on development as this branch is constantly updated DL6ER 2019-03-02 16:40:59 +01:00
  • 63f3381a2b Warn user if FTL is not on branch master DL6ER 2019-03-02 16:36:49 +01:00
  • 2292720fed Merge pull request #2650 from mmphego/patch-1 Mark Drobnak 2019-03-01 13:19:31 -05:00
  • b77efa521f Update README.md Mpho Mphego 2019-03-01 09:37:00 +02:00
  • cfe221706b Update README.md Mpho Mphego 2019-02-27 09:41:15 +02:00
  • 54ae9d83b0 Stickler-lints Dan Schaper 2019-02-23 13:42:15 -08:00
  • 293e2a8e80 Merge pull request #2647 from pi-hole/feature/curl_debug Dan Schaper 2019-02-23 09:11:02 -08:00
  • 71cd6c137b Use curl instead of openssl for transmission of unmodified log file. We want ansi color codes to be sent. Dan Schaper 2019-02-23 04:13:44 -08:00
  • 0e14d11a20 Merge branch 'development' into new/gravitydb DL6ER 2019-02-22 23:06:17 +01:00
  • bbc392caeb More review comments DL6ER 2019-02-22 22:49:02 +01:00
  • 61840edb30 Fill comment field with NULL (default) instead of empty string and use a variable for the timestamp instead of periodically calling date DL6ER 2019-02-22 22:46:19 +01:00
  • 9867b7fccf Don't fail when trying to detect OS architecture on RPM-based systems DL6ER 2019-02-22 18:32:36 +01:00
  • 58f198626a Merge pull request #2640 from pi-hole/new/DebugAdditions Mark Drobnak 2019-02-18 19:28:21 -05:00
  • a145f1d931 Be more verbose with debug script output If output of git status -s is non-null display changes if output of git diff is non-null, display diff Adam Warner 2019-02-18 22:32:53 +00:00
  • 9748f19172 Merge pull request #2639 from pi-hole/hotfix/v4.2.2 Mark Drobnak 2019-02-18 13:54:08 -05:00
  • ba1e94d3d9 Merge pull request #2626 from pi-hole/hotfix/v4.2.2 v4.2.2 DL6ER 2019-02-18 18:36:13 +01:00
  • cd9fadbc44 Remove protocol determination No protocol determination is neede, if you just use double slash. Nils Bergmann 2019-02-16 15:32:56 +01:00
  • 062a180a1c Merge pull request #2621 from cryptomilk/development-fix Mark Drobnak 2019-02-10 20:06:26 -05:00
  • 860ec1a7c4 basic_install: Use install for sudoers Andreas Schneider 2019-02-05 13:45:52 +01:00
  • 5ca1bfc11c Delete /dev/shm/FTL-* files on (re)start of pihole-FTL DL6ER 2019-02-08 14:56:44 +01:00
  • 2f189cd076 basic_install: There is no pihole group, remove it Andreas Schneider 2019-02-05 09:40:47 +00:00
  • 2f0e6a6dda basic_install: Make sure the PI_HOLE_CONFIG_DIR exists Andreas Schneider 2019-02-05 09:33:31 +00:00
  • f187b42a98 basic_install: Define webroot globally as a variable Andreas Schneider 2019-02-05 09:30:43 +00:00
  • f9250d91a5 Explictly escape the escape. DL6ER 2019-02-06 19:13:31 +01:00
  • 491c828661 Improved code, ensure that gravity.sh passes shellcheck as a whole DL6ER 2019-02-06 19:09:09 +01:00
  • 644ec36e64 Review comments DL6ER 2019-02-06 18:57:48 +01:00
  • 838e1b19ec basic_install: Set permissons for PI_HOLE_DASHBOARD_DIR Andreas Schneider 2019-02-05 09:23:23 +00:00
  • d5bbb2b640 basic_install: Use a varibale for the pihole dashboard dir Andreas Schneider 2019-02-05 09:17:53 +00:00
  • dc91d4b1f9 basic_install: If a static interface is already set up we are done Andreas Schneider 2019-02-05 09:06:57 +00:00
  • 9984647ebb After renaming column in regex, it also needs to be renamed in vw_regex DL6ER 2019-02-05 19:41:11 +01:00