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-15 10:43:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
2520 commits 8 branches 109 tags 27 MiB
Commit graph

590 commits

Author SHA1 Message Date
Dan Schaper
d5b88e0df8
Get the right name for the options. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-10 11:07:58 -08:00
Dan Schaper
20fd61468d
Require branch to check out 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-10 11:04:37 -08:00
Dan Schaper
0a0d25dff4
Script runs in subshell, no need to cd back to pwd. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-10 10:57:46 -08:00
DL6ER
2b3afbfef8 Merge pull request #1310 from pi-hole/new/piholecheckout 
Pi-hole checkout feature
 2017-03-09 00:43:35 +01:00
DL6ER
81a1057cac
Fix something Dan has overlooked 2017-03-09 00:30:36 +01:00
DL6ER
fd310c6445
Back to how we had it before, because --unshallow does not work at all 2017-03-09 00:28:02 +01:00
Dan Schaper
a9b52518bf
Shift numbers for argument identifiers, functions are called after shift 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-08 14:29:51 -08:00
Dan Schaper
87da40068c
Always exited with value 1, now exits with proper value. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-08 14:18:08 -08:00
Dan Schaper
b8f1eadb7f
Shift off checkout from being passed to script from pihole 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-08 14:17:56 -08:00
Dan Schaper
b522d8eaf6
Source and reuse existing variables, centralize code. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-08 13:41:11 -08:00
Dan Schaper
89ff99322d
Don't need to remember pwd inside a function, calling function doesn't change directories. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-08 13:30:08 -08:00
Dan Schaper
56e17d1010
Source functions and variables from basic-install.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-08 13:28:24 -08:00
DL6ER
d2ab0694b7
Add "master" shortcut 2017-03-08 13:18:34 +01:00
DL6ER
8a14a63d5d
Pi-hole checkout feature 2017-03-08 13:16:40 +01:00
DL6ER
8235b18854
Remove duplicated line 2017-03-08 12:09:34 +01:00
DL6ER
e0e9ebbe74 Merge pull request #1307 from pi-hole/fix/versionwithoutwebinterface 
Don't try to obtain version of web interface it it is not installed
 2017-03-07 23:54:32 +01:00
DL6ER
10bc8414b9
Move FTL querying before clearing the terminal to avoid flashing on Pi B+ 2017-03-07 18:10:05 +01:00
DL6ER
4e25e0dc5c
Add missing } to JSON output 2017-03-07 17:57:57 +01:00
DL6ER
b1a9793d94
Let Chronometer query all data from FTL (no need for having the API). Fixes #1305 2017-03-07 17:54:11 +01:00
DL6ER
6dea00668e
Don't try to obtain version of web interface it it is not installed. Fixes #1303 2017-03-07 13:08:01 +01:00
DL6ER
ae9182c92e Merge pull request #1301 from pi-hole/fix/removewildcard 
Remove wildcard entry when adding the very same domain either the white- or blacklist
 2017-03-06 23:53:06 +01:00
DL6ER
cf31561267
Remove wildcard entry when adding the very same domain either the white- or blacklist 2017-03-06 16:25:35 +01:00
DL6ER
a97f0b1298 Merge pull request #1300 from pi-hole/fix/deletehostrecord 
Bugfix for when deleting host-record
 2017-03-06 16:16:42 +01:00
Dan Schaper
d1e0f3ae18 Merge pull request #1294 from pi-hole/tweak/debugDNS 
Tweak DNS debugging
 2017-03-06 05:50:37 -08:00
DL6ER
47a6786e8f
Use proper test syntax 2017-03-06 14:02:56 +01:00
DL6ER
a69fcbb91e
Bugfix for when deleting host-record 2017-03-06 13:44:13 +01:00
Dan Schaper
8e2b51b391 Merge pull request #1296 from pi-hole/fix/debugVersion 
Debug version detection improvements
 2017-03-05 07:13:41 -08:00
Dan Schaper
560af43204 Merge pull request #1293 from pi-hole/fix/version 
Account for hash in versioning
 2017-03-05 07:10:18 -08:00
