Commit Graph

726 Commits (288f93c5dd3c3646991e454c461927ac057d8eba)

Author SHA1 Message Date
Patrick O'Brien 24868fdb2b Merge remote-tracking branch 'upstream/development' into development
7 years ago
Patrick O'Brien a463250ecf don't hash an empty password
7 years ago
Flo 6eb9192cd1 Complete site
7 years ago
Patrick O'Brien 94f15f1b3c Merge remote-tracking branch 'upstream/development' into development
7 years ago
Patrick O'Brien ee296f36c1 mask password input on command line
7 years ago
Mcat12 fb3e6ee35c Source setupVars before attempting to use it
7 years ago
Dan Schaper 2740c68a63 Merge pull request #1335 from pi-hole/tweak/debug_templog
7 years ago
Dan Schaper b1f769b671
Output cleaning, IP stack check headers.
7 years ago
Dan Schaper 77378da70a
Cat out temp files to final log.
7 years ago
Dan Schaper 160030b75f
Quiet systemctl output to just the current daemon status.
7 years ago
Dan Schaper 0a0c3a2fb7
Copy working temp to final location.
7 years ago
Dan Schaper e9f1ca338f
Create temp files for working storage, log to working storage temps.
7 years ago
Adam Warner cfaf1ac67c
add check on file_parse to not include WEBPASSWORD= in the debug log
7 years ago
Adam Warner 6b862dd9e9 Only remove from wildcard list if domain is being added to whitelist or blacklist
7 years ago
Markus Napp bb7a7d94ef Replace misleading letter variable
7 years ago
Markus Napp 9a475cc010 Rewrite help text for better handling of params
7 years ago
Markus Napp ae30c285a2 Fix handling of wildcard help text
7 years ago
Dan Schaper 2e74219ff9 Merge pull request #1313 from pi-hole/new/piholecheckout
7 years ago
Dan Schaper b0ae954f1e
Only update when `update` flag is set to "true"
7 years ago
Dan Schaper a2404f104a
Just some style and linting. And a `cd` in `fetch_checkout_pull_branch`
7 years ago
DL6ER 38547ced7a
Can only diff once upstream branch is tracked
7 years ago
DL6ER 9a9d9007cd
Add missing "== true"
7 years ago
DL6ER bd2d81f691
source setupVars.conf to see if INSTALL_WEB is true or not
7 years ago
DL6ER 1b9e7fbf2e
Test if branch is locally available is not reliable because of possible ambiguities
7 years ago
DL6ER d4a49d192f
Correct variable name
7 years ago
DL6ER 8cb66544d2
Remove "\ "
7 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)
7 years ago
DL6ER b961b13d60
Small bugfix
7 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)
7 years ago
DL6ER 1d60b62e7a
Testing alternative way of fetching/checking out of a single branch
7 years ago
Dan Schaper 41e1e4cb68
Rearrange pull logic, some optimization.
7 years ago
Dan Schaper d5b88e0df8
Get the right name for the options.
7 years ago
Dan Schaper 20fd61468d
Require branch to check out
7 years ago
Dan Schaper 0a0d25dff4
Script runs in subshell, no need to cd back to pwd.
7 years ago
raincoats 1590a179fa Change 302 redirect to 301
7 years ago
DL6ER 2b3afbfef8 Merge pull request #1310 from pi-hole/new/piholecheckout
7 years ago
DL6ER 81a1057cac
Fix something Dan has overlooked
7 years ago
DL6ER fd310c6445
Back to how we had it before, because --unshallow does not work at all
7 years ago
Dan Schaper a9b52518bf
Shift numbers for argument identifiers, functions are called after `shift`
7 years ago
Dan Schaper 87da40068c
Always `exit`ed with value 1, now exits with proper value.
7 years ago
Dan Schaper b8f1eadb7f
Shift off `checkout` from being passed to script from `pihole`
7 years ago
Dan Schaper b522d8eaf6
Source and reuse existing variables, centralize code.
7 years ago
Dan Schaper 89ff99322d
Don't need to remember `pwd` inside a function, calling function doesn't change directories.
7 years ago
Dan Schaper 56e17d1010
Source functions and variables from basic-install.sh
7 years ago
DL6ER d2ab0694b7
Add "master" shortcut
7 years ago
DL6ER 8a14a63d5d
Pi-hole checkout feature
7 years ago
DL6ER 8235b18854
Remove duplicated line
7 years ago
DL6ER e0e9ebbe74 Merge pull request #1307 from pi-hole/fix/versionwithoutwebinterface
7 years ago
DL6ER 10bc8414b9
Move FTL querying before clearing the terminal to avoid flashing on Pi B+
7 years ago
DL6ER 4e25e0dc5c
Add missing } to JSON output
7 years ago
DL6ER b1a9793d94
Let Chronometer query all data from FTL (no need for having the API). Fixes #1305
7 years ago
DL6ER 6dea00668e
Don't try to obtain version of web interface it it is not installed. Fixes #1303
7 years ago
DL6ER ae9182c92e Merge pull request #1301 from pi-hole/fix/removewildcard
7 years ago
DL6ER cf31561267
Remove wildcard entry when adding the very same domain either the white- or blacklist
7 years ago
DL6ER a97f0b1298 Merge pull request #1300 from pi-hole/fix/deletehostrecord
7 years ago
Dan Schaper d1e0f3ae18 Merge pull request #1294 from pi-hole/tweak/debugDNS
7 years ago
DL6ER 47a6786e8f
Use proper test syntax
7 years ago
DL6ER a69fcbb91e
Bugfix for when deleting host-record
7 years ago
Dan Schaper 8e2b51b391 Merge pull request #1296 from pi-hole/fix/debugVersion
7 years ago
Dan Schaper 560af43204 Merge pull request #1293 from pi-hole/fix/version
7 years ago
DL6ER baefec86f2
Add CLI teleporter feature
7 years ago
raincoats eb763d2dc2 Redirect to admin panel when accessing 'http://pi.hole/'
7 years ago
Dan Schaper 512c650441
Shellchecking.
7 years ago
Dan Schaper dc44fc9e27
Version check amalgamation and removal of && || logic.
7 years ago
Dan Schaper 6f2fb57c08
Protocol specific records checks.
7 years ago
Dan Schaper 2547cc4c8d
Only run IPv6 if enabled, split out Chaos TXT checks.
7 years ago
DL6ER 9f4ef66f41
Add IPv6 resolver test
7 years ago
DL6ER 086f0790fc
Add Google's IPv6 address for potential IPv6 resolver tests
7 years ago
Dan Schaper 709b44f736
IPv4 DNS tests
7 years ago
Dan Schaper 6cd4ff6d68
Organize functions and function calls.
7 years ago
Dan Schaper abd3e828de
Optimize normalOutput
7 years ago
DL6ER b85af50d14
Generate only the information that is actually asked for
7 years ago
Dan Schaper 0e8fd49669
Function...
7 years ago
Dan Schaper 945e22874e
Collapse duplicate functions, and take out argument loops.
7 years ago
Dan Schaper 77ab47a984
Awk for perl
7 years ago
Dan Schaper ed8088f203
Functions for Core/Web version and hash. And only check first argument in each section.
7 years ago
Dan Schaper 8831b22fc8
Prototype function for getting version of local repo
7 years ago
Dan Schaper 0341bd1758
Optimize code, undoc flag for current hash.
7 years ago
Dan Schaper 9bb4a5fb25
Factor out variables from display.
7 years ago
Dan Schaper ebfffea5dc
Always show something, even if it's just the short hash of the latest commit.
7 years ago
Dan Schaper 81939ab265
Get short hash of local and remote
7 years ago
DL6ER f2fe84c9d3 Merge pull request #1292 from pi-hole/master
7 years ago
DL6ER f626406685
Revert #1273
7 years ago
DL6ER dd971b6ee5
Default behavior is old behavir (listen on gravity interface (e.g. eth0), permit all origins)
7 years ago
DL6ER f1b8abf503 Merge pull request #1146 from pi-hole/tweak/chronometer_recentlyblocked
7 years ago
DL6ER 66b7d04b82
Merge branch 'development' into new/FTL-binary
7 years ago
DL6ER 7ba47f504c
Add special "except-interface" line in case of listening on all interfaces
7 years ago
DL6ER 0be1717ff4
Fix config error
7 years ago
DL6ER 189a4e0078
Add option to skip restarting of dnsmasq
7 years ago
DL6ER 3adf8785d8
Move "all" down in help text to not suggest that it is the default
7 years ago
DL6ER b74862bfc5
Actually apply new setting by restarting dnsmasq
7 years ago
DL6ER 01273124ea
Change to -i, interface
7 years ago
DL6ER 721ada7e16
Fix typo
7 years ago
DL6ER bd9dc91396
Add response for users manually setting this up via CLI
7 years ago
DL6ER de6c43a8d3
Setup interface listening behavior of dnsmasq
7 years ago
Dan Schaper f6fc6a5e56 Merge pull request #1281 from pi-hole/tweak/web_debug
7 years ago
Dan Schaper 83b0600863
Carriage return or newline based webcalls.
7 years ago
Dan Schaper 6c130b7960
Vebiage and highligh the token, also `:::`
7 years ago
Dan Schaper 7244d44a1d
Notify user that log is being uploaded.
7 years ago
Dan Schaper 9b060aab34
Debug auto mode engaged
7 years ago