Adam Warner
2ce40c3c07
Merge pull request #2132 from rwky/development
...
Fixed typo in README
2018-04-19 19:49:29 +01:00
Rowan
255cfb7d62
Fixed typo in README
...
Signed-off-by: Rowan Wookey <admin@rwky.net>
2018-04-19 19:45:11 +01:00
Adam Warner
8a327be400
Merge pull request #2130 from pi-hole/FTLDNS
...
Internal FTLDNS -> dev
2018-04-18 22:09:31 +01:00
DL6ER
1cae76b443
Merge pull request #2126 from pi-hole/FTLDNS-recursive-resolver
...
Add backend changes for supporting a local DNS server
2018-04-18 22:01:43 +02:00
DL6ER
828e8d2ae4
Merge pull request #2040 from pi-hole/FTLDNS
...
FTLDNS Integration
2018-04-18 20:20:39 +02:00
DL6ER
ce35509a40
Change command to "pihole -a localdnsport X"
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-18 17:30:51 +02:00
DL6ER
24b8b4e904
Add backend changes for supporting a local recursive DNS server
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-18 17:12:20 +02:00
Daniel (Fourdee)
c2c1dc7469
Ensuring bot pleasure
...
https://github.com/pi-hole/pi-hole/pull/2115#pullrequestreview-113066748
2018-04-18 04:38:07 +01:00
Daniel (Fourdee)
47c1071bb8
Minor
...
+ Add info in regards to disabling web server install:
https://github.com/pi-hole/pi-hole/pull/2115
2018-04-18 04:24:48 +01:00
Daniel (Fourdee)
e401651f09
Update https://github.com/pi-hole/pi-hole/pull/2115
...
+ Patch existing systems with the new variable changes using
'accountForRefactor'
+ Prompt user to install webserver
2018-04-18 04:11:32 +01:00
Mark Drobnak
1449def040
Merge pull request #2049 from pi-hole/tweak/readme
...
update donation and affiliate links. also link to trademark guideline…
2018-04-17 20:25:09 -04:00
Dan Schaper
d4d1ec2568
Merge pull request #2124 from pi-hole/development
...
Internal
2018-04-17 11:54:50 -07:00
Adam Warner
7455ac9bfb
Run chooseBlocklists on EVERY reconfigure, not only if the adlist file does not esist.
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-17 19:46:36 +01:00
Adam Warner
b6b1dcb275
delete adlists.list if user cancels out of this dialog
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-17 19:35:46 +01:00
Adam Warner
2e4f49a223
Default all to on, change up wording. This commit can be rolled back, it's just an option!
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-17 17:10:53 +01:00
Adam Warner
88d4108f92
- Add new whipstail to choose from example blocklists on new install
...
- remove adlists.default
- do not copy non-existent adlists.default on run of gravity
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-17 10:33:06 +01:00
Dan Schaper
c9f3c02cb7
Merge pull request #2027 from ravron/ravron-urls-in-query-strings
...
Prevent inadvertent blocking of good domains appearing in query strings
2018-04-16 17:31:51 -07:00
Dan Schaper
557372b312
Merge pull request #2119 from pi-hole/new/sticklerCI-extras
...
add some more linters to stickler
2018-04-15 18:28:00 -07:00
Adam Warner
18b24535fe
Lets try the correct name for csslint
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-15 23:46:52 +01:00
Adam Warner
20e0bca71d
add some more linters to stickler
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-15 23:45:36 +01:00
Adam Warner
6ba53c1ac0
Merge branch 'development' into FTLDNS
2018-04-15 20:46:13 +01:00
Adam Warner
699d419c71
Merge pull request #2116 from pi-hole/FTLDNS_UpdateCheck
...
Check for new updates without actually updating
2018-04-15 20:42:29 +01:00
Mark Drobnak
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
Adam Warner
e49a9096a5
accidentally a 'shift'
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-15 18:46:35 +01:00
Adam Warner
33148ba832
Add help text to pihole command to document new flag
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-15 18:30:13 +01:00
Adam Warner
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
Daniel (Fourdee)
3a483a1b20
install_web_server
...
+ Splits web interface and server into two variables.
+ Option to disable forced install of Lighttpd.
2018-04-15 02:08:16 +01:00
Adam Warner
310d33b8ee
Merge dev > FTLDNS fix merge conflicts
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-04-13 17:01:54 +01:00
Adam Warner
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
Adam Warner
36d9af10f0
Merge pull request #2108 from LudovicRousseau/fix_No_such_file_or_directory
...
Fix sed: can't read /etc/pihole/pihole-FTL.conf: No such file or directory
2018-04-13 16:47:59 +01:00
Dan Schaper
0c8fcbc684
Merge pull request #2105 from pi-hole/feature/self_dco
...
Do not require DCO for Pi-hole Org members with GPG signed commits.
2018-04-13 05:42:04 -07:00
Ludovic Rousseau
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
Ludovic Rousseau
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
Ludovic Rousseau
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
Ludovic Rousseau
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
Mark Drobnak
c2fcbbb0c6
Merge pull request #2090 from Razvici/master
...
Update pihole locahost probe for DNS status
2018-04-12 11:17:33 -04:00
Jacob Salmela
8e82bf69d8
update wallet addresses
...
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
2018-04-11 20:40:35 -05:00
Jacob Salmela
284f9e3f2f
implement mcats request. removed 'the'
...
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
2018-04-11 20:38:56 -05:00
Dan Schaper
952f1271b4
Do not require DCO for Pi-hole Org members with GPG signed commits.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-04-11 10:13:09 -07:00
Dan Schaper
250b445eee
Split declaration and population for stickler.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-04-10 21:37:04 -07:00
Mark Drobnak
331472b592
Merge pull request #1999 from pi-hole/tweak/RedundantInstallCode
...
adlists.default no longer used. No need to reference it.
2018-04-06 00:17:45 -04:00
DL6ER
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
Razvan Radu
7361d5d3ea
Update pihole lolcahost probe for DNS status
...
Signed-off-by: Razvan Radu <ramset@gmail.com>
2018-04-05 11:14:39 -06:00
DL6ER
6086614274
Add "-l, privacylevel" description to "pihole -a"
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-04-04 18:10:23 +02:00
Adam Warner
6bb4780d32
Merge pull request #2077 from pi-hole/tweak/FTLDNSExperiments
...
FTLDNS tweaks
2018-04-04 17:00:03 +01:00
Adam Warner
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
DL6ER
0f17712f6c
Merge pull request #2085 from pi-hole/FTLDNS-privacylevels
...
Backend changes needed to be able to set the privacy level
2018-04-04 14:41:16 +02:00
DL6ER
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
Jacob Salmela
fbee18e24d
Merge pull request #2056 from pi-hole/release/v3.3.1
...
Pi-hole core v3.3.1
2018-04-02 19:29:39 -05:00
Adam Warner
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