Commit Graph

2031 Commits

Author SHA1 Message Date
ProtoFoo 357f5a2cfd Add manual edit warning
Added text block from dns config file to warn user that manual changes to lighttpd config will be overwritten.
Slight cosmetic adjustments (tabs -> spaces).
2017-02-09 16:46:55 +01:00
Dan Schaper 5333895a9f Merge pull request #1201 from pi-hole/development
[RELEASE] Pi-hole Core 2.12.1
2017-01-31 11:37:05 -08:00
DL6ER da05491992 Merge pull request #1192 from pi-hole/fix/regex
Remove misplaced start of string expression
2017-01-30 21:25:45 +01:00
DL6ER b9f5d79f3d Merge pull request #1203 from pi-hole/master
Sync development and master
2017-01-30 20:46:12 +01:00
DL6ER fddc515ee1 Merge pull request #1195 from pi-hole/fix/logrotate
Change how user and group are stored in the logrotate config file
2017-01-29 21:35:31 +01:00
DL6ER 3d4516dc95
Improve regex 2017-01-29 20:27:20 +01:00
DL6ER 509c864cc3
Merge branch 'development' into fix/regex 2017-01-29 20:27:04 +01:00
DL6ER 8b22f435ad
Change how user and group are stored in the logrotate config file (necessary on Ubuntu 16.04.1) 2017-01-29 19:58:53 +01:00
Adam Warner 55d39595e1 Merge pull request #1194 from pi-hole/fix/chronometer-summary
Fix chronometer interpreting summaryRaw
2017-01-29 18:35:51 +00:00
Mcat12 f8944177a0 Fix chronometer interpreting summaryRaw 2017-01-29 13:32:48 -05:00
Mcat12 3060c4d887 Merge pull request #1184 from pi-hole/fix/updater-debugging
Stay in repo directory until we error check
2017-01-29 12:02:55 -05:00
Mcat12 13ee5dc728 Merge pull request #1190 from pi-hole/tweak/gravity_showwildcards
Show number of wildcard blocked domains in gravity's summary
2017-01-29 11:57:47 -05:00
DL6ER 06873fe69e
Remove misplaced start of string expression. Fixes #1191 2017-01-29 13:54:39 +01:00
DL6ER a8ac212ee6
Show number of wildcard blocked domains in gravity's summary 2017-01-29 13:46:27 +01:00
Dan Schaper 99a4a80017
Spelling 2017-01-28 17:08:38 -08:00
Mcat12 033ba26041 Stay in repo directory until we error check 2017-01-28 20:00:02 -05:00
Mcat12 8cb4304c13 Merge pull request #1158 from pi-hole/development
[RELEASE] Pi-hole Core 2.12
2017-01-28 19:19:18 -05:00
DL6ER 0375a3caa3 Merge pull request #1178 from pi-hole/fix/validation
Use perl instead of grep for domain validation
2017-01-28 22:14:02 +01:00
DL6ER 08cddba200
There should be no echo here 2017-01-28 21:49:31 +01:00
DL6ER 1bf43b0425
Improved regex: Remove all leading points from domain (.....xyz => .xyz). Return not only a part, but fill validated domain 2017-01-28 21:48:19 +01:00
Dan Schaper dc63182647 Merge pull request #1180 from pi-hole/fix/web_install_css
Install blockingpage.css on new installation.
2017-01-28 10:40:31 -08:00
Dan Schaper 52e0aa11af
Have install create directory 2017-01-27 22:06:48 -08:00
Dan Schaper 1421c31179
`install` index and blockingpage assets. 2017-01-27 21:41:17 -08:00
Dan Schaper d5587e32d0
Populated directory test 2017-01-27 21:41:14 -08:00
Dan Schaper 28eb348707
Individual Page tests 2017-01-27 21:41:05 -08:00
Dan Schaper 91bcc18e6a
Make full path to directory for pihole web page. 2017-01-27 21:40:52 -08:00
Dan Schaper 5b43f13935
Fresh install web page directory tests 2017-01-27 20:24:20 -08:00
DL6ER 85b3fef08d
Use perl instead of grep? 2017-01-28 00:39:10 +01:00
DL6ER cc7c48237c Merge pull request #1177 from pi-hole/fix/validation
Fix CLI domain validation
2017-01-28 00:22:34 +01:00
DL6ER 15037fa888
Typo 2017-01-28 00:17:32 +01:00
DL6ER d595fef18f
Fix regex 2017-01-28 00:15:06 +01:00
Dan Schaper be5fa22b6f Merge pull request #1174 from pi-hole/tweak/logrotate_insecure_directory
Improve logrotate support
2017-01-27 11:18:06 -08:00
Dan Schaper a5c6bbeee7 Merge pull request #1173 from pi-hole/tweak/domainfilter
Improve CLI domain filter
2017-01-27 11:16:18 -08:00
DL6ER 094a645e60 Merge pull request #1176 from pi-hole/tweak/remove-pihole-s
remove pihole -s flag
2017-01-27 17:20:12 +01:00
Jacob Salmela 51acdfa633
remove pihole -s flag 2017-01-27 10:12:51 -06:00
DL6ER 2c16a75ef1
Use stat to get owner of /var/log 2017-01-27 14:28:59 +01:00
DL6ER 6fd7e0311c
Install customized version of logrotate script 2017-01-27 14:16:24 +01:00
DL6ER 1bcf2dd0fc
Tweak CLI domain filter 2017-01-27 00:45:57 +01:00
DL6ER 9a3cf949cf Merge pull request #1149 from pi-hole/tweak/firewall_warning
Add warning to firewall configuration
2017-01-27 00:03:41 +01:00
Dan Schaper cec214f900
User decline to install shouldn't be an error return. 2017-01-26 14:38:02 -08:00
Jacob Salmela dad669d68b Merge pull request #1172 from pi-hole/tweak/readme-youtube
Put new video into README
2017-01-25 21:30:12 -06:00
jacobsalmela 561f40d97e
replace youtube links with new explainer video 2017-01-25 20:19:06 -06:00
Dan Schaper 0bbe0aed83
Last of the IPTables tests, new test rig is operating. 2017-01-24 20:09:10 -08:00
Dan Schaper b16f797317
`firewall-cmd --state` returns 0 on 'running' non 0 on 'not running',
so check retval and not text returned.

FirewallD conversion to multicall

IPTables test
2017-01-24 19:57:31 -08:00
Dan Schaper 4bb71ae046
IPtables tests.
mock commands for iptables check.

Test setting IPTables ruleset.

Test setting IPTables ruleset.

Test for already configured IPTables rules.

Test for addition of iptables rules.

Can only mock so deep in the commands.
2017-01-24 13:42:51 -08:00
Dan Schaper 679b098aa7
No firewall enabled test. 2017-01-24 12:04:45 -08:00
Dan Schaper e0e88fdb52
Start IPTables test, get baseline for commands in the container. See
what we have to mock to start testing.
2017-01-24 11:58:22 -08:00
Dan Schaper 8bba3a257c
Merge branch 'tweak/firewall_tests' into tweak/firewall_warning 2017-01-24 11:51:41 -08:00
Dan Schaper 8529c1287f
Full test suite for firewallD configuration. 2017-01-24 11:03:37 -08:00
Dan Schaper 9c7f7756b4
Revert second test. 2017-01-23 19:03:00 -08:00