Commit Graph

  • cbe045b946 Merge remote-tracking branch 'origin/cleanup/shellcheck' into cleanup/shellcheck Dan Schaper 2017-01-09 00:17:15 -08:00
  • c58a95ca2e setDNS whiptail direct, not in array. Dan Schaper 2017-01-08 23:40:19 -08:00
  • 80a3bce6d5 PI_HOLE_INSTALL_DIR global variable Dan Schaper 2017-01-08 23:01:18 -08:00
  • 6f0289de49 Vestigial variable that was never populated. Dan Schaper 2017-01-08 22:54:45 -08:00
  • 0966d7660e Take out some whiptail subshells that aren't needed. Dan Schaper 2017-01-08 21:30:38 -08:00
  • 27e90cc4e6 Repetitive ip route get was resetting counts. Dan Schaper 2017-01-08 18:04:24 -08:00
  • b785213c3a Shellcheck for Test for $? -eq 0 Dan Schaper 2017-01-08 18:46:15 -08:00
  • 642a73508d Merge pull request #1119 from pi-hole/tweak/dry_installer Dan Schaper 2017-01-08 20:43:40 -08:00
  • 8f7b023769 Shellcheck for Test for $? -eq 0 Dan Schaper 2017-01-08 18:48:54 -08:00
  • a122fb2900 Shellcheck for Test for $? -eq 0 Dan Schaper 2017-01-08 18:46:15 -08:00
  • a299a2cc5f Repetitive ip route get was resetting counts. Dan Schaper 2017-01-08 18:04:24 -08:00
  • 47196d86ad Merge pull request #1115 from pi-hole/development v2.11.2 Adam Warner 2017-01-08 23:22:26 +00:00
  • a713cf7952 Merge pull request #1116 from pi-hole/fix/multi_interface Mcat12 2017-01-08 17:57:29 -05:00
  • 6cd7b8ff5e Merge branch 'master' into fix/multi_interface Dan Schaper 2017-01-08 14:54:46 -08:00
  • f8264f8277 Merge branch 'development' of github.com:pi-hole/pi-hole into development Dan Schaper 2017-01-08 14:49:29 -08:00
  • 0e4d5e9103 Bash splitting and globin Dan Schaper 2017-01-08 14:49:08 -08:00
  • f599bcfef9 Bugfix if multiple interfaces are present trick77 2017-01-08 13:56:08 +01:00
  • 74a4e62cc9 Codacy fix DL6ER 2017-01-08 11:26:56 +01:00
  • 63a414a544 Align outputs DL6ER 2017-01-08 11:21:50 +01:00
  • 7d1f5091a7 Fixed small typo DL6ER 2017-01-08 11:21:10 +01:00
  • 3b54cab3bc Show branches and revisions (incl. possible dirty state) in debug log DL6ER 2017-01-08 11:17:25 +01:00
  • 52d06d906e Bugfix if multiple interfaces are present trick77 2017-01-08 10:14:40 +01:00
  • d9e949b27c Merge pull request #1096 from pi-hole/fix/updater DL6ER 2017-01-06 23:36:42 +01:00
  • b65fe9d64f Merge pull request #1099 from pi-hole/fix/webpageshtypo DL6ER 2017-01-05 21:57:00 +01:00
  • 168397e90d Fixed typo in webpage.sh DL6ER 2017-01-05 21:45:06 +01:00
  • e3c1fcd2c6 NEW LOGIC FOR THE UPDATER Compare local and remote hashes. Update is available if current remote hash is different from current local hash since we assume that local should never be newer than remote for user DL6ER 2017-01-05 13:10:19 +01:00
  • a2bc86fbcb Merge pull request #1085 from pi-hole/development v2.11.1 Dan Schaper 2017-01-04 12:30:29 -08:00
  • 26c6446252 Merge branch 'master' into development Dan Schaper 2017-01-04 12:29:42 -08:00
  • e5e44db5ac Merge branches 'development' and 'master' of github.com:pi-hole/pi-hole into development Dan Schaper 2017-01-04 12:26:34 -08:00
  • d4f833c739 Merge pull request #1090 from pi-hole/fix/dead-led-link DL6ER 2017-01-04 16:19:32 +01:00
  • 806f44abe6 replace dead link to another LED blink project page Jacob Salmela 2017-01-04 09:01:03 -06:00
  • 900bdc5ee2 Merge pull request #1083 from pi-hole/fix/DHCP Mcat12 2017-01-03 17:06:17 -05:00
  • 200995bf29 Make IPv6 features of Pi-hole DHCP server switchable DL6ER 2017-01-03 14:24:33 +01:00
  • 3a90c1c192 Source setupVars.conf before trying to access variables DL6ER 2017-01-03 13:34:01 +01:00
  • cc68155dfa Merge remote-tracking branch 'origin/master' Dan Schaper 2017-01-02 14:12:30 -08:00
  • b8545eb1df Merge pull request #1074 from pi-hole/development v2.11 Mcat12 2017-01-02 16:36:55 -05:00
  • 76531da340 Merge pull request #1067 from pi-hole/fix/firewall_redux Mcat12 2017-01-02 11:36:38 -05:00
  • 12bec1df68 Merge pull request #1048 from pi-hole/tweak/simplify_webpage.sh Adam Warner 2017-01-02 14:28:26 +00:00
  • 2b778695b1 Implement querying ad lists support for wildcards (what hell of a bash experience) DL6ER 2017-01-02 14:27:13 +01:00
  • ad61852804 Test against empty string DL6ER 2017-01-02 11:10:38 +01:00
  • dbd8aee4ee Add 'local' domain if not set in setupVers.conf DL6ER 2017-01-02 11:08:54 +01:00
  • 677694b01a Set 24h lease time if settings was empty before DL6ER 2017-01-02 11:05:40 +01:00
  • 85f0241c0d Reprocess DHCP settings after update DL6ER 2017-01-02 10:50:59 +01:00
  • ade2185a9f Merge pull request #1073 from pi-hole/tweak/quidsup Dan Schaper 2017-01-01 15:35:55 -08:00
  • 0d27005dda Comment out QuidsUp Dan Schaper 2017-01-01 15:31:17 -08:00
  • 8ee2bdec4d Plain grep, escape the special characters. Dan Schaper 2017-01-01 14:38:10 -08:00
  • de6ce276d0 Merge branch 'development' of github.com:pi-hole/pi-hole into fix/firewall_redux Dan Schaper 2017-01-01 14:13:32 -08:00
  • fbea81dcd7 Merge pull request #1068 from pi-hole/fix/anti_glob Dan Schaper 2017-01-01 14:10:55 -08:00
  • 502c349b8b Merge branches 'development' and 'fix/firewall_redux' of github.com:pi-hole/pi-hole into fix/firewall_redux Dan Schaper 2017-01-01 13:47:56 -08:00
  • 5fb0aa70de Merge pull request #1008 from pi-hole/feature/track_pre-installed_packages Adam Warner 2017-01-01 20:29:02 +00:00
  • 7750e1344c DRY displayFinalMessage Dan Schaper 2017-01-01 07:10:14 -08:00
  • 8be37130e9 Move first check to main(), basic-install.sh can now be sourced. Set PH_TEST=true then source basic-install.sh. Careful for set -e. Dan Schaper 2017-01-01 06:45:03 -08:00
  • fa055481a7 Shellcheck screen size Dan Schaper 2017-01-01 06:32:49 -08:00
  • d080e5d7a8 Merge branch 'fix/anti_glob' of github.com:pi-hole/pi-hole into fix/anti_glob Dan Schaper 2017-01-01 00:18:37 -08:00
  • ad07655630 Defensive git cloning Dan Schaper 2017-01-01 00:07:10 -08:00
  • 7cceb8615a make_repo more defensive. Dan Schaper 2016-12-31 22:34:20 -08:00
  • ab9c8f4859 make_repo more defensive. Dan Schaper 2016-12-31 23:59:07 -08:00
  • ffb8a74111 Defensive is_repo Dan Schaper 2016-12-31 22:34:20 -08:00
  • 45587194e5 Regex fun Dan Schaper 2016-12-31 21:33:05 -08:00
  • ccbf391913 More intelligence in iptables rulesets. Account for Policy ACCEPT, with default rule DROP or REJECT as last rule. Dan Schaper 2016-12-31 19:07:40 -08:00
  • ebf0db4bbf Typo fixed DL6ER 2016-12-31 17:17:46 +00:00
  • 7765efa6c4 Merge pull request #1063 from pi-hole/fix/chmod_scripts Mcat12 2016-12-31 12:01:10 -05:00
  • 02d4b6794c Merge pull request #1066 from dgnthr/patch-1 DL6ER 2016-12-31 17:30:56 +01:00
  • 836b717346 Fixed a typo in the installation script Dominik G 2016-12-31 17:25:48 +01:00
  • 9ac265980f Add .conf to filename DL6ER 2016-12-31 13:41:19 +00:00
  • 40798da6b1 Add blacklisting wildcard support DL6ER 2016-12-31 12:49:04 +00:00
  • fc596e41d4 All scripts set executable Dan Schaper 2016-12-30 18:35:16 -08:00
  • 1f9b0f7cef Merge pull request #1061 from pi-hole/fix/blockpage-whitelist-path Mcat12 2016-12-30 15:43:39 -05:00
  • 7bcc15e416 Adjust blocking page paths from admin restructure Mcat12 2016-12-30 15:36:53 -05:00
  • 1a3bdbaabf Merge pull request #1057 from pi-hole/new/whitelistonblockingpage DL6ER 2016-12-30 21:07:34 +01:00
  • 5e35fdbc52 Save blocking page CSS to pihole directory instead of admin Mcat12 2016-12-30 14:42:15 -05:00
  • ab2c486f25 Fix password Enter handling Mcat12 2016-12-30 14:13:15 -05:00
  • 7fd7430d38 Use pi.hole when getting js and css Mcat12 2016-12-30 13:43:29 -05:00
  • 089b98430f Fix formatting Mcat12 2016-12-30 12:59:05 -05:00
  • 5c7fc05a32 Enable DHCP logging by default DL6ER 2016-12-30 16:31:57 +00:00
  • ced0d3c2c0 Merge pull request #1055 from pi-hole/fix/firewall_check Mcat12 2016-12-30 11:23:30 -05:00
  • 1afc5d351d Merge pull request #1058 from pi-hole/cleanup/remove_swap Mcat12 2016-12-30 11:12:28 -05:00
  • 09bbc81470 Add notice that the user might have to flush his DNS cache DL6ER 2016-12-30 12:27:33 +00:00
  • f7274addcd Delete swapfile generator, haven't used this in a long time. Dan Schaper 2016-12-30 04:08:32 -08:00
  • 09bfa2ef77 Add whitelisting on blocking page feature DL6ER 2016-12-30 12:03:45 +00:00
  • a48518d234 Update test rig for new firewalld Dan Schaper 2016-12-29 16:11:13 -08:00
  • a4a9879643 Restructure firewall detection and application. Dan Schaper 2016-12-29 15:57:29 -08:00
  • d1ccd7a460 Merge pull request #1052 from pi-hole/fix/missing_modules Dan Schaper 2016-12-29 14:51:35 -08:00
  • 9181a4a1d8 Apply dhcp lease time also for IPv6 DL6ER 2016-12-29 14:26:23 +00:00
  • 3268e1611a Backend accept and apply dhcp lease time DL6ER 2016-12-29 14:19:44 +00:00
  • ea9ec384c6 Disambiguate nested ifs. Dan Schaper 2016-12-29 01:35:52 -08:00
  • bbb958b7ed Detect RPF breaking kernel updates. Dan Schaper 2016-12-29 01:34:49 -08:00
  • cf724176dc Do stateful DHCPv6 and SLAAC DL6ER 2016-12-28 20:02:48 +00:00
  • 18d1c98f08 Merge pull request #1051 from pi-hole/fix/status DL6ER 2016-12-28 20:47:37 +01:00
  • d0cd39a25f Added space behind :53 to only match port 53 DL6ER 2016-12-28 20:32:56 +01:00
  • 03d4fcd17d Don't actually have to reapply DHCP settings since we are going to save it in a different file we don't replace by a template DL6ER 2016-12-28 16:32:24 +00:00
  • 02d658be65 Look for DHCP / DNS server settings which would have to be reapplied after updating (since we overwrite 01-pihole.conf) DL6ER 2016-12-28 16:31:55 +00:00
  • 1e627c7e8f Make webpage.sh fully library style DL6ER 2016-12-28 16:25:14 +00:00
  • 9170488b0a Test if DNS service is listening on local port 53 DL6ER 2016-12-28 15:58:48 +00:00
  • b02730a5ad Merge branches 'development' and 'feature/track_pre-installed_packages' of github.com:pi-hole/pi-hole into feature/track_pre-installed_packages Dan Schaper 2016-12-27 22:50:00 -08:00
  • 9af26cbaac Major simplification of webpage.sh DL6ER 2016-12-28 02:14:47 +00:00
  • 73741f1518 Merge pull request #1046 from pi-hole/tweak/subshells Dan Schaper 2016-12-27 16:00:07 -08:00
  • 9a9cb61345 Shift epel-release to installer dependencies for CentOS Dan Schaper 2016-12-27 12:59:53 -08:00
  • 6abd6d8879 Merge pull request #991 from pi-hole/webUIprivacymode Dan Schaper 2016-12-27 12:46:54 -08:00
  • c3b51b4ceb Merge branch 'development' into feature/track_pre-installed_packages Dan Schaper 2016-12-27 12:37:19 -08:00