776ae92416
fix some shellcheck/stickler compaints in debug script
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-04-15 21:33:10 +01:00
6ba53c1ac0
Merge branch 'development' into FTLDNS
2018-04-15 20:46:13 +01:00
d4870b3854
Merge pull request #2053 from pi-hole/tweak/debug-logs
...
Get head and tail of pihole-FTL.log during debug process
2018-04-15 14:23:25 -04:00
bca23dd896
Allow passing of --check-only to update script.
...
Don't run installer for updating web files, it's handled by getGitFiles.
I think this works...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-04-15 18:25:35 +01:00
310d33b8ee
Merge dev > FTLDNS fix merge conflicts
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-04-13 17:01:54 +01:00
8b5dcc3872
Match change made by 7edab27 to prevent merge conflict
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-04-13 16:53:57 +01:00
7edab27e53
Stylistic change to use an explicit if/then/fi
...
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr >
2018-04-13 12:19:55 +02:00
9b3531f634
Fix stylistic issue
...
Expand variable using ${FTLconf}
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr >
2018-04-13 11:48:34 +02:00
d8f85a8981
Avoid a "No such file or directory" error
...
Check the file /etc/pihole/pihole-FTL.conf exists before trying to use
it.
without the patch I get, each day, in my logs:
sed: can't read /etc/pihole/pihole-FTL.conf: No such file or directory
I use a variable FTLconf to not repeat the file name twice.
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr >
2018-04-13 11:16:58 +02:00
3b229489c2
Fix regex to find DBFILE= from configuration file
...
The regex ^\s^.DBFILE\s*=\s* does not work to match "DBFILE="
I don't know what the second '^' is used for.
With the change I now have the results:
DBFILE=/foo/bar
-> /foo/bar
DBFILE=/foo/bar
-> /foo/bar
# DBFILE=/foo/bar
-> /etc/pihole/pihole-FTL.db
xDBFILE=/foo/bar
-> /etc/pihole/pihole-FTL.db
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr >
2018-04-13 11:16:50 +02:00
82d5afe996
Silence error in log flush subroutine when no pihole-FTL.conf can be found
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-04-05 22:28:55 +02:00
6086614274
Add "-l, privacylevel" description to "pihole -a"
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-04-04 18:10:23 +02:00
6bb4780d32
Merge pull request #2077 from pi-hole/tweak/FTLDNSExperiments
...
FTLDNS tweaks
2018-04-04 17:00:03 +01:00
631f5b4848
Change order of updatable components to match the end output
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-04-04 16:35:11 +01:00
4941e0f8ad
Backend changes needed to be able to set the privacy level
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-04-04 13:12:39 +02:00
f37b2bc7c1
move call to get_binary_name into FTLcheckUpdate() to avoid having to run that first
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-04-02 23:22:06 +01:00
56278c6394
Fix shellcheck complaints
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-04-02 22:06:36 +01:00
b1d6c03190
Break out binary name funtion to it's own function
...
Remove duplicate code. get_binary_name is now in the install script
Add some "version" checking to ftl download when using an alt branch, uses checksum
Greatly simplify update process. Source pihole-FTL version checker from basic-install.sh
Always run install script to finalise changes.
Install script now outputs versions after an update
(This is a Squash of previous work into one commit)
Signed-off-by: Adam Warner <adamw@rner.email >
2018-04-02 21:53:32 +01:00
bb9a18ef08
Merge pull request #1987 from ryanknapper/patch-1
...
Proper output for debug CPU detection
2018-04-02 00:00:14 -04:00
3390fbf238
Add RaspberryPi 3B+
...
Signed-off-by: Perflyst <mail@perflyst.de >
2018-03-27 12:23:01 +02:00
68c27eb2a1
add label to x-header so you know which one is being evaluated
...
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net >
2018-03-25 21:27:40 -05:00
fbab930cb1
Allow install script to install FTL instead of the checkout script. Utilises the /etc/pihole/ftlbranch file.
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-03-23 22:46:41 +00:00
d9d3caec22
new head tail function and get head tail of pihole-FTL.log instead of just head
...
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net >
2018-03-23 06:56:40 -05:00
7159ecb632
reduce ping times for faster script completion
...
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net >
2018-03-23 00:11:21 -05:00
76cb129d3c
don't forget master and development branches!
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-03-07 21:48:09 +00:00
246d5cd587
store checked out FTL branch in /etc/pihole/ftlbranch
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-03-07 21:41:00 +00:00
c17d95bfed
Proper output for debug CPU detection
...
Inserted "log_write" to properly output CPU detection lines.
Signed-off-by: Ryan Knapper (ryanknapper@gmail.com >
2018-02-19 10:22:28 -05:00
f14184df30
Merge pull request #1982 from LudovicRousseau/master
...
Create blacklist.txt if not existant
2018-02-18 15:32:01 -05:00
47bbea9ba7
Use " " to protect parameter substitution
...
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr >
2018-02-18 21:20:04 +01:00
7265935cd4
Merge pull request #1915 from ryanknapper/development
...
Add conditional forwarding options to webpage.sh
2018-02-18 12:51:46 -05:00
b7891f92a5
Create blacklist.txt if not existant
...
Closes: https://github.com/pi-hole/pi-hole/issues/1888
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr >
2018-02-18 14:19:49 +01:00
b8eaa9a527
Use double quotes to precent globbing and word splitting
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-02-17 13:01:00 +01:00
5d274008db
Use possibly user-defined database location when flushing
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-02-17 12:58:57 +01:00
4c249a1186
Flush most recent 24 hours from FTL's database
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-01-21 13:48:13 +01:00
158ea1d43b
Add sqlite3 dependency
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-01-21 11:54:49 +01:00
52cc8e2fcf
Use "lan" as fallback TLD for DHCP generated domains
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-01-16 22:10:27 +01:00
607664c860
Update webpage.sh
...
Updated webpage.sh to include conditional forwarding options.
2018-01-14 21:01:08 -05:00
939806f021
piholeDebug.sh: Correct typo mistake
...
Signed-off-by: Vasilis Gerakaris <vgerak@gmail.com >
**By submitting this pull request, I confirm the following:**
`{please fill any appropriate checkboxes, e.g: [X]}`
- [x] I have read and understood the [contributors guide](https://github.com/pi-hole/pi-hole/blob/master/CONTRIBUTING.md ), as well as this entire template.
- [x] I have made only one major change in my proposed changes.
- [] I have commented my proposed changes within the code.
- [] I have tested my proposed changes, and have included unit tests where possible.
- [] I am willing to help maintain this change if there are issues with it later.
- [x] I give this submission freely and claim no ownership.
- [x] It is compatible with the [EUPL 1.2 license](https://opensource.org/licenses/EUPL-1.1 )
- [x] I have squashed any insignificant commits. ([`git rebase`](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html ))
2018-01-12 02:17:31 +02:00
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 >
2018-01-07 14:36:03 +01:00
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 >
2018-01-07 14:34:02 +01:00
afa2e9c2f7
Exchange hard-coded domain "localhost" by hard-coded address "127.0.0.1"
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2017-12-30 17:44:59 +01:00
8e0d76b63b
initiated -> initialized
...
Signed-off-by: Adam Warner <adamw@rner.email >
2017-12-24 13:26:32 +00:00
cca8412921
Use "echo -n" to avoid haveing newlines in the files
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2017-12-23 11:52:27 +01:00
d15a5ad5c1
Add required documentation in the source code
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2017-12-23 00:46:51 +01:00
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...
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2017-12-23 00:42:41 +01:00
8ca0582afc
Merge branch 'release/v3.2.1' into fix/DNSSEC_trustanchor
2017-12-21 10:56:37 -08:00
be0c457445
Sleep 30 seconds after reboot to be sure that the system is ready
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2017-12-21 12:42:28 +01:00
cfca367eef
Quickly verified in dnsmasq's source code: It has to be "trust-anchor" (with "-")
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2017-12-18 21:45:24 -05:00
8a243c5872
Insert also old trust anchor
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2017-12-18 21:45:15 -05:00
b30b3f3aeb
Update DNSSEC trust anchor
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2017-12-18 21:44:34 -05:00
Adam Warner