WaLLy3K
aff5ff08d5
Trim version output when update is successful ( #1527 )
2017-06-15 09:50:05 +02:00
Mcat12
e8025dbc81
Merge pull request #1513 from pi-hole/EUPLv1.2
...
Update LICENSE of the project to EUPL v1.2
2017-06-10 14:10:25 -04:00
DL6ER
939055f19c
Revert "Add FTL tests to the test suite ( #1510 )" ( #1519 )
...
This reverts commit cf6a1ac9ad
2017-06-05 13:51:13 +02:00
Mcat12
c47f3e3307
Merge pull request #1517 from pi-hole/tweak/update_core_and_FTL
...
Don't update FTL when there is a core update
2017-06-04 08:42:59 -04:00
DL6ER
cf6a1ac9ad
Add FTL tests to the test suite ( #1510 )
...
* Add first version of FTL tests
* Wait one second to allow FTL to start up and analyze our mock log
* Add test_FTL_telnet_statistics
* Added test_FTL_telnet_top_clients
* Add test_FTL_telnet_top_domains
2017-06-04 13:23:56 +02:00
DL6ER
f1146a3443
Don't update FTL when there is a core update (as this will update FTL a second time). Fixes #1516
2017-06-04 12:41:44 +02:00
WaLLy3K
6823a62644
Add tricorderFunc back as usable function ( #1515 )
...
As per #1464
2017-06-03 19:13:40 +02:00
DL6ER
2516a1e298
Make clear that NO is the default if the user just hits return ( #1514 )
2017-06-03 17:23:47 +02:00
DL6ER
288f93c5dd
Update LICENSE of the project to EUPL v1.2
2017-06-03 15:06:00 +02:00
DL6ER
8ef64dbe74
Add weekly logrotation of FTL's log ( #1509 )
2017-06-03 14:51:35 +02:00
DL6ER
01e091fd17
Prefer ULA over GUA addresses [IPv6] ( #1508 )
...
* On installs with GUA and ULA's we should prefer ULA's as it's been demonstrated that GUA's can and often are rotated by ISPs. Fixes #1473
* Add test for link-local address detection
* Add ULA-only and GUA-only tests
* Add test_IPv6_GUA_ULA_test and test_IPv6_ULA_GUA_test
* Add ""
* Add mock_command_2 command that can mock a command with more than one argument (as "ip -6 address") and result multiple lines of results
* Make mock_command_2 more similar to the original mock_command
* Correct comments
* Fixed remaining comments
* Fixed one last comment...
* Fixed a comment...
2017-06-02 23:01:48 +02:00
Mcat12
bf3883ed46
Merge pull request #1506 from pi-hole/tweak/github_issues
...
Update ISSUE_TEMPLATE.md to remove Feature Request choice.
2017-05-31 19:14:36 -04:00
Dan Schaper
3a58e9d33a
Remove Question option
2017-05-31 00:02:57 -07:00
Dan Schaper
570c54002f
Update ISSUE_TEMPLATE.md
2017-05-30 23:51:22 -07:00
WaLLy3K
2b8a8b03a8
Roll back merge #1417 ( #1494 )
2017-05-27 22:42:44 +02:00
DL6ER
d913534793
Move wildcards file if blocking is disabled ( #1495 )
...
* Move wildcards file if blocking is diabled
* Delete newline
2017-05-27 17:51:41 +02:00
WaLLy3K
10139241f5
Fix output IPv4 addr when removing CIDR notation ( #1498 )
2017-05-26 09:57:27 +02:00
WaLLy3K
4ad0cdf5d4
Rewrite Chronometer to output more stats
2017-05-25 01:03:13 +10:00
WaLLy3K
98fdb95645
Merge pull request #1491 from pi-hole/fix/ResetInRepoDir
...
Change directory before trying to reset repository
2017-05-23 19:02:03 +10:00
DL6ER
3035c9a366
Refine output of password status in basic-install.sh:displayFinalMessage(). Fixes #1488 ( #1490 )
2017-05-23 10:44:11 +02:00
Dan Schaper
5004cf331a
No need to cd $PWD as it doesn't affect flow of caller script.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-05-22 15:36:51 -07:00
DL6ER
74eb8c8622
Change directory before trying to reset repository. Fixes #1489
2017-05-22 23:43:52 +02:00
WaLLy3K
2ef87ad110
Retrieve local repos on repair ( #1481 )
...
* Retrieve local repos on repair
* Change conditional to check for repair
* Change wording of Update/Reconfigure message
* Fixed indenting
* Perform "git reset --hard" on reconfigure
2017-05-21 22:47:25 +02:00
DL6ER
c655e6ea73
Install loopback firewall rules for FTL ( #1419 )
...
* Install loopback firewall rules for FTL
* FirewallD FTL ports
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
* Remove firewallD FTL local rules.
Local rules should not be blocked in firewallD, not requred for internal service FTD>
* Reinstate https rules, and delete FTL rules
Fixes earlier commit.
2017-05-20 15:47:51 +02:00
WaLLy3K
2f2825f15e
Tricorder: Insecure Opt-out
2017-05-20 10:45:26 +10:00
Mcat12
e377fe5503
Merge pull request #1486 from pi-hole/readme/win-dns-swapper
...
Add link to Windows DNS Swapper
2017-05-19 11:26:51 -04:00
Mcat12
69b41dd72e
Add link to Windows DNS Swapper
...
See #1400
2017-05-19 11:16:34 -04:00
WaLLy3K
a620a5c430
Formatting consistency
2017-05-18 12:53:32 +10:00
WaLLy3K
1f3db8b602
Confirm Tricorder is online
...
* Scan port 9998 to confirm the availability of "tricorder.pi-hole.net"
* Exit codes for upload process
2017-05-18 12:43:17 +10:00
WaLLy3K
f6732a484e
Merge pull request #1317 from r0ckarong/development
...
Fixed handling of `pihole -wild` help text
2017-05-18 11:16:25 +10:00
DL6ER
4015122d33
Merge pull request #1476 from pi-hole/fix/midnightflushing
...
Fix midnight logrotation
2017-05-18 01:23:32 +02:00
DL6ER
42eb811910
Add "quiet" mode + update comments in the cron file
2017-05-17 12:54:43 +02:00
DL6ER
c9042ffedd
Print echos only when manual flushing is requested
2017-05-17 12:51:04 +02:00
DL6ER
4e2c6a7b8e
Fix logrotation: manual flushing should be done twice, but automated rotation at midnight should only be done *once*!
2017-05-17 12:44:35 +02:00
WaLLy3K
7453bf2ee6
Fix wildcard help text
...
* -wild is not a valid option since we're already using -wild
2017-05-16 10:23:53 +10:00
WaLLy3K
7d17c652f3
Merge branch 'development' into development
2017-05-16 10:18:32 +10:00
WaLLy3K
075f00cecd
Merge branch 'development' into tc-insecure-optout
2017-05-16 09:49:42 +10:00
WaLLy3K
b9f2ba0717
Wording changes and bug fix
2017-05-16 09:48:46 +10:00
Adam Warner
ed04be5faa
Merge pull request #1468 from pi-hole/tweak/help-output
...
New Help Output
2017-05-14 16:46:58 +01:00
Adam Warner
90119c75d5
more merge conflicts!
2017-05-14 16:43:20 +01:00
Dan Schaper
d30056026b
Merge pull request #1466 from pi-hole/doclist_remove_sed
...
Document `sed` substitution for user readability
2017-05-14 08:28:10 -07:00
Adam Warner
bc8a5916d8
fix merge conflicts
2017-05-14 16:17:04 +01:00
Dan Schaper
f202602f99
Merge pull request #1470 from pi-hole/tweak/taco
...
Update PullApprove rules
2017-05-14 07:41:07 -07:00
DL6ER
69f361a3a1
🌮 is the new :shipit: squirrel
2017-05-14 16:28:35 +02:00
WaLLy3K
da9ff0cc66
Tricorder: Insecure Opt-out
...
* Check to see if Tricorder is being called directly
* Provide opt-out for insecure transmission of debug log
* Remove mention of internal function from help menu
2017-05-14 19:27:14 +10:00
WaLLy3K
703ff09a91
Merge pull request #1464 from pi-hole/new/tricorder_option
...
Tricorder debug logs are now uploaded using SSL when `openssl` is available
2017-05-14 15:37:25 +10:00
WaLLy3K
30035ce1c2
Merge branch 'development' into tweak/help-output
2017-05-14 13:03:33 +10:00
WaLLy3K
39b74ebfd4
Show help for "pihole checkout --help"
2017-05-14 12:22:19 +10:00
WaLLy3K
3bd677c102
Show help for "pihole -v -h"
...
* Indent output text
* Minor help text change
2017-05-14 11:57:46 +10:00
WaLLy3K
4eb7d2868c
Fix "pihole disable --help" and "pihole -l --help"
2017-05-14 11:53:40 +10:00
