Commit Graph

726 Commits (288f93c5dd3c3646991e454c461927ac057d8eba)

Author SHA1 Message Date
DL6ER ec7e75a6e3
Don't save `interface=` line to `dnsmasq`s config file
7 years ago
DL6ER ce6c465942 Merge pull request #1266 from pi-hole/new/host-record
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 078cc7660e
Improved updater logic
7 years ago
DL6ER af2893d2ce
Updater implementation for FTL
7 years ago
ProtoFoo fb6631d317 Removed a line that did nothing.
7 years ago
ProtoFoo cd0b8927c5 Removed a line that did nothing.
7 years ago
ProtoFoo 3fab34687c Redirect pi.hole to pi.hole/admin/
7 years ago
ProtoFoo b2d78edae9 Redirect pi.hole to pi.hole/admin/
7 years ago
DL6ER a64211123f
Some debug additions
7 years ago
DL6ER 4f85ace525
Force pihole user to use sh-shell (instead of nologin)
7 years ago
DL6ER e8fde702a0
Also chown the other files
7 years ago
DL6ER e339f3852c
Change ownership of FTL log to pihole user
7 years ago
DL6ER 032f94afc0
Don't suppress su's output
7 years ago
DL6ER 90ccbef431
pihole-FTL init.d script
7 years ago
Adam Warner a7def771c8 Revert "redirect pi.hole to pi.hole/admin"
7 years ago
Adam Warner 543f1243e2 Merge pull request #1241 from pi-hole/feature/redirect-pi-hole-to-admin
7 years ago
Dan Schaper 053b38e0bd
Set up for IP matching in detection.
7 years ago
Dan Schaper 2aa3a109a0
Ping gateways and Internet.
7 years ago
Dan Schaper 472708376d
Split out IP checks.
7 years ago
Dan Schaper cfed3d59e9
Begin fixing IP detection functions.
7 years ago
Jacob Salmela 26cb6a1929
redirect pi.hole to pi.hole/admin
7 years ago
Jacob Salmela 7c63bbfe44 Merge pull request #1233 from ProtoFoo/patch-1
7 years ago
DL6ER af8e629df4 Merge pull request #1239 from pi-hole/tweak/debug48h
7 years ago
DL6ER 01f980d49c
Change description as we want to save the debug log for 48h instead of only 24h
7 years ago
DL6ER 99fab7e52a
Scan whole dnsmasq.d directory for cofigurations files
7 years ago
Mcat12 ba67144e34 Merge branch 'development' into adminPageAsOption
7 years ago
ProtoFoo 162d9d7d57 Add manual edit warning
7 years ago
ProtoFoo 357f5a2cfd Add manual edit warning
7 years ago
DL6ER 7785dac50e Merge pull request #1228 from r0ckarong/development
7 years ago
Markus Napp 01f643e5eb fixup! Fix spacing for wildcard help in list script
7 years ago
Markus Napp 8037f3e332 Fix spacing for wildcard help in list script
7 years ago
Markus Napp afe5176e01 Justify help output to match main script
7 years ago
Mcat12 a48317883d Fix indentation
7 years ago
Promofaux 4fcf8fd23f Merge in `development` branch - resolve conflict in update.sh
7 years ago
Promofaux 10a30344e5 No need to source setupVars, as basic-install.sh is sourced, which sources setupVars itself. Sourception.
7 years ago
Promofaux b764d17c64 comment
7 years ago
Promofaux ba0abdb88d wrap update logic in admin_installed bool check
7 years ago
Promofaux 1428b58dde source setupVars and only check admin repo if it is enabled
7 years ago
Mcat12 18eb8a2159 Merge pull request #1185 from pi-hole/cleanup/git_functions
7 years ago
DL6ER 3239c7023a Merge pull request #1170 from pi-hole/new/DHCPstaticleases
7 years ago
DL6ER da05491992 Merge pull request #1192 from pi-hole/fix/regex
7 years ago
DL6ER 3d4516dc95
Improve regex
7 years ago
DL6ER 509c864cc3
Merge branch 'development' into fix/regex
7 years ago
DL6ER 8b22f435ad
Change how user and group are stored in the logrotate config file (necessary on Ubuntu 16.04.1)
7 years ago
Mcat12 f8944177a0 Fix chronometer interpreting summaryRaw
7 years ago
DL6ER 06873fe69e
Remove misplaced start of string expression. Fixes #1191
7 years ago
Dan Schaper 3d9d13222b
Use constants for leading paths.
7 years ago
Dan Schaper 745adabb05
Path to source basic-install.sh
7 years ago
Dan Schaper 3861b57dc6
Start moving reused utility functions to one script.
7 years ago
Dan Schaper 99a4a80017
Spelling
7 years ago
Mcat12 033ba26041 Stay in repo directory until we error check
7 years ago
DL6ER 08cddba200
There should be no echo here
7 years ago
DL6ER 1bf43b0425
Improved regex: Remove all leading points from domain (.....xyz => .xyz). Return not only a part, but fill validated domain
7 years ago
DL6ER 85b3fef08d
Use perl instead of grep?
7 years ago
DL6ER 15037fa888
Typo
7 years ago
DL6ER d595fef18f
Fix regex
7 years ago
Dan Schaper be5fa22b6f Merge pull request #1174 from pi-hole/tweak/logrotate_insecure_directory
7 years ago
DL6ER 6fd7e0311c
Install customized version of logrotate script
7 years ago
DL6ER 1bcf2dd0fc
Tweak CLI domain filter
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
Promofaux fe8c365d17 codacy never lies
7 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.
7 years ago
Promofaux 1ad23a065e switch out `wc -l` with `grep -c ^`
7 years ago
Promofaux de102fde5c Add line count and size check for pihole.log
7 years ago
DL6ER 8bb9dd460b
Be able to disable the DHCP domain name
7 years ago
Mcat12 58f3ff69d8 Align comment with referenced line
7 years ago
DL6ER 72d8d10e64
Show most recently blocked domain in chronometer (using FTL). Fixes #717
7 years ago
Mcat12 63d02df0bc Merge pull request #1130 from pi-hole/new/logrotate
7 years ago
DL6ER 08f08fea61 Merge pull request #1135 from pi-hole/new/multipleDNSservers
7 years ago
DL6ER 1ed2a8637f
Removed debug echo's
7 years ago
Mcat12 d196c13f2c Merge pull request #1131 from pi-hole/chronometerJsonUnixTools
7 years ago
DL6ER bd1c5a42e8
Allow multiple DNS servers
7 years ago
DL6ER 845d8c0e63
Ensure LC_NUMERIC=C is set when evaluating floating point number (non-English systems might expect "," as decimal separator
7 years ago
DL6ER bcb8a52418
Added user to cron file
7 years ago
Promofaux b4c32e47c6 Missed one!
7 years ago
Promofaux 248d8680f7 actual codacy complaints
7 years ago
Promofaux 1bda965a7c Codacy complaints
7 years ago
Promofaux 2ee305769d Replace all calculations with values read directly web admin API. Parse JSON using native unix tools, no additional requirements needed.
7 years ago
DL6ER 3a8a936575
Corrected path
7 years ago
DL6ER 6b6fbc4709
Remove --force on @reboot
7 years ago
DL6ER 3fd2ffd466
Add logrotate for pihole.log
7 years ago
DL6ER b56ca2b834
Add DNSSEC support to Pi-hole core
7 years ago
Mcat12 df7671d393 Add a few comments and remove debug output
7 years ago
DL6ER a263936243
Merge branch 'development' into wildcardblacklisting
7 years ago
DL6ER 11924d425b
Hide whitelist option if we detected that the domain as blocked due to wildcard blocking
7 years ago
DL6ER 6b3aea933d
Add info that whitelisting blocked pages does not work
7 years ago
DL6ER 2935275227
Merge branch 'development' into wildcardblacklisting
7 years ago
DL6ER 74a4e62cc9
Codacy fix
7 years ago
DL6ER 63a414a544
Align outputs
7 years ago
DL6ER 7d1f5091a7
Fixed small typo
7 years ago
DL6ER 3b54cab3bc
Show branches and revisions (incl. possible dirty state) in debug log
7 years ago
DL6ER d9e949b27c Merge pull request #1096 from pi-hole/fix/updater
7 years ago
DL6ER 168397e90d
Fixed typo in webpage.sh
7 years ago
DL6ER e3c1fcd2c6
NEW LOGIC FOR THE UPDATER
7 years ago
DL6ER 200995bf29
Make IPv6 features of Pi-hole DHCP server switchable
7 years ago
DL6ER 3a90c1c192
Source setupVars.conf before trying to access variables
7 years ago
Adam Warner 12bec1df68 Merge pull request #1048 from pi-hole/tweak/simplify_webpage.sh
7 years ago
DL6ER ad61852804
Test against empty string
7 years ago
DL6ER dbd8aee4ee
Add 'local' domain if not set in setupVers.conf
7 years ago
DL6ER 677694b01a
Set 24h lease time if settings was empty before
7 years ago
DL6ER 85f0241c0d
Reprocess DHCP settings after update
7 years ago
DL6ER ebf0db4bbf Typo fixed
7 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
Mcat12 7bcc15e416 Adjust blocking page paths from admin restructure
8 years ago
DL6ER 1a3bdbaabf Merge pull request #1057 from pi-hole/new/whitelistonblockingpage
8 years ago
Mcat12 5e35fdbc52 Save blocking page CSS to pihole directory instead of admin
8 years ago
Mcat12 ab2c486f25 Fix password Enter handling
8 years ago
Mcat12 7fd7430d38 Use pi.hole when getting js and css
8 years ago
Mcat12 089b98430f Fix formatting
8 years ago
DL6ER 5c7fc05a32 Enable DHCP logging by default
8 years ago
DL6ER 09bbc81470 Add notice that the user might have to flush his DNS cache
8 years ago
Dan Schaper f7274addcd
Delete swapfile generator, haven't used this in a long time.
8 years ago
DL6ER 09bfa2ef77 Add whitelisting on blocking page feature
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
Dan Schaper c5f5252145 Merge pull request #961 from pi-hole/customblockpage
8 years ago
Dan Schaper 62d001225a Merge pull request #1040 from pi-hole/fix/updater_git-C
8 years ago
DL6ER e50947eb58
mend
8 years ago
DL6ER ca056d32d2
Remove git -C
8 years ago
DL6ER a0e0465036
Revert "Merge pull request #1018 from pi-hole/diginc-patch-1"
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
DL6ER 0276c72fe2
replace 'git -C' with long version (see #1009)
8 years ago
DL6ER 04a9791be2
Save empty password
8 years ago
Adam Warner c1982c04ff Merge pull request #1029 from pi-hole/bogusDNS_BOGUS_PRIVentries
8 years ago
Promofaux 9a62026830 remove `DNS_BOGUS_PRIV` from setupVars.conf
8 years ago
bcambl 2fb0dc0a4a add warning if SELinux is Enforcing
8 years ago
Adam Warner ef1ce66793 Merge pull request #1013 from pi-hole/fix/chronometer
8 years ago
Adam Warner 3bc5d1bae0 Merge pull request #989 from pi-hole/APIresolveclientsandupstream
8 years ago
Adam Warner ff3c36a7a2 Merge pull request #1018 from pi-hole/diginc-patch-1
8 years ago
Adam Hill 5e53f484be Update pihole.cron
8 years ago
DL6ER bb28d94884
Merge branch 'development' into customblockpage
8 years ago
DL6ER a4f58b0a22
Look for "query[" instead of "query" to avoid false-positives, like listed below
8 years ago
DL6ER bcf8139708
Removed cat where we don't need it
8 years ago
DL6ER 9b0390c9da
Space to Tab
8 years ago
DL6ER e88f58c34e
Remove grpping for today's log entries, because we flush the log every day
8 years ago
DL6ER 4626b8ced5
Removed fixed username from sudoers file
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
Mcat12 a0019d86c5 Merge pull request #983 from pi-hole/cronpath
8 years ago
DL6ER 3c4a9bba78 Minor change
8 years ago
Adam Warner 4348653431 Merge pull request #985 from pi-hole/pi.hole
8 years ago
Promofaux e7713a9028 add missing pihole autocomplete commands
8 years ago
Promofaux 684ac98c8e Remove hostname and pi.hole entries, move to /etc/pihole/local.list
8 years ago
DL6ER 9a2ffabc33 Fix missing path information
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
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
DL6ER 2bafa2f2ac Add reboot option
8 years ago
DL6ER 9ac378ae09 Set domains and clients which are excluded by the API
8 years ago
DL6ER bf867bd9fd Set DNS servers from web UI
8 years ago
DL6ER 505c9e8979 Minor change
8 years ago
DL6ER 75deb02961 Don't query pihole if page is hidden anyhow
8 years ago
DL6ER 480211033d Detect if blocking page is loaded within frame or iframe. If so, hide everything
8 years ago
DL6ER ca9321624c Added padding for ad list results
8 years ago
DL6ER 40f18df90f Simplified CSS, removed external contents
8 years ago
DL6ER 0d63cfd6c3 Add 1x1 pixel GIF image. Can apparently be used to trick some of the please-don't-use-adblocker pages as many of them contain code like `if ($('Ad').height() == 0) { prevent access to this page; }`
8 years ago
DL6ER 3d6b22de6c Update index.php to include more detailed output
8 years ago
DL6ER fc233fcdd3 Fixed typo
8 years ago
DL6ER 20370d4348 Update CSS file
8 years ago
DL6ER 0f90671241 Updated index.php to use CSS file unter admin/
8 years ago
DL6ER a866c4e388 Place blockingpage.css (former index.css) unter admin/ so we can load it also from some blocked sub-directories
8 years ago
DL6ER e7241a989c Include CSS file
8 years ago
DL6ER 6e788668f9 Updated index.php
8 years ago
DL6ER b246dba7e7 Rename index.html to index.php
8 years ago
Mcat12 f98de3d5db Merge pull request #941 from DL6ER/caseinsensitive
8 years ago