Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-30 18:13:18 +00:00
Code Issues Projects Releases Packages Wiki Activity
5840 commits 8 branches 109 tags 27 MiB
Commit graph

5840 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
DL6ER
e88f58c34e
Remove grpping for today's log entries, because we flush the log every day 2016-12-22 18:45:53 +01:00
Blayne Campbell
8f402f5c77 Merge pull request #1009 from bcambl/fix_1004 
replace 'git -C' with long version
 2016-12-22 11:44:08 -06:00
DL6ER
60054da582
Add lighttpd user (OS dependent) to sudoers file 2016-12-22 13:26:11 +01:00
DL6ER
4626b8ced5
Removed fixed username from sudoers file 2016-12-22 13:18:38 +01:00
Dan Schaper
ab7d193f98
Still causing problems with Fedora and CentOS 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-22 03:21:37 -08:00
bcambl
cbf84c1840 replace subshell with command chain 2016-12-22 04:32:42 -06:00
Dan Schaper
420fb69166 Merge pull request #1005 from pi-hole/fix/create_install_directories 
Create /opt/pihole before trying to install into it.
 2016-12-22 01:47:07 -08:00
bcambl
c9c28cb59a replace 'git -C' with long version 
The -C argument was introduced in git 1.8.4. CentOS 7.3 at the time of this commit provides v1.8.3.1.
see: https://git.kaarsemaker.net/git/commit/44e1e4d67d5148c245db362cc48c3cc6c2ec82ca/

Fixes #1004
 2016-12-22 03:37:34 -06:00
Dan Schaper
9073f34b30
Quiet DNF 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-22 00:44:10 -08:00
Dan Schaper
fb5578c0d4
Fedora dependency installer overhaul 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

Modify Fedora dependency installer

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

Fedora now installs and arrays only non-installed packages. Fedora also noops the cache update, since it updates at every dnf call anyays.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-22 00:29:04 -08:00
Dan Schaper
4244f716e0
Create /opt/pihole before trying to install into it. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-21 23:04:57 -08:00
Dan Schaper
07a4f970d4
Check for installation status within the parent function. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-21 22:57:42 -08:00
Dan Schaper
2335097c99
Find which packages already exist and only install new packages. Set up for unintall to know what packages we installed for later removal. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-21 22:20:23 -08:00
Adam Warner
bef0a2fef0 Merge pull request #987 from pi-hole/development 
Pi-Hole Core release v2.10
 2016-12-21 18:21:59 +00:00
DL6ER
c48e6c91f5 Merge pull request #999 from pi-hole/fix/install_deps_exit 
Fix/install deps exit
 2016-12-21 16:00:48 +01:00
DL6ER
f082b5ba54 Merge pull request #1001 from pi-hole/cleanup/remove_legacy_detect 
Remove v1 legacy detection code.
 2016-12-21 13:49:34 +01:00
DL6ER
8841bdd252
Reset the if's 2016-12-21 12:57:02 +01:00
DL6ER
58261098fb
We should not call a function that Dan deleted 2016-12-21 12:07:44 +01:00
DL6ER
9432d3035a
Merge branch 'development' into cleanup/remove_legacy_detect 
Conflicts:
	automated install/basic-install.sh
 2016-12-21 12:01:58 +01:00
DL6ER
9907fc2770
Merge branch 'development' into fix/install_deps_exit 
Conflicts:
	automated install/basic-install.sh
 2016-12-21 11:54:52 +01:00
DL6ER
d42caa8672 Merge pull request #1000 from pi-hole/fix/tab_space 
Tabs to spaces and formatting.
 2016-12-21 11:41:30 +01:00
Dan Schaper
8117ec8e20
Remove v1 legacy detection code. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-20 17:50:44 -08:00
Dan Schaper
ff2783f9fc
Tabs to spaces and formatting. 
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
 2016-12-20 17:22:57 -08:00
Dan Schaper
156a51c945
Remove extra display only variable. 
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
 2016-12-20 17:04:46 -08:00
Dan Schaper
c72ffae4a2
Don't install extra packages (openresolv was installed over resolvconf). No longer need --fix-missing. 
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
 2016-12-20 17:02:51 -08:00