DL6ER
baefec86f2
Add CLI teleporter feature 2017-03-05 14:08:44 +01:00
Dan Schaper
512c650441
Shellchecking. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-04 19:07:55 -08:00
Dan Schaper
dc44fc9e27
Version check amalgamation and removal of && || logic. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-04 17:54:38 -08:00
Dan Schaper
6f2fb57c08
Protocol specific records checks. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-04 15:16:33 -08:00
Dan Schaper
2547cc4c8d
Only run IPv6 if enabled, split out Chaos TXT checks. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-04 15:06:34 -08:00
DL6ER
9f4ef66f41
Add IPv6 resolver test 2017-03-04 22:38:52 +01:00
DL6ER
086f0790fc
Add Google's IPv6 address for potential IPv6 resolver tests 2017-03-04 22:31:18 +01:00
Dan Schaper
709b44f736
IPv4 DNS tests 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-04 12:16:43 -08:00
Dan Schaper
6cd4ff6d68
Organize functions and function calls. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-04 12:16:32 -08:00
Dan Schaper
abd3e828de
Optimize normalOutput 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-04 07:46:00 -08:00
DL6ER
b85af50d14
Generate only the information that is actually asked for 2017-03-04 14:08:11 +01:00
Dan Schaper
0e8fd49669
Function... 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-03 23:30:57 -08:00
Dan Schaper
945e22874e
Collapse duplicate functions, and take out argument loops. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-03 23:12:28 -08:00
Dan Schaper
77ab47a984
Awk for perl 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-03 22:34:55 -08:00
Dan Schaper
ed8088f203
Functions for Core/Web version and hash. And only check first argument in each section. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-03 22:10:32 -08:00
Dan Schaper
8831b22fc8
Prototype function for getting version of local repo 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-03 21:36:38 -08:00
Dan Schaper
0341bd1758
Optimize code, undoc flag for current hash. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-03 20:32:26 -08:00
Dan Schaper
9bb4a5fb25
Factor out variables from display. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-03 20:16:53 -08:00
Dan Schaper
ebfffea5dc
Always show something, even if it's just the short hash of the latest commit. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-03 20:04:55 -08:00
Dan Schaper
81939ab265
Get short hash of local and remote 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-03 19:14:30 -08:00
DL6ER
f2fe84c9d3 Merge pull request #1292 from pi-hole/master 
Merge patches back into devel
 2017-03-03 23:45:29 +01:00
DL6ER
dd971b6ee5
Default behavior is old behavir (listen on gravity interface (e.g. eth0), permit all origins) 2017-03-03 22:58:41 +01:00
DL6ER
f1b8abf503 Merge pull request #1146 from pi-hole/tweak/chronometer_recentlyblocked 
[FTL] Show most recently blocked domain in chronometer
 2017-03-03 12:20:43 +01:00
DL6ER
66b7d04b82
Merge branch 'development' into new/FTL-binary 2017-03-01 12:42:48 +01:00
DL6ER
7ba47f504c
Add special "except-interface" line in case of listening on all interfaces 2017-03-01 12:15:04 +01:00
DL6ER
0be1717ff4
Fix config error 2017-03-01 11:46:48 +01:00
DL6ER
189a4e0078
Add option to skip restarting of dnsmasq 2017-03-01 11:26:06 +01:00
DL6ER
3adf8785d8
Move "all" down in help text to not suggest that it is the default 2017-03-01 11:07:05 +01:00
DL6ER
b74862bfc5
Actually apply new setting by restarting dnsmasq 2017-03-01 11:02:08 +01:00
DL6ER
01273124ea
Change to -i, interface 2017-03-01 10:59:55 +01:00
DL6ER
721ada7e16
Fix typo 2017-03-01 10:52:21 +01:00
DL6ER
bd9dc91396
Add response for users manually setting this up via CLI 2017-03-01 10:50:13 +01:00
DL6ER
de6c43a8d3
Setup interface listening behavior of dnsmasq 2017-03-01 10:46:20 +01:00
Dan Schaper
83b0600863
Carriage return or newline based webcalls. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-02-27 11:03:57 -08:00
Dan Schaper
6c130b7960
Vebiage and highligh the token, also ::: 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-02-27 10:27:11 -08:00
Dan Schaper
7244d44a1d
Notify user that log is being uploaded. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-02-27 10:02:00 -08:00
Dan Schaper
9b060aab34
Debug auto mode engaged 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-02-26 18:22:06 -08:00
DL6ER
ce6c465942 Merge pull request #1266 from pi-hole/new/host-record 
Add host-record option
 2017-02-23 17:32:10 +01:00
