Adam Warner
61a40c1b43
merge devel into 4.3.2 And Resolve merge conflicts
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
5 years ago
DL6ER
1f36ec48e3
Add use-application-dns.net = NXDOMAIN in ProcessDNSSettings rather than in the template so we can ensure that it will survive config-renewals.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
d8eee47ca4
Add dhcp-ignore-names option when enabling DHCP service. We currently remove anything that starts with "dhcp-" to have a clean configuration and removed these lines without noticing when enabling the DHCP server.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
Dan Schaper
03c65dd0e9
Convert hardcoded /usr/local/bin to variable
...
Update pihole script with full path to 'pihole'
Variable for webpage.sh 'pihole' call.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
5 years ago
snapsl
20a839fef5
fixed local declaration before assignment
...
Signed-off-by: snapsl <chris.baller@gmx.de>
5 years ago
snapsl
b2d8c4374b
tweaked code style of webpage.sh
...
Signed-off-by: snapsl <chris.baller@gmx.de>
5 years ago
DL6ER
5ff9052200
Review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
3d3fc2947e
Review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
8382f4d727
Rename table to domain_audit and simplify subroutine addAudit().
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
0405aaa3da
Review comments and fixing stickler complaints.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
2fb4256f84
Rename table to "auditlist"
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
82476138c1
Instead of calling sqlite3 multiple times within a loop, we use the ability to add multiple rows within one INSERT clause. This is supported since sqlite3 3.7.11 (2012-03-20) and should be available on all systems.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
5293beeb77
Update audit script to store domains in new database table.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
1fe3507bc5
Adlists table was renamed to Adlist. Adapt further places in the code to match the new name.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
c5df104a66
Add dhcp-ignore-names option when enabling DHCP service. We currently remove anything that starts with "dhcp-" to have a clean configuration and removed these lines without noticing when enabling the DHCP server.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
Dan Schaper
7de6bbca61
Merge branch 'development' into release/v4.3
5 years ago
Mcat12
8e1bf6e3d4
Merge branch 'development' into new/gravitydb
...
# Conflicts:
# advanced/Scripts/list.sh
# gravity.sh
# pihole
5 years ago
pvogt09
8a92fb24c4
Incorporates changes requested by @Mcat12
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
5 years ago
pvogt09
5c575e73c7
Adds world readable attribute to files created by Pi-hole to circumvent #2724
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
5 years ago
DL6ER
efeba594ae
Add support for manipulating adlists from the CLI
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
Mark Drobnak
d2c7c426de
Fix teleporter backup file extension
...
Fixes #2714
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
5 years ago
Mcat12
1cad069050
Add privacy level 4 to all privacy level code
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Dan Schaper
9f672593bc
Update advanced/Scripts/webpage.sh
...
Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>
6 years ago
DL6ER
a285ae65fb
Backend changes for DHCPv4 rapid commit support
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
Dan Schaper
a986f53134
Merge pull request #2436 from pi-hole/fix/password-read-error
...
Fix error when reading in new password
6 years ago
Dan Schaper
72829be281
Remove shellcheck overrides
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Adam Warner
3d4fea6510
Move -r to before the -p
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
WaLLy3K
180d29c7b3
Prevent BASH from expanding Web Password
...
* Resolves issue #2471
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
6 years ago
Mcat12
7c6eecc9c8
Ignore shellcheck warning
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
e4cbf5023a
Fix error when reading in new password
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mark Drobnak
cedc39bf09
Merge pull request #2426 from mrmajik45/master
...
Read without -r will mangle backslashes. (Fix)
6 years ago
mrmajik45
8684356b44
read without -r will mangle backslashes.
6 years ago
Mcat12
f141b9f778
Add support for privacy level 4
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
DL6ER
94e4ed6644
Add facility to add multiple audit list entries at once and to nuke audit list
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
Dan Schaper
b54e32f0ca
Space/Tab webpage.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Mcat12
d21298c156
Add back conditional forwarding to webpage.sh
...
This was accidentally removed in a previous PR.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mark Drobnak
ab45360808
Merge pull request #1954 from ryanknapper/adlist.lists
...
Prevent redundant entries from being added to Adlists.list
6 years ago
DL6ER
2ef76d5e31
Remove LOCAL_DNS_PORT support
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
DL6ER
ce35509a40
Change command to "pihole -a localdnsport X"
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
DL6ER
24b8b4e904
Add backend changes for supporting a local recursive DNS server
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
DL6ER
6086614274
Add "-l, privacylevel" description to "pihole -a"
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
DL6ER
4941e0f8ad
Backend changes needed to be able to set the privacy level
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
Ryan Knapper
5ecfc58e5f
Require exact match
...
Updated to require an exact match to reduce false-positives, as suggested by DL6ER.
Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>
6 years ago
Mark Drobnak
7265935cd4
Merge pull request #1915 from ryanknapper/development
...
Add conditional forwarding options to webpage.sh
6 years ago
Ryan Knapper
f2b3752f3d
lan to local
...
Reduced differences.
Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>
6 years ago
Ryan Knapper
36945a67d0
Prevent redundant entries in to adlists.list
...
Grep ${args[3]} and only add if grep -c -eq 0
Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>
6 years ago
DL6ER
52cc8e2fcf
Use "lan" as fallback TLD for DHCP generated domains
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
ryanknapper
607664c860
Update webpage.sh
...
Updated webpage.sh to include conditional forwarding options.
6 years ago
DL6ER
793bdd9743
No need for cat | sed here as we source setupVars.conf, so we can use interface="${PIHOLE_INTERFACE}"
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
7 years ago
DL6ER
9d50f52bb2
Add fallback interface for DNS listening behavior in case PIHOLE_INTERFACE is not set in setupVars.conf
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
7 years ago
DL6ER
cfca367eef
Quickly verified in dnsmasq's source code: It has to be "trust-anchor" (with "-")
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
7 years ago
DL6ER
8a243c5872
Insert also old trust anchor
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
7 years ago
DL6ER
b30b3f3aeb
Update DNSSEC trust anchor
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
7 years ago
WaLLy3K
2dc1851892
Allow passwords with spaces
...
e.g: `pihole -a -p "foo bar"`
Signed off by WaLLy3K <wally3k@pi-hole.net>
7 years ago
WaLLy3K
bd33018660
Shellcheck OR validation
...
Signed off by WaLLy3K <wally3k@pi-hole.net>
7 years ago
Mcat12
67a5594909
Allow emails which include `-h` in them
...
For example, mcat12@pi-hole.net would previously spit out the help message
7 years ago
DL6ER
ee2169dd13
Merge branch 'development' into tweak/gravity
7 years ago
WaLLy3K
28063aa7f7
Add administrative contact address functionality
...
* Disable shellcheck for SC1090
7 years ago
WaLLy3K
34ae4844fa
Merge branch 'development' into tweak/gravity
7 years ago
DL6ER
c9d4995900
Update to comply with current development code
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
7 years ago
DL6ER
279e809aaf
Use `poweroff` instead of `halt`
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
7 years ago
DL6ER
0d037e96fb
Merge branch 'development' into gedetil-development
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
Conflicts:
advanced/Scripts/webpage.sh
7 years ago
WaLLy3K
7cac207c00
Merge branch 'development' into tweak/gravity
7 years ago
Adam Warner
18b41adbf6
Merge branch 'development' into tweak/gravity
7 years ago
Adam Warner
0a9965292c
Additional check to fix any existing cases of "24h" in setupVars.conf automatically.
...
Signed-off-by: Adam Warner <adamw@rner.email>
7 years ago
Adam Warner
4fb66e632f
The other h
7 years ago
Adam Warner
5787895794
stop an extra `h` being added to leasetime of DHCP server. We already storethe `h` in `setupVars.conf`
...
Signed-off-by: Adam Warner <adamw@rner.email>
7 years ago
WaLLy3K
fdf2649f2f
Clean up known remaining colour output issues ( #1613 )
...
* Print newline on error message
* Output last three lines of error if update fails
* Consistent error messages & housekeeping
* Add shellcheck directive to ignore COL_TABLE
* Quoted and braced variables for codebase consistency
* Escaped newlines correctly
* Made error messages consistent (indenting and wording)
* Removed consecutive echos
* Conditional formatting consistency
* Braced, quoted and used [[ on conditionals
* Fix specific ShellCheck issues
* Fixed issues that could be safely changed without extensive testing
* Update SELinux whiptail behaviour & more
* Colourised some strings
* Fixed multiple line string indenting
* Made output consistent with existing codebase
* Removed sequential echos
* Make SELinux whiptail use "--defaultno", and change text wording
* Add help text for hostrecord, and colourise output
* this should fix the tests...
Signed-off-by: Adam Warner <adamw@rner.email>
* revert changes to `update_package_cache()` to prove tests
Signed-off-by: Adam Warner <adamw@rner.email>
7 years ago
Mcat12
b09c660833
Always process DNS and DHCP settings in installer ( #1630 )
...
* Always process DNS and DHCP settings in installer
* Make sure dnsmasq config exists before modifying it
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
* Make sure the dnsmasq config directory exists
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
* Only remove the DHCP config if it exists (fixes tests, hopefully)
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
7 years ago
WaLLy3K
61ff0452e1
Remove duplicate code
...
* Make RestartDNS() use `pihole restartdns`
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
7 years ago
WaLLy3K
3631d1349e
Prevent Web Admin from printing restartdns colour codes ( #1575 )
...
* Prevent Web Admin from printing unnecessary msgs
* Make DNS restart behaviour consistent
7 years ago
Jacob Salmela
fb66fb12c5
put "no password will be set" on a newline.
7 years ago
Jacob Salmela
042dcf795c
fixes #1430
7 years ago
Adam Warner
22abbffbb7
Merge branch 'development' of https://github.com/gedetil/pi-hole into gedetil-development
...
Signed-off-by: Adam Warner <adamw@rner.email>
# Conflicts:
# advanced/Scripts/webpage.sh
7 years ago
DL6ER
e9d81fc883
Backend additions for aufit log feature ( #1399 )
7 years ago
Adam Warner
536585b846
Colourise Core Output Text ( #1471 )
...
* Define colours within COL_TABLE
* Do not output colours for non-terminal instances
* Removed ":::"
* Fixed indenting & spacing
* Made output consistent throughout project
* Reworded text to fit on standard 80 char wide Terminal screen
* Made 'sudo raspi-config' warning (insufficient disk space) only show on RPi
* Make "Installation/Update Complete" the final msg
* Remove redundant messages
* Simplify update available message
* Confirm user would like to begin uninstall
* If "git pull" string says "Already up-to-date.", place [i] before it
* Colour Temp/Interface output
* Made `pihole disable 5z` invalid
* Added error fallback if invalid argument (not s/m) is detected
* Quoted "$2" for consistency
* Updated help text
* L185/286: Replaced echo with redirect
* User agents for adblock.mahakala.is/adaway.org unnecessary
* Print newline on confirmation of repository reset
* Add output to admin-related dnsmasq restarts
* Return error message for "pihole -q"
* Imply default checkout behaviour with y/N
* Fix uninstall failing to remove pihole user
* Print checkout 'git remote show origin' STDERR on new line
* Replaced checkout "AdminLTE" wording with "Web Admin"
7 years ago
WaLLy3K
0e4473685b
Show help for "pihole -a -i --help"
7 years ago
WaLLy3K
b721ed49ab
Update Help Output ( #1467 )
...
* File consistency
* Tabs to 2 spaces
* Corrected indenting
* Double braced conditionals
* Quoted variables within conditionals
* Standardise core help text
* Added help text for disable command
* Added help text for logging command
* Clean up
* Fixed certain new lines and spaces
* Sync with development branch
* Formatting consistency
* Tabs to 2 spaces
* Corrected indenting
* Double braced conditionals
* Quoted variables within conditionals
* Fixed certain newlines and spaces
* Admin help text
* Added help text for interface command
* Sync with development branch
* Formatting consistency
* Tabs to 2 spaces
* Fixed some wording
* Fixed certain spaces
* Formatting consistency
* Minor wording changes
* Tabs to 2 spaces
* Corrected indenting
* Double braced conditionals
* Quoted variables within conditionals
* Fixed certain newlines and spaces
* Blacklist help text
* Formatting consistency
* Tabs to 2 spaces
* Corrected indenting
* Cronometer help text
* Formatting consistency
* Fixed certain newlines and spaces
* Corrected indenting
* Checkout warning alteration
* Add checkout help text
* Corrected help output
7 years ago
DL6ER
9cc392fa02
Update Marks PR after the Promo code has been merged
7 years ago
Adam Warner
9c136a5579
functionise Hashing
7 years ago
gedetil
ff6df76e36
Update webpage.sh
...
Implement "Halt system" button, next to "Restart system" button, on
admin/settings page. Useful for doing clean shutdown before powering off.
(This affects 4 files, 3 for the web content, 1 for backend script.)
Gilbert Detillieux <gedetil> 2017-04-11
7 years ago
Mcat12
a96b4d28e1
Merge pull request #1365 from pi-hole/adlistImprovements
...
Adlist improvements
7 years ago
Adam Warner
3cf9942465
spacing fixed
7 years ago
Adam Warner
153031482f
Add delete mode to adlist command. Might be abetter way to do this
7 years ago
Adam Warner
af2cff5177
remove call to user list
7 years ago
Adam Warner
5435b93df2
remove spaces
7 years ago
Adam Warner
3a3dde6298
add adlist argument redirector
7 years ago
Adam Warner
b4bc90fb85
add in CustomizeAdlists function
7 years ago
Patrick O'Brien
a463250ecf
don't hash an empty password
7 years ago
Patrick O'Brien
ee296f36c1
mask password input on command line
7 years ago
DL6ER
47a6786e8f
Use proper test syntax
7 years ago
DL6ER
a69fcbb91e
Bugfix for when deleting host-record
7 years ago
DL6ER
baefec86f2
Add CLI teleporter feature
7 years ago
DL6ER
dd971b6ee5
Default behavior is old behavir (listen on gravity interface (e.g. eth0), permit all origins)
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
DL6ER
ce6c465942
Merge pull request #1266 from pi-hole/new/host-record
...
Add host-record option
7 years ago
Jacob Salmela
7a1a2dec67
update license to EUPL on core files
7 years ago
DL6ER
7ed1bbad49
Add host-record option
7 years ago
DL6ER
dad18dc5de
Changed keywords
7 years ago
DL6ER
5c95c4074b
Remove static leases from DHCP static leases file
7 years ago
DL6ER
4301b9a12a
Add static DHCP leases to new file
7 years ago
DL6ER
6a89c6bf3b
Silence rm warning if no DHCP server is used
7 years ago
DL6ER
8bb9dd460b
Be able to disable the DHCP domain name
7 years ago
DL6ER
1ed2a8637f
Removed debug echo's
8 years ago
DL6ER
bd1c5a42e8
Allow multiple DNS servers
8 years ago
DL6ER
b56ca2b834
Add DNSSEC support to Pi-hole core
8 years ago
DL6ER
168397e90d
Fixed typo in webpage.sh
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
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
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
DL6ER
04a9791be2
Save empty password
8 years ago
Promofaux
9a62026830
remove `DNS_BOGUS_PRIV` from setupVars.conf
8 years ago
Adam Warner
3bc5d1bae0
Merge pull request #989 from pi-hole/APIresolveclientsandupstream
...
Implement backend for AdminLTE/#253
8 years ago
DL6ER
ee8f29d178
Fixed typo, extended help text
8 years ago
DL6ER
da363070c7
Added Kelvin
8 years ago
DL6ER
715838cf89
Allow disabling second DNS server
8 years ago
DL6ER
7a243f890e
Backend for privacyMode on webUI
8 years ago
DL6ER
afabb5957b
Implement backend for https://github.com/pi-hole/AdminLTE/pull/253
8 years ago
DL6ER
2977168da1
dnsmasq "bogus-priv" property
8 years ago
DL6ER
85e3f37503
dnsmasq "domain-needed" property
8 years ago
DL6ER
ba015c1918
Set domain name via Settings page
8 years ago
DL6ER
1556adb678
Also remove quiet-dhcp setting when disabling/enabling the Pi-Hole DHCP server
8 years ago
Adam Warner
6bfe729112
Merge pull request #979 from pi-hole/wwwdatapassword
...
Prevent web UI password change by web user
8 years ago
DL6ER
207422f83a
Added a missing space
8 years ago
DL6ER
004ba28378
Prevent web UI password change by web user
8 years ago
DL6ER
6f38801ed8
Add "Interface appearence" option
8 years ago
DL6ER
b8d2bfc890
Wait 5 seconds before rebooting so the web UI can finish loading before being unreachable due to the reboot
8 years ago
DL6ER
bc91716082
Suppress logging of DHCP actions to /var/log/pihole.log
8 years ago
DL6ER
8dc0dc4d69
Add DHCP-Server backend
8 years ago
DL6ER
2f4b7ce3dd
Update dnsmasq file when changing upstream DNS servers and restart the service to get it active
8 years ago
DL6ER
d4f83cb1d4
Be able to set API_QUERY_LOG_SHOW
8 years ago
DL6ER
aaab3306a8
Add restart DNS capability
8 years ago