Commit Graph

1140 Commits (cd9fadbc441adbf5c2a97702ff60062a50847d77)

Author SHA1 Message Date
Mcat12 af5fc6547a
Fix echoing wrong domain when converting wildcard
6 years ago
Mcat12 70f2b26c86
Escape periods in wildcard converted regex filters.
6 years ago
Mcat12 cfd95dbe87
Fix incorrect variable usage
6 years ago
Mcat12 c5bb404d6a
Emulate wildcard blacklisting via -wild and move regex to -regex
6 years ago
Mcat12 d21298c156
Add back conditional forwarding to webpage.sh
6 years ago
Mcat12 4763969c8f
Move processWildcards to query.sh
6 years ago
Mcat12 f868052062
Fix incorrect variable string substitution
6 years ago
Mcat12 0f4968d75c
Merge remote-tracking branch 'origin/development' into new/regex-lists
6 years ago
Mcat12 3077c22e4f
Change help strings from wildcard to regex blacklist
6 years ago
Mcat12 0decc37b5a
Appease stickler
6 years ago
Mcat12 4a953b66e0
Make removing regex domains work correctly
6 years ago
Mcat12 8435eeed4d
Don't validate regex domains
6 years ago
Mcat12 cffb4de83b
Use strict grep instead of regex for duplicates
6 years ago
Mcat12 868948509a
Split declaration and assignment of random_url
6 years ago
Mark Drobnak e71492a2b3
Update debug script for simple list format
6 years ago
DL6ER 2809579dd7
Refine regex filter generation
6 years ago
DL6ER c7afe3e9a4
Please stickler by making clear that the variable regexFile is declared outside of this routine
6 years ago
DL6ER cd026cd865
Add comment where regexList is defined
6 years ago
DL6ER bc705aac03
Add automated wildcard list -> regex filter conversion
6 years ago
Rob Gill 23adbf9540
remove quotes
6 years ago
Rob Gill a7347238e6
$adListsList replace filename in text
6 years ago
Rob Gill bf55666492
Appease stickler.
6 years ago
Rob Gill 8ab0b0e460
colfile
6 years ago
Rob Gill b8e1849cec
wildcardlist
6 years ago
Rob Gill 45a8eda49b
Stop grep leak in query
6 years ago
Rob Gill d61fd01d61
Split queryFunc() into query.sh
6 years ago
Alex Villarreal e422f4154f Clean error message on successful response
6 years ago
Rob Gill cabb06230c
--json not --jason
6 years ago
DL6ER d254d6075a
First step from wildcards to regex lists for blocking
6 years ago
Rob Gill 8004080643
Additional command-line completion
6 years ago
Mark Drobnak d232f08933
Merge pull request #2208 from pi-hole/tweak/checkout
6 years ago
Adam Warner f5541860bc
Don't run the installer when doing ftl checkout, instead just run the ftl install functions
6 years ago
Rob Gill 83ff0055b6
Test and indicate status
6 years ago
Mark Drobnak ab45360808
Merge pull request #1954 from ryanknapper/adlist.lists
6 years ago
Mark Drobnak 9fd70cbdf9
Merge pull request #2057 from pi-hole/fix/debug-empty-ports
6 years ago
Mark Drobnak 3f3254a4df
Merge pull request #2176 from rrobgill/php5fix
6 years ago
Mark Drobnak f568012b9d
Merge pull request #2070 from pi-hole/new/debug-locale
6 years ago
Rob Gill 382c19024f
oh stickler bot...
6 years ago
Rob Gill 9379487942
changes as requested
6 years ago
Rob Gill 5e99baf7b9
Update index.php
6 years ago
Rob Gill 31951dae4c
Update index.php
6 years ago
DL6ER 2ef76d5e31
Remove LOCAL_DNS_PORT support
6 years ago
Adam Warner a6e4b0fea5
- Test for existence of remote non-master branch of FTL before attemtping to check for update
6 years ago
MichaIng 43f19034b9
"INSTALL_WEB" renamed to "INSTALL_WEB_INTERFACE" #2115
6 years ago
Adam Warner ceaf4bc6bc
Some extra code made it's way into the dev branch. Not entirely sure how that happened... related to #2115
6 years ago
Dan acfc49fd41
Merge branch 'development' into Install-Web-Server
6 years ago
DL6ER ce35509a40
Change command to "pihole -a localdnsport X"
6 years ago
DL6ER 24b8b4e904
Add backend changes for supporting a local recursive DNS server
6 years ago
Adam Warner 6977f655e3
fix a typo
6 years ago
Adam Warner e6fc9dc75d
disable 2016 in two places and declare local variables
6 years ago
Adam Warner b57b3f4588
Disable SC2001 for generation of `the_os`
6 years ago
Adam Warner 776ae92416
fix some shellcheck/stickler compaints in debug script
6 years ago
Adam Warner 6ba53c1ac0
Merge branch 'development' into FTLDNS
6 years ago
Mark Drobnak d4870b3854
Merge pull request #2053 from pi-hole/tweak/debug-logs
6 years ago
Adam Warner bca23dd896
Allow passing of --check-only to update script.
6 years ago
Daniel (Fourdee) 3a483a1b20 install_web_server
6 years ago
Adam Warner 310d33b8ee
Merge dev > FTLDNS fix merge conflicts
6 years ago
Adam Warner 8b5dcc3872
Match change made by 7edab27 to prevent merge conflict
6 years ago
Ludovic Rousseau 7edab27e53 Stylistic change to use an explicit if/then/fi
6 years ago
Ludovic Rousseau 9b3531f634 Fix stylistic issue
6 years ago
Ludovic Rousseau d8f85a8981 Avoid a "No such file or directory" error
6 years ago
Ludovic Rousseau 3b229489c2 Fix regex to find DBFILE= from configuration file
6 years ago
Jacob Salmela 5ffc3561ed
implement dschapers suggestions--better command, less subshells, and finer formatting
6 years ago
Dan Schaper 250b445eee
Split declaration and population for stickler.
6 years ago
DL6ER 82d5afe996
Silence error in log flush subroutine when no pihole-FTL.conf can be found
6 years ago
DL6ER 6086614274
Add "-l, privacylevel" description to "pihole -a"
6 years ago
Adam Warner 6bb4780d32
Merge pull request #2077 from pi-hole/tweak/FTLDNSExperiments
6 years ago
Adam Warner 631f5b4848 Change order of updatable components to match the end output
6 years ago
DL6ER 4941e0f8ad
Backend changes needed to be able to set the privacy level
6 years ago
Adam Warner f37b2bc7c1
move call to `get_binary_name` into `FTLcheckUpdate()` to avoid having to run that first
6 years ago
Adam Warner 56278c6394
Fix shellcheck complaints
6 years ago
Adam Warner b1d6c03190
Break out binary name funtion to it's own function
6 years ago
Mark Drobnak bb9a18ef08
Merge pull request #1987 from ryanknapper/patch-1
6 years ago
Jacob Salmela 1a275ba184
debug user locale; improve function to parse variables and files
6 years ago
Mark Drobnak 971e6f2664
Merge pull request #2064 from Perflyst/chronometer-1
6 years ago
Dan Schaper 34d84522dd
Merge pull request #2054 from theLMGN/patch-1
6 years ago
Perflyst 3390fbf238 Add RaspberryPi 3B+
6 years ago
Jacob Salmela 68c27eb2a1
add label to x-header so you know which one is being evaluated
6 years ago
Jacob Salmela 143e75d213
fix empty ports on some systems
6 years ago
DL6ER 295ac49f83
Add capability CAP_NET_RAW to allow pihole-FTL to use RAW sockets for being able to create an ICMPv6 socket for IPv6 handling in the DHCP service
6 years ago
Adam Warner fbab930cb1
Allow install script to install FTL instead of the checkout script. Utilises the /etc/pihole/ftlbranch file.
6 years ago
Leo MG Nesfield (LMGN) bfcbd72e4b
Link to the admin panel on the splash page.
6 years ago
Jacob Salmela d9d3caec22
new head tail function and get head tail of pihole-FTL.log instead of just head
6 years ago
Jacob Salmela 7159ecb632
reduce ping times for faster script completion
6 years ago
Adam Warner 5584a9ce5d
Merge branch 'development' into FTLDNS
6 years ago
Adam Warner 76cb129d3c
don't forget `master` and `development` branches!
6 years ago
Adam Warner 246d5cd587
store checked out FTL branch in /etc/pihole/ftlbranch
6 years ago
Ryan Knapper 5ecfc58e5f
Require exact match
6 years ago
DL6ER 56a2924a33
Unprivileged processes are subject to full permission checking based on the process's credentials, we have to explicitly allow pihole-FTL to bind to ports < 1024 (port 53 for DNS) and for various advanced network-related operations (to allow for handling DHCP requests)
6 years ago
DL6ER 09886a3f11
Add resolveconf config to pihole-FTL.service
6 years ago
DL6ER b87bcc8f5f
Modifications in pihole-FTL.service for FTLDNS
6 years ago
Ryan Knapper c17d95bfed
Proper output for debug CPU detection
6 years ago
Mark Drobnak f14184df30
Merge pull request #1982 from LudovicRousseau/master
6 years ago
Ludovic Rousseau 47bbea9ba7 Use " " to protect parameter substitution
6 years ago
Mark Drobnak 7265935cd4
Merge pull request #1915 from ryanknapper/development
6 years ago
Ludovic Rousseau b7891f92a5 Create blacklist.txt if not existant
6 years ago
DL6ER 5465ac9ba0
Merge pull request #1929 from pi-hole/fix/flushDB
6 years ago
DL6ER b8eaa9a527
Use double quotes to precent globbing and word splitting
6 years ago
DL6ER 5d274008db
Use possibly user-defined database location when flushing
6 years ago
Mcat12 8a42ef431b
Fix Javascript warning when no password is set
6 years ago
Mcat12 2cf1f0e8fc
Hide the password input when there is no password
6 years ago
Ryan Knapper f2b3752f3d
lan to local
6 years ago
Ryan Knapper 36945a67d0
Prevent redundant entries in to adlists.list
6 years ago
Mcat12 1a5c86d32e
Revert "Hide password textbox if there is no password"
7 years ago
Mcat12 c7219fbdff
Merge remote-tracking branch 'origin/development' into tweak/block-page-no-password
7 years ago
DL6ER 4c249a1186
Flush most recent 24 hours from FTL's database
7 years ago
DL6ER 158ea1d43b
Add sqlite3 dependency
7 years ago
DL6ER 52cc8e2fcf
Use "lan" as fallback TLD for DHCP generated domains
7 years ago
ryanknapper 607664c860
Update webpage.sh
7 years ago
Adam Warner 80307a3bcd
Remove update line from cron
7 years ago
Vasilis Gerakaris 939806f021
piholeDebug.sh: Correct typo mistake
7 years ago
DL6ER 793bdd9743
No need for cat | sed here as we source setupVars.conf, so we can use interface="${PIHOLE_INTERFACE}"
7 years ago
DL6ER 9d50f52bb2
Add fallback interface for DNS listening behavior in case PIHOLE_INTERFACE is not set in setupVars.conf
7 years ago
DL6ER 4efb533d2e
Create directories /etc/{var,log}/pihole on startup of pihole-FTL and set proper ownership
7 years ago
DL6ER afa2e9c2f7
Exchange hard-coded domain "localhost" by hard-coded address "127.0.0.1"
7 years ago
DL6ER a4c8f1a0a4
Merge pull request #1859 from pi-hole/new/extra-logging
7 years ago
Adam Warner 8e0d76b63b
initiated -> initialized
7 years ago
DL6ER cca8412921
Use "echo -n" to avoid haveing newlines in the files
7 years ago
DL6ER d15a5ad5c1
Add required documentation in the source code
7 years ago
DL6ER 8ed75dd176
Add extra entry to the end of the saved branches and versions such that PHP's explode() subroutine can correctly disentangle the first three entries and does not get confused by the newline character at the end of the FTL version/branch...
7 years ago
Dan Schaper 8ca0582afc
Merge branch 'release/v3.2.1' into fix/DNSSEC_trustanchor
7 years ago
DL6ER 5c2dcb5e74
Enable dnsmasq's extra logging feature
7 years ago
DL6ER be0c457445
Sleep 30 seconds after reboot to be sure that the system is ready
7 years ago
DL6ER 3c04dbb4ed
Update remote version at 17:59 as well as on reboot
7 years ago
DL6ER cfca367eef Quickly verified in dnsmasq's source code: It has to be "trust-anchor" (with "-")
7 years ago
DL6ER 8a243c5872 Insert also old trust anchor
7 years ago
DL6ER b30b3f3aeb Update DNSSEC trust anchor
7 years ago
Mark Drobnak e3fa06d7ff
Merge pull request #1829 from keithbentrup/development
7 years ago
Dan Schaper 423280cee1
Merge pull request #1817 from jjssoftware/development
7 years ago
Keith Bentrup 45ab2a3d7a send HTTP headers before HTML
7 years ago
DL6ER 05d015169c
Check for local version and branches every 10 minutes, check for remote versions only once a day
7 years ago
Jacob Salmela 28bed0041e
remove comment
7 years ago
Jacob Salmela 6f03e30151
fixes #1537 by checking if systemctl is found
7 years ago
Joe 6ecd93d0c9
pihole.log permissions
7 years ago
Adam Warner a9a40ca46c
Useless cat. Consider 'cmd < file | ..' or 'cmd file | ..' instead.
7 years ago
Adam Warner 162a7b56fe
force mode is no longer referenced. Regression. Same with `domToRemoveList`
7 years ago
WaLLy3K 2dc1851892
Allow passwords with spaces
7 years ago
Jacob Salmela 9631519eb1
Merge pull request #1752 from pi-hole/new/bashupdatechecker
7 years ago
DL6ER 90efa3b610
Simplify git subroutines
7 years ago
Mcat12 009fa2f1b7
Hide password textbox if there is no password
7 years ago
Adam Warner 5221767a70
Merge pull request #1735 from bcambl/debug_selinux
7 years ago
DL6ER 9492ff26c6
Merge pull request #1747 from pi-hole/tweak/gravity_update_time
7 years ago
DL6ER 0db76aada0
Silence errors when directory to be checked does not exist (system may have been installed without a web interface!)
7 years ago
DL6ER 9be854031f
Don't store FTL branch until the next release of FTL which supports returning the branch in an easy way
7 years ago
DL6ER 709851503f
Use "pihole-FTL branch" to get FTL's branch
7 years ago
DL6ER 6ca47dc3b3
Add bash / cron based update checker for Pi-hole
7 years ago
WaLLy3K 2390b80359 Silence non-numeric domains_being_blocked output
7 years ago
DL6ER 85d159bdd1
Randomize gravity update time
7 years ago
bcambl 0f868f7649 remove un-used DONE variable
7 years ago
bcambl 31730e7197 add missing colors to COL_TABLE fallback
7 years ago