Jacob Salmela
7a1a2dec67
update license to EUPL on core files 2017-02-22 11:55:20 -06:00
DL6ER
7ed1bbad49
Add host-record option 2017-02-22 14:43:07 +01:00
DL6ER
078cc7660e
Improved updater logic 2017-02-22 11:00:45 +01:00
DL6ER
af2893d2ce
Updater implementation for FTL 2017-02-22 10:43:13 +01:00
DL6ER
a64211123f
Some debug additions 2017-02-21 16:46:54 +01:00
Dan Schaper
053b38e0bd
Set up for IP matching in detection. 2017-02-16 19:45:44 -08:00
Dan Schaper
2aa3a109a0
Ping gateways and Internet. 2017-02-16 18:38:05 -08:00
Dan Schaper
472708376d
Split out IP checks. 2017-02-16 18:30:15 -08:00
Dan Schaper
cfed3d59e9
Begin fixing IP detection functions. 2017-02-16 16:49:14 -08:00
DL6ER
af8e629df4 Merge pull request #1239 from pi-hole/tweak/debug48h 
Change description as we want to save the debug log for 48h instead of only 24h
 2017-02-10 20:46:12 +01:00
DL6ER
01f980d49c
Change description as we want to save the debug log for 48h instead of only 24h 2017-02-10 17:45:20 +01:00
DL6ER
99fab7e52a
Scan whole dnsmasq.d directory for cofigurations files 2017-02-10 17:42:37 +01:00
Mcat12
ba67144e34 Merge branch 'development' into adminPageAsOption 2017-02-09 16:27:07 -05:00
DL6ER
7785dac50e Merge pull request #1228 from r0ckarong/development 
Justify and improve help texts, add missing wildcard description
 2017-02-08 14:05:53 +01:00
Markus Napp
01f643e5eb fixup! Fix spacing for wildcard help in list script 2017-02-08 12:56:28 +01:00
Markus Napp
8037f3e332 Fix spacing for wildcard help in list script 2017-02-08 12:55:14 +01:00
Markus Napp
afe5176e01 Justify help output to match main script 2017-02-08 12:41:53 +01:00
Mcat12
a48317883d Fix indentation 2017-02-07 18:14:41 -05:00
Promofaux
4fcf8fd23f Merge in development branch - resolve conflict in update.sh 2017-02-05 19:39:02 +00:00
Promofaux
10a30344e5 No need to source setupVars, as basic-install.sh is sourced, which sources setupVars itself. Sourception. 2017-02-05 19:29:56 +00:00
Promofaux
b764d17c64 comment 2017-02-05 19:18:27 +00:00
Promofaux
ba0abdb88d wrap update logic in admin_installed bool check 2017-02-05 19:12:09 +00:00
Promofaux
1428b58dde source setupVars and only check admin repo if it is enabled 2017-02-05 19:07:04 +00:00
Mcat12
18eb8a2159 Merge pull request #1185 from pi-hole/cleanup/git_functions 
Move git functions to one script
 2017-01-31 19:05:53 -05:00
DL6ER
3239c7023a Merge pull request #1170 from pi-hole/new/DHCPstaticleases 
Backend changes for static DHCP leases
 2017-01-31 21:07:36 +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
Mcat12
f8944177a0 Fix chronometer interpreting summaryRaw 2017-01-29 13:32:48 -05:00
DL6ER
06873fe69e
Remove misplaced start of string expression. Fixes #1191 2017-01-29 13:54:39 +01:00
Dan Schaper
3d9d13222b
Use constants for leading paths. 2017-01-28 17:42:55 -08:00
Dan Schaper
745adabb05
Path to source basic-install.sh 2017-01-28 17:38:14 -08:00
Dan Schaper
3861b57dc6
Start moving reused utility functions to one script. 2017-01-28 17:32:42 -08: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
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
DL6ER
85b3fef08d
Use perl instead of grep? 2017-01-28 00:39:10 +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
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
dad18dc5de
Changed keywords 2017-01-25 10:35:45 +01:00
DL6ER
5c95c4074b
Remove static leases from DHCP static leases file 2017-01-25 10:35:03 +01:00
DL6ER
4301b9a12a
Add static DHCP leases to new file 2017-01-25 10:33:25 +01:00
DL6ER
6a89c6bf3b
Silence rm warning if no DHCP server is used 2017-01-23 15:06:36 +01:00
Promofaux
fe8c365d17 codacy never lies 2017-01-22 20:53:30 +00:00
Promofaux
9acc3aac01 pipe du -h output to awk to ensure we only get the file size, and not the filename too. Yeah that's right Dom, pipe. 2017-01-22 20:44:07 +00:00
Promofaux
1ad23a065e switch out wc -l with grep -c ^ 2017-01-22 20:38:46 +00:00
Promofaux
de102fde5c Add line count and size check for pihole.log 2017-01-22 20:38:09 +00:00
DL6ER
8bb9dd460b
Be able to disable the DHCP domain name 2017-01-18 12:22:03 +01:00
Mcat12
58f3ff69d8 Align comment with referenced line 2017-01-16 18:51:13 -05:00
DL6ER
72d8d10e64
Show most recently blocked domain in chronometer (using FTL). Fixes #717 2017-01-16 22:39:58 +01:00
Mcat12
63d02df0bc Merge pull request #1130 from pi-hole/new/logrotate 
Use logrotate for pihole.log
 2017-01-16 15:11:11 -05:00
