Adam Warner
bfe5506cc1
Merge pull request #1021 from pi-hole/development
...
[RELEASE] Pi-Hole Core 2.10.1
2016-12-23 21:57:02 +00:00
Dan Schaper
b64066fec7
Merge conflict
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-23 13:23:09 -08:00
Mcat12
ffd31d8330
Merge pull request #1031 from pi-hole/templates
...
replace 1-10 checkboxes to tidy up appearance
2016-12-23 16:06:29 -05:00
Promofaux
d89254fedf
replace 1-10 checkboxes to tidy up appearance
2016-12-23 19:49:39 +00:00
Mcat12
a771ddf667
Merge pull request #1030 from pi-hole/readmeTypos
...
Accidentally a word.
2016-12-23 14:43:56 -05:00
Promofaux
ce2e410468
Accidentally a word.
...
Updated link
2016-12-23 19:39:37 +00:00
Adam Warner
c1982c04ff
Merge pull request #1029 from pi-hole/bogusDNS_BOGUS_PRIVentries
...
remove `DNS_BOGUS_PRIV` from setupVars.conf
2016-12-23 19:32:13 +00:00
Promofaux
9a62026830
remove DNS_BOGUS_PRIV from setupVars.conf
2016-12-23 19:27:02 +00:00
Adam Warner
d12efccd0b
Merge pull request #1028 from pi-hole/bcambl-selinux_notification
...
Bcambl selinux notification
2016-12-23 17:36:33 +00:00
Mcat12
54afffed19
Remove newline
...
Issue was already fixed
2016-12-23 12:30:33 -05:00
Mcat12
fc8fcdbece
Add newline
2016-12-23 12:28:18 -05:00
Promofaux
abd1fedc9d
.
2016-12-23 17:25:55 +00:00
Promofaux
9725985037
printf to echo. idgaf
2016-12-23 17:24:33 +00:00
Promofaux
754f3359ec
too many echos spoil the branch
2016-12-23 17:22:31 +00:00
Promofaux
4c131b8c28
newlines
2016-12-23 17:21:23 +00:00
Promofaux
15c674ba29
verbosity
2016-12-23 17:20:33 +00:00
Promofaux
00aff6a906
maybe
2016-12-23 17:16:03 +00:00
Promofaux
c45c3a72b5
words words words
2016-12-23 17:06:33 +00:00
Promofaux
662d450651
adjust size of whiptail dialog
2016-12-23 16:58:58 +00:00
Promofaux
a8897becd2
Make sure whiptail is installed...
2016-12-23 16:55:56 +00:00
Mcat12
d0126f4454
Merge pull request #1027 from pi-hole/Mcat12/fix/alignUpdatingRepo
...
Align installer output for updating repo
2016-12-23 11:54:34 -05:00
Promofaux
fdb64a5702
untested convert user prompt to whiptail
2016-12-23 16:53:42 +00:00
Mcat12
73a80ff7dc
Align installer output for updating repo
2016-12-23 11:51:34 -05:00
Promofaux
a795fd698d
Merge branch 'selinux_notification' of https://github.com/bcambl/pi-hole into bcambl-selinux_notification
2016-12-23 16:48:16 +00:00
bcambl
2fb0dc0a4a
add warning if SELinux is Enforcing
2016-12-23 10:27:52 -06:00
DL6ER
5b4653cf39
Merge pull request #1023 from pi-hole/fix/fedora_sudo
...
Fix Fedora sudo permissions
2016-12-23 17:13:57 +01:00
DL6ER
aa8e1497a3
Fixed error
2016-12-23 17:12:38 +01:00
DL6ER
eb13d846ef
Merge pull request #1024 from pi-hole/fix/grep_case_insensitive
...
Make grep case insensitive
2016-12-23 17:07:08 +01:00
DL6ER
c674a175ee
Make grep case insensitive
2016-12-23 17:02:56 +01:00
DL6ER
afabf30ec6
Fix Fedora web UI support
2016-12-23 16:57:51 +01:00
DL6ER
420158494d
Merge pull request #1022 from pi-hole/fix/adlists.default
...
Internal (/etc/pihole/adlists.default)
2016-12-23 16:08:06 +01:00
DL6ER
6b7b0e0eb3
Test if /etc/pihole/adlists.default exists
2016-12-23 16:00:48 +01:00
Adam Warner
ad70db7e0e
Merge pull request #1020 from bcambl/setDNS_before_ifcfg
...
Set dns before ifcfg (Fixes #1019 )
2016-12-23 12:12:05 +00:00
Adam Warner
ef1ce66793
Merge pull request #1013 from pi-hole/fix/chronometer
...
Fix chronometer.sh
2016-12-23 11:12:20 +00:00
DL6ER
c364fd80b6
Merge pull request #994 from pi-hole/errorsshouldnotescapeblackholes
...
Errors should not escape black holes
2016-12-23 12:05:54 +01:00
Adam Warner
3bc5d1bae0
Merge pull request #989 from pi-hole/APIresolveclientsandupstream
...
Implement backend for AdminLTE/#253
2016-12-23 10:37:48 +00:00
Adam Warner
e4e34acba1
Merge pull request #1017 from bcambl/ensure_repo_directory
...
is_repo: ensure directory exists
2016-12-23 09:44:19 +00:00
Adam Warner
ff3c36a7a2
Merge pull request #1018 from pi-hole/diginc-patch-1
...
pihole.cron reduce duplication
2016-12-23 09:41:48 +00:00
bcambl
1e7e3259b5
choose dns servers prior to interface configuration
...
upstream DNS servers must be chosen prior interface configuration.
Fixes #1019
2016-12-22 22:42:32 -06:00
Adam Hill
5e53f484be
Update pihole.cron
...
Stop repeating the path.
2016-12-22 22:00:17 -06:00
bcambl
513bc32d87
is_repo: ensure directory exists
2016-12-22 20:00:45 -06:00
Dan Schaper
e7c944ff0b
Merge branches 'development' and 'feature/track_pre-installed_packages' of github.com:pi-hole/pi-hole into feature/track_pre-installed_packages
2016-12-22 12:25:07 -08:00
Dan Schaper
9355a8ad0e
Merge pull request #1011 from pi-hole/fix/sudoers
...
Fix: Dynamic instead of static sudoers file
2016-12-22 12:20:01 -08:00
Dan Schaper
a74e48a138
Merge pull request #1014 from pi-hole/fix/Gravity_in_shell
...
Execute gravity in same shell as installer, don't subshell it.
2016-12-22 12:07:12 -08:00
Dan Schaper
ea5ee7b0f9
Execute gravity in same shell as installer, don't subshell it.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-22 11:30:36 -08:00
DL6ER
bc8cf1b2d8
Fixed wrong indentation
2016-12-22 19:23:06 +01:00
DL6ER
bb28d94884
Merge branch 'development' into customblockpage
...
Conflicts:
automated install/basic-install.sh
2016-12-22 19:22:09 +01:00
DL6ER
a4f58b0a22
Look for "query[" instead of "query" to avoid false-positives, like listed below
...
root@raspberrypi:/etc/.pihole# grep 'query' /var/log/pihole.log | grep -v 'query\['
Dec 22 16:29:50 dnsmasq[30801]: forwarded code.jquery.com to 208.67.222.222
Dec 22 16:29:50 dnsmasq[30801]: reply code.jquery.com is <CNAME>
Dec 22 16:29:50 dnsmasq[30801]: reply code.jquery.netdna-cdn.com is 94.31.29.54
Dec 22 16:29:50 dnsmasq[30801]: reply code.jquery.netdna-cdn.com is 23.111.11.3
Dec 22 16:29:50 dnsmasq[30801]: reply code.jquery.netdna-cdn.com is 198.232.125.113
2016-12-22 19:09:37 +01:00
DL6ER
bcf8139708
Removed cat where we don't need it
2016-12-22 18:55:14 +01:00
DL6ER
9b0390c9da
Space to Tab
2016-12-22 18:53:44 +01:00
