arno
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole
1
0
Fork 0
Code Issues Releases Wiki Activity
2850 Commits
7 Branches
109 Tags
37 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '6ca47dc3b3'
${ noResults }
Commit Graph

668 Commits (6ca47dc3b360a8566d0c505d0c4cf23ed0017d61)

Author SHA1 Message Date
Patrick O'Brien 94f15f1b3c Merge remote-tracking branch 'upstream/development' into development
8 years ago
Patrick O'Brien ee296f36c1 mask password input on command line
8 years ago
Mcat12 fb3e6ee35c Source setupVars before attempting to use it
8 years ago
Dan Schaper 2740c68a63 Merge pull request #1335 from pi-hole/tweak/debug_templog
8 years ago
Dan Schaper b1f769b671
Output cleaning, IP stack check headers.
8 years ago
Dan Schaper 77378da70a
Cat out temp files to final log.
8 years ago
Dan Schaper 160030b75f
Quiet systemctl output to just the current daemon status.
8 years ago
Dan Schaper 0a0c3a2fb7
Copy working temp to final location.
8 years ago
Dan Schaper e9f1ca338f
Create temp files for working storage, log to working storage temps.
8 years ago
Adam Warner cfaf1ac67c
add check on file_parse to not include WEBPASSWORD= in the debug log
8 years ago
Adam Warner 6b862dd9e9 Only remove from wildcard list if domain is being added to whitelist or blacklist
8 years ago
Markus Napp bb7a7d94ef Replace misleading letter variable
8 years ago
Markus Napp 9a475cc010 Rewrite help text for better handling of params
8 years ago
Markus Napp ae30c285a2 Fix handling of wildcard help text
8 years ago
Dan Schaper 2e74219ff9 Merge pull request #1313 from pi-hole/new/piholecheckout
8 years ago
Dan Schaper b0ae954f1e
Only update when `update` flag is set to "true"
8 years ago
Dan Schaper a2404f104a
Just some style and linting. And a `cd` in `fetch_checkout_pull_branch`
8 years ago
DL6ER 38547ced7a
Can only diff once upstream branch is tracked
8 years ago
DL6ER 9a9d9007cd
Add missing "== true"
8 years ago
DL6ER bd2d81f691
source setupVars.conf to see if INSTALL_WEB is true or not
8 years ago
DL6ER 1b9e7fbf2e
Test if branch is locally available is not reliable because of possible ambiguities
8 years ago
DL6ER d4a49d192f
Correct variable name
8 years ago
DL6ER 8cb66544d2
Remove "\ "
8 years ago
DL6ER 140ac192aa
The web repo might actually be missing and this is n error (not installed because the user didn't want it)
8 years ago
DL6ER b961b13d60
Small bugfix
8 years ago
DL6ER febdb4a190
Use git diff to determine if code has changed (no need to run the installer if it hasn't changed at all)
8 years ago
DL6ER 1d60b62e7a
Testing alternative way of fetching/checking out of a single branch
8 years ago
Dan Schaper 41e1e4cb68
Rearrange pull logic, some optimization.
8 years ago
Dan Schaper d5b88e0df8
Get the right name for the options.
8 years ago
Dan Schaper 20fd61468d
Require branch to check out
8 years ago
Dan Schaper 0a0d25dff4
Script runs in subshell, no need to cd back to pwd.
8 years ago
DL6ER 2b3afbfef8 Merge pull request #1310 from pi-hole/new/piholecheckout
8 years ago
DL6ER 81a1057cac
Fix something Dan has overlooked
8 years ago
DL6ER fd310c6445
Back to how we had it before, because --unshallow does not work at all
8 years ago
Dan Schaper a9b52518bf
Shift numbers for argument identifiers, functions are called after `shift`
8 years ago
Dan Schaper 87da40068c
Always `exit`ed with value 1, now exits with proper value.
8 years ago
Dan Schaper b8f1eadb7f
Shift off `checkout` from being passed to script from `pihole`
8 years ago
Dan Schaper b522d8eaf6
Source and reuse existing variables, centralize code.
8 years ago
Dan Schaper 89ff99322d
Don't need to remember `pwd` inside a function, calling function doesn't change directories.
8 years ago
Dan Schaper 56e17d1010
Source functions and variables from basic-install.sh
8 years ago
DL6ER d2ab0694b7
Add "master" shortcut
8 years ago
DL6ER 8a14a63d5d
Pi-hole checkout feature
8 years ago
DL6ER 8235b18854
Remove duplicated line
8 years ago
DL6ER e0e9ebbe74 Merge pull request #1307 from pi-hole/fix/versionwithoutwebinterface
8 years ago
DL6ER 10bc8414b9
Move FTL querying before clearing the terminal to avoid flashing on Pi B+
8 years ago
DL6ER 4e25e0dc5c
Add missing } to JSON output
8 years ago
DL6ER b1a9793d94
Let Chronometer query all data from FTL (no need for having the API). Fixes #1305
8 years ago
DL6ER 6dea00668e
Don't try to obtain version of web interface it it is not installed. Fixes #1303
8 years ago
DL6ER ae9182c92e Merge pull request #1301 from pi-hole/fix/removewildcard
8 years ago
DL6ER cf31561267
Remove wildcard entry when adding the very same domain either the white- or blacklist
8 years ago
DL6ER a97f0b1298 Merge pull request #1300 from pi-hole/fix/deletehostrecord
8 years ago
Dan Schaper d1e0f3ae18 Merge pull request #1294 from pi-hole/tweak/debugDNS
8 years ago
DL6ER 47a6786e8f
Use proper test syntax
8 years ago
DL6ER a69fcbb91e
Bugfix for when deleting host-record
8 years ago
Dan Schaper 8e2b51b391 Merge pull request #1296 from pi-hole/fix/debugVersion
8 years ago
Dan Schaper 560af43204 Merge pull request #1293 from pi-hole/fix/version
8 years ago
DL6ER baefec86f2
Add CLI teleporter feature
8 years ago
Dan Schaper 512c650441
Shellchecking.
8 years ago
Dan Schaper dc44fc9e27
Version check amalgamation and removal of && || logic.
8 years ago
Dan Schaper 6f2fb57c08
Protocol specific records checks.
8 years ago
Dan Schaper 2547cc4c8d
Only run IPv6 if enabled, split out Chaos TXT checks.
8 years ago
DL6ER 9f4ef66f41
Add IPv6 resolver test
8 years ago
DL6ER 086f0790fc
Add Google's IPv6 address for potential IPv6 resolver tests
8 years ago
Dan Schaper 709b44f736
IPv4 DNS tests
8 years ago
Dan Schaper 6cd4ff6d68
Organize functions and function calls.
8 years ago
Dan Schaper abd3e828de
Optimize normalOutput
8 years ago
DL6ER b85af50d14
Generate only the information that is actually asked for
8 years ago
Dan Schaper 0e8fd49669
Function...
8 years ago
Dan Schaper 945e22874e
Collapse duplicate functions, and take out argument loops.
8 years ago
Dan Schaper 77ab47a984
Awk for perl
8 years ago
Dan Schaper ed8088f203
Functions for Core/Web version and hash. And only check first argument in each section.
8 years ago
Dan Schaper 8831b22fc8
Prototype function for getting version of local repo
8 years ago
Dan Schaper 0341bd1758
Optimize code, undoc flag for current hash.
8 years ago
Dan Schaper 9bb4a5fb25
Factor out variables from display.
8 years ago
Dan Schaper ebfffea5dc
Always show something, even if it's just the short hash of the latest commit.
8 years ago
Dan Schaper 81939ab265
Get short hash of local and remote
8 years ago
DL6ER f2fe84c9d3 Merge pull request #1292 from pi-hole/master
8 years ago
DL6ER dd971b6ee5
Default behavior is old behavir (listen on gravity interface (e.g. eth0), permit all origins)
8 years ago
DL6ER f1b8abf503 Merge pull request #1146 from pi-hole/tweak/chronometer_recentlyblocked
8 years ago
DL6ER 66b7d04b82
Merge branch 'development' into new/FTL-binary
8 years ago
DL6ER 7ba47f504c
Add special "except-interface" line in case of listening on all interfaces
8 years ago
DL6ER 0be1717ff4
Fix config error
8 years ago
DL6ER 189a4e0078
Add option to skip restarting of dnsmasq
8 years ago
DL6ER 3adf8785d8
Move "all" down in help text to not suggest that it is the default
8 years ago
DL6ER b74862bfc5
Actually apply new setting by restarting dnsmasq
8 years ago
DL6ER 01273124ea
Change to -i, interface
8 years ago
DL6ER 721ada7e16
Fix typo
8 years ago
DL6ER bd9dc91396
Add response for users manually setting this up via CLI
8 years ago
DL6ER de6c43a8d3
Setup interface listening behavior of dnsmasq
8 years ago
Dan Schaper 83b0600863
Carriage return or newline based webcalls.
8 years ago
Dan Schaper 6c130b7960
Vebiage and highligh the token, also `:::`
8 years ago
Dan Schaper 7244d44a1d
Notify user that log is being uploaded.
8 years ago
Dan Schaper 9b060aab34
Debug auto mode engaged
8 years ago
DL6ER ce6c465942 Merge pull request #1266 from pi-hole/new/host-record
8 years ago
Jacob Salmela 7a1a2dec67
update license to EUPL on core files
8 years ago
DL6ER 7ed1bbad49
Add host-record option
8 years ago
DL6ER 078cc7660e
Improved updater logic
8 years ago
DL6ER af2893d2ce
Updater implementation for FTL
8 years ago
DL6ER a64211123f
Some debug additions
8 years ago
Dan Schaper 053b38e0bd
Set up for IP matching in detection.
8 years ago
Dan Schaper 2aa3a109a0
Ping gateways and Internet.
8 years ago
Dan Schaper 472708376d
Split out IP checks.
8 years ago
Dan Schaper cfed3d59e9
Begin fixing IP detection functions.
8 years ago
DL6ER af8e629df4 Merge pull request #1239 from pi-hole/tweak/debug48h
8 years ago
DL6ER 01f980d49c
Change description as we want to save the debug log for 48h instead of only 24h
8 years ago
DL6ER 99fab7e52a
Scan whole dnsmasq.d directory for cofigurations files
8 years ago
Mcat12 ba67144e34 Merge branch 'development' into adminPageAsOption
8 years ago
DL6ER 7785dac50e Merge pull request #1228 from r0ckarong/development
8 years ago
Markus Napp 01f643e5eb fixup! Fix spacing for wildcard help in list script
8 years ago
Markus Napp 8037f3e332 Fix spacing for wildcard help in list script
8 years ago
Markus Napp afe5176e01 Justify help output to match main script
8 years ago
Mcat12 a48317883d Fix indentation
8 years ago
Promofaux 4fcf8fd23f Merge in `development` branch - resolve conflict in update.sh
8 years ago
Promofaux 10a30344e5 No need to source setupVars, as basic-install.sh is sourced, which sources setupVars itself. Sourception.
8 years ago
Promofaux b764d17c64 comment
8 years ago
Promofaux ba0abdb88d wrap update logic in admin_installed bool check
8 years ago
Promofaux 1428b58dde source setupVars and only check admin repo if it is enabled
8 years ago
Mcat12 18eb8a2159 Merge pull request #1185 from pi-hole/cleanup/git_functions
8 years ago
DL6ER 3239c7023a Merge pull request #1170 from pi-hole/new/DHCPstaticleases
8 years ago
DL6ER 3d4516dc95
Improve regex
8 years ago
DL6ER 509c864cc3
Merge branch 'development' into fix/regex
8 years ago
Mcat12 f8944177a0 Fix chronometer interpreting summaryRaw
8 years ago
DL6ER 06873fe69e
Remove misplaced start of string expression. Fixes #1191
8 years ago
Dan Schaper 3d9d13222b
Use constants for leading paths.
8 years ago
Dan Schaper 745adabb05
Path to source basic-install.sh
8 years ago
Dan Schaper 3861b57dc6
Start moving reused utility functions to one script.
8 years ago
Dan Schaper 99a4a80017
Spelling
8 years ago
Mcat12 033ba26041 Stay in repo directory until we error check
8 years ago
DL6ER 08cddba200
There should be no echo here
8 years ago
DL6ER 1bf43b0425
Improved regex: Remove all leading points from domain (.....xyz => .xyz). Return not only a part, but fill validated domain
8 years ago
DL6ER 85b3fef08d
Use perl instead of grep?
8 years ago
DL6ER 15037fa888
Typo
8 years ago
DL6ER d595fef18f
Fix regex
8 years ago
Dan Schaper be5fa22b6f Merge pull request #1174 from pi-hole/tweak/logrotate_insecure_directory
8 years ago
DL6ER 6fd7e0311c
Install customized version of logrotate script
8 years ago
DL6ER 1bcf2dd0fc
Tweak CLI domain filter
8 years ago
DL6ER dad18dc5de
Changed keywords
8 years ago
DL6ER 5c95c4074b
Remove static leases from DHCP static leases file
8 years ago
DL6ER 4301b9a12a
Add static DHCP leases to new file
8 years ago
DL6ER 6a89c6bf3b
Silence rm warning if no DHCP server is used
8 years ago
Promofaux fe8c365d17 codacy never lies
8 years ago
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.
8 years ago
Promofaux 1ad23a065e switch out `wc -l` with `grep -c ^`
8 years ago
Promofaux de102fde5c Add line count and size check for pihole.log
8 years ago
DL6ER 8bb9dd460b
Be able to disable the DHCP domain name
8 years ago
Mcat12 58f3ff69d8 Align comment with referenced line
8 years ago
DL6ER 72d8d10e64
Show most recently blocked domain in chronometer (using FTL). Fixes #717
8 years ago
Mcat12 63d02df0bc Merge pull request #1130 from pi-hole/new/logrotate
8 years ago
DL6ER 08f08fea61 Merge pull request #1135 from pi-hole/new/multipleDNSservers
8 years ago
DL6ER 1ed2a8637f
Removed debug echo's
8 years ago
Mcat12 d196c13f2c Merge pull request #1131 from pi-hole/chronometerJsonUnixTools
8 years ago
DL6ER bd1c5a42e8
Allow multiple DNS servers
8 years ago
DL6ER 845d8c0e63
Ensure LC_NUMERIC=C is set when evaluating floating point number (non-English systems might expect "," as decimal separator
8 years ago
Promofaux b4c32e47c6 Missed one!
8 years ago
Promofaux 248d8680f7 actual codacy complaints
8 years ago
Promofaux 1bda965a7c Codacy complaints
8 years ago
Promofaux 2ee305769d Replace all calculations with values read directly web admin API. Parse JSON using native unix tools, no additional requirements needed.
8 years ago
DL6ER 3a8a936575
Corrected path
8 years ago
DL6ER 3fd2ffd466
Add logrotate for pihole.log
8 years ago
DL6ER b56ca2b834
Add DNSSEC support to Pi-hole core
8 years ago
DL6ER a263936243
Merge branch 'development' into wildcardblacklisting
8 years ago
DL6ER 2935275227
Merge branch 'development' into wildcardblacklisting
8 years ago
DL6ER 74a4e62cc9
Codacy fix
8 years ago
DL6ER 63a414a544
Align outputs
8 years ago
DL6ER 7d1f5091a7
Fixed small typo
8 years ago
DL6ER 3b54cab3bc
Show branches and revisions (incl. possible dirty state) in debug log
8 years ago
DL6ER d9e949b27c Merge pull request #1096 from pi-hole/fix/updater
8 years ago
DL6ER 168397e90d
Fixed typo in webpage.sh
8 years ago
DL6ER e3c1fcd2c6
NEW LOGIC FOR THE UPDATER
8 years ago
DL6ER 200995bf29
Make IPv6 features of Pi-hole DHCP server switchable
8 years ago
DL6ER 3a90c1c192
Source setupVars.conf before trying to access variables
8 years ago
Adam Warner 12bec1df68 Merge pull request #1048 from pi-hole/tweak/simplify_webpage.sh
8 years ago
DL6ER ad61852804
Test against empty string
8 years ago
DL6ER dbd8aee4ee
Add 'local' domain if not set in setupVers.conf
8 years ago
DL6ER 677694b01a
Set 24h lease time if settings was empty before
8 years ago
DL6ER 85f0241c0d
Reprocess DHCP settings after update
8 years ago
DL6ER ebf0db4bbf Typo fixed
8 years ago
DL6ER 9ac265980f Add .conf to filename
8 years ago
DL6ER 40798da6b1 Add blacklisting wildcard support
8 years ago
Dan Schaper fc596e41d4
All scripts set executable
8 years ago
DL6ER 5c7fc05a32 Enable DHCP logging by default
8 years ago
DL6ER 9181a4a1d8 Apply dhcp lease time also for IPv6
8 years ago
DL6ER 3268e1611a Backend accept and apply dhcp lease time
8 years ago
DL6ER cf724176dc Do stateful DHCPv6 and SLAAC
8 years ago
DL6ER 1e627c7e8f Make webpage.sh fully library style
8 years ago
DL6ER 9af26cbaac Major simplification of webpage.sh
8 years ago
DL6ER 321ea8a3a9 Merge branch 'development' into webUIprivacymode
8 years ago
Dan Schaper ef8292d371 Merge branch 'development' into updater_rewrite
8 years ago
DL6ER e50947eb58
mend
8 years ago
DL6ER ca056d32d2
Remove git -C
8 years ago
DL6ER e15548cbf5
Add --quiet to git fetch in GitCheckUpdateAvail()
8 years ago
DL6ER 5e28e6b9ac
Removed remaining git -C
8 years ago
Dan Schaper 3365ef7aaa
`is_repo()` returns values to caller, silence function.
8 years ago
Dan Schaper 68c17b26dc
Bashisms
8 years ago
Dan Schaper e647efd471
Shell script, not javascript
8 years ago
DL6ER 15db1ffdd5
Remove variables not needed any more
8 years ago
DL6ER 4632b0f797
Updated updater logic
8 years ago
DL6ER 65c35a5530
Use new subroutine to determine if updates are available
8 years ago
DL6ER c449a1c0e0
Added GitCheckUpdateAvail()
8 years ago
DL6ER b020010f0d
Removed some of the &> /dev/null
8 years ago