DL6ER
08f08fea61 Merge pull request #1135 from pi-hole/new/multipleDNSservers 
Allow multiple DNS servers
 2017-01-13 23:48:38 +01:00
DL6ER
1ed2a8637f
Removed debug echo's 2017-01-13 23:39:57 +01:00
Mcat12
d196c13f2c Merge pull request #1131 from pi-hole/chronometerJsonUnixTools 
No excuse for chronometer not to match API
 2017-01-13 16:34:51 -05:00
DL6ER
bd1c5a42e8
Allow multiple DNS servers 2017-01-13 17:49:55 +01:00
DL6ER
845d8c0e63
Ensure LC_NUMERIC=C is set when evaluating floating point number (non-English systems might expect "," as decimal separator 2017-01-13 12:59:49 +01:00
Promofaux
b4c32e47c6 Missed one! 2017-01-12 22:07:07 +00:00
Promofaux
248d8680f7 actual codacy complaints 2017-01-12 21:51:10 +00:00
Promofaux
1bda965a7c Codacy complaints 2017-01-12 21:50:16 +00:00
Promofaux
2ee305769d Replace all calculations with values read directly web admin API. Parse JSON using native unix tools, no additional requirements needed. 2017-01-12 21:23:58 +00:00
DL6ER
3a8a936575
Corrected path 2017-01-12 21:01:52 +01:00
DL6ER
3fd2ffd466
Add logrotate for pihole.log 2017-01-12 20:39:25 +01:00
DL6ER
b56ca2b834
Add DNSSEC support to Pi-hole core 2017-01-12 16:02:41 +01:00
DL6ER
a263936243
Merge branch 'development' into wildcardblacklisting 2017-01-11 18:25:51 +01:00
DL6ER
2935275227
Merge branch 'development' into wildcardblacklisting 2017-01-09 14:53:01 +01:00
DL6ER
74a4e62cc9
Codacy fix 2017-01-08 11:26:56 +01:00
DL6ER
63a414a544
Align outputs 2017-01-08 11:21:50 +01:00
DL6ER
7d1f5091a7
Fixed small typo 2017-01-08 11:21:10 +01:00
DL6ER
3b54cab3bc
Show branches and revisions (incl. possible dirty state) in debug log 2017-01-08 11:17:25 +01:00
DL6ER
d9e949b27c Merge pull request #1096 from pi-hole/fix/updater 
Fix updater failing on non-English systems
 2017-01-06 23:36:42 +01:00
DL6ER
168397e90d
Fixed typo in webpage.sh 2017-01-05 21:45:06 +01:00
DL6ER
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
 2017-01-05 13:10:19 +01:00
DL6ER
200995bf29
Make IPv6 features of Pi-hole DHCP server switchable 2017-01-03 14:24:33 +01:00
DL6ER
3a90c1c192
Source setupVars.conf before trying to access variables 2017-01-03 13:34:01 +01:00
Adam Warner
12bec1df68 Merge pull request #1048 from pi-hole/tweak/simplify_webpage.sh 
Major simplification of webpage.sh + extend DHCP to IPv6
 2017-01-02 14:28:26 +00:00
DL6ER
ad61852804
Test against empty string 2017-01-02 11:10:38 +01:00
DL6ER
dbd8aee4ee
Add 'local' domain if not set in setupVers.conf 2017-01-02 11:08:54 +01:00
DL6ER
677694b01a
Set 24h lease time if settings was empty before 2017-01-02 11:05:40 +01:00
DL6ER
85f0241c0d
Reprocess DHCP settings after update 2017-01-02 10:50:59 +01:00
DL6ER
ebf0db4bbf Typo fixed 2016-12-31 17:17:46 +00:00
DL6ER
9ac265980f Add .conf to filename 2016-12-31 13:41:19 +00:00