09886a3f11
Add resolveconf config to pihole-FTL.service
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-25 10:11:11 +01:00
b87bcc8f5f
Modifications in pihole-FTL.service for FTLDNS
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-24 13:23:06 +01: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
5465ac9ba0
Merge pull request #1929 from pi-hole/fix/flushDB
...
pihole -f: Flush database
2018-02-17 17:45:15 +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
8a42ef431b
Fix Javascript warning when no password is set
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-02-11 21:49:12 -05:00
2cf1f0e8fc
Hide the password input when there is no password
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-02-11 14:07:02 -05:00
1a5c86d32e
Revert "Hide password textbox if there is no password"
...
This reverts commit 009fa2f1b7
2018-01-23 20:28:43 -05:00
c7219fbdff
Merge remote-tracking branch 'origin/development' into tweak/block-page-no-password
2018-01-21 09:09:36 -05: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
80307a3bcd
Remove update line from cron
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-01-12 15:43:15 +00: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
4efb533d2e
Create directories /etc/{var,log}/pihole on startup of pihole-FTL and set proper ownership
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-01 11:26:03 +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
a4c8f1a0a4
Merge pull request #1859 from pi-hole/new/extra-logging
...
Enable dnsmasq's extra logging feature
2017-12-28 22:49:43 +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
5c2dcb5e74
Enable dnsmasq's extra logging feature
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-21 16:42:55 +01: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
3c04dbb4ed
Update remote version at 17:59 as well as on reboot
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-21 12:33:08 +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
e3fa06d7ff
Merge pull request #1829 from keithbentrup/development
...
Must send HTTP headers before html
2017-12-13 13:37:32 -05:00
423280cee1
Merge pull request #1817 from jjssoftware/development
...
pihole.log permissions
2017-12-09 14:15:12 -08:00
45ab2a3d7a
send HTTP headers before HTML
...
Signed-off-by: Keith Bentrup <keith@keithbentrup.com>
2017-12-09 17:03:20 -05:00
05d015169c
Check for local version and branches every 10 minutes, check for remote versions only once a day
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-09 19:00:46 +01:00
28bed0041e
remove comment
...
Signed-off-by: Jacob Salmela <github@decoy.email>
2017-12-08 18:29:28 -06:00
6f03e30151
fixes #1537 by checking if systemctl is found
...
Signed-off-by: Jacob Salmela <github@decoy.email>
2017-12-08 18:23:55 -06:00
6ecd93d0c9
pihole.log permissions
...
This change makes pihole more friendly to the non-existence of the pihole.log file. This can help with systems that are configured to mount /var/log as a tmpfs volume. It may also help with systems where the pihole.log file is accidentally/unintentionally removed.
Further discussion around the details of this change are in https://github.com/pi-hole/pi-hole/issues/1798
2017-12-08 22:25:01 +00:00
a9a40ca46c
Useless cat. Consider 'cmd < file | ..' or 'cmd file | ..' instead.
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 23:27:40 +00:00
162a7b56fe
force mode is no longer referenced. Regression. Same with `domToRemoveList`
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 22:42:08 +00:00
2dc1851892
Allow passwords with spaces
...
e.g: `pihole -a -p "foo bar"`
Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-11-23 13:17:34 +11:00
9631519eb1
Merge pull request #1752 from pi-hole/new/bashupdatechecker
...
Add bash / cron based update checker for Pi-hole
2017-11-08 20:38:40 -06:00
90efa3b610
Simplify git subroutines
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-11-08 19:11:41 +01:00
009fa2f1b7
Hide password textbox if there is no password
2017-11-01 21:30:14 -04:00
5221767a70
Merge pull request #1735 from bcambl/debug_selinux
...
add SELinux checks to debug script
2017-10-30 13:07:36 +00:00
9492ff26c6
Merge pull request #1747 from pi-hole/tweak/gravity_update_time
...
Randomize gravity update time
2017-10-29 16:34:18 +01:00
DL6ER
Mark Drobnak
Ludovic Rousseau
DL6ER
ryanknapper
Adam Warner
Vasilis Gerakaris
Dan Schaper
Keith Bentrup
Jacob Salmela
Joe
WaLLy3K
Jacob Salmela
Adam Warner