Adam Warner
05d8a7f6be
Merge pull request #2147 from pi-hole/fix/borkedUpdate
...
Restore functionality to `pihole -up` broken in #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
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
f2cc2f433c
Merge pull request #2140 from pi-hole/FTLDNS-gravity-simplelists
...
Use domain list format for black.list and gravity.list
6 years ago
Dan Schaper
858aa6255c
Merge pull request #2145 from pi-hole/fix/2115
...
Add missing `/` to line 1511
6 years ago
bcambl
1d8ea9e869
Fix static IP checking on Fedora
...
This bug was introduced by #1758 where the CIDR was removed from the static IP check.
The CIDR was acting as a boundary so we need to test for a boundary or a slash character.
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
Adam Warner
8ead0b5483
@fourdee dropped this: `/`
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Fauxsys
72c081cfd6
Fix for unattended installations #1767 #1768 #1834
...
Removed updatePihole() function and updated if/then statements in installPihole() and main(). Corrected minor typos.
Signed-off-by: Fauxsys <fiber.cipher@gmail.com>
6 years ago
Mark Drobnak
1f701c94a7
Merge pull request #2115 from Fourdee/Install-Web-Server
...
--disable-install-webserver
6 years ago
Dan
acfc49fd41
Merge branch 'development' into Install-Web-Server
6 years ago
Adam Warner
9c29bd627e
fix user blacklisting
6 years ago
DL6ER
d24b141d8b
Get rid of numBlocked file, FTLDNS can now determine number of domains thanks to the new lists format
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
DL6ER
bac9e005ae
Generate gravity.list and black.list in simple domain lists format for FTLDNS. Leave local.list in HOSTS format
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
Daniel (Fourdee)
60bcca54eb
Minor
...
+ indentation
6 years ago
Daniel (Fourdee)
eccea8a911
Minor
...
+ Fix indentation
+ Stick with case, add "On" to provide INFO print out, although its not
technically required as INSTALL_WEB_SERVER=true is default value.
6 years ago
Mark Drobnak
0833d0d8d5
Merge pull request #2133 from mbologna/patch-1
...
Fix: add psmisc as dependency
6 years ago
Michele Bologna
55fce489bc
Fix: add psmisc as dependency
...
Debian 9.4 does not install `psmisc` by default and the following error will happen during installation:
```
[✗] /usr/local/bin/pihole: line 353: killall: command not found
/usr/local/bin/pihole: line 364: killall: command not found
```
This patch adds `psmisc` (that contains `killall`) as dependency
Signed-off-by: Michele Bologna <michele.bologna@gmail.com>
6 years ago
Adam Warner
2ce40c3c07
Merge pull request #2132 from rwky/development
...
Fixed typo in README
6 years ago
Rowan
255cfb7d62
Fixed typo in README
...
Signed-off-by: Rowan Wookey <admin@rwky.net>
6 years ago
Adam Warner
8a327be400
Merge pull request #2130 from pi-hole/FTLDNS
...
Internal FTLDNS -> dev
6 years ago
DL6ER
1cae76b443
Merge pull request #2126 from pi-hole/FTLDNS-recursive-resolver
...
Add backend changes for supporting a local DNS server
6 years ago
DL6ER
828e8d2ae4
Merge pull request #2040 from pi-hole/FTLDNS
...
FTLDNS Integration
6 years ago
DL6ER
ce35509a40
Change command to "pihole -a localdnsport X"
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
DL6ER
24b8b4e904
Add backend changes for supporting a local recursive DNS server
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
Daniel (Fourdee)
c2c1dc7469
Ensuring bot pleasure
...
https://github.com/pi-hole/pi-hole/pull/2115#pullrequestreview-113066748
6 years ago
Daniel (Fourdee)
47c1071bb8
Minor
...
+ Add info in regards to disabling web server install:
https://github.com/pi-hole/pi-hole/pull/2115
6 years ago
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
6 years ago
Mark Drobnak
1449def040
Merge pull request #2049 from pi-hole/tweak/readme
...
update donation and affiliate links. also link to trademark guideline…
6 years ago
Dan Schaper
d4d1ec2568
Merge pull request #2124 from pi-hole/development
...
Internal
6 years ago
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>
6 years ago
Adam Warner
b6b1dcb275
delete adlists.list if user cancels out of this dialog
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
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>
6 years ago
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>
6 years ago
Dan Schaper
c9f3c02cb7
Merge pull request #2027 from ravron/ravron-urls-in-query-strings
...
Prevent inadvertent blocking of good domains appearing in query strings
6 years ago
Dan Schaper
557372b312
Merge pull request #2119 from pi-hole/new/sticklerCI-extras
...
add some more linters to stickler
6 years ago
Adam Warner
18b24535fe
Lets try the correct name for csslint
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
20e0bca71d
add some more linters to stickler
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
6ba53c1ac0
Merge branch 'development' into FTLDNS
6 years ago
Adam Warner
699d419c71
Merge pull request #2116 from pi-hole/FTLDNS_UpdateCheck
...
Check for new updates without actually updating
6 years ago
Mark Drobnak
d4870b3854
Merge pull request #2053 from pi-hole/tweak/debug-logs
...
Get head and tail of pihole-FTL.log during debug process
6 years ago
Adam Warner
e49a9096a5
accidentally a 'shift'
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
33148ba832
Add help text to pihole command to document new flag
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
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>
6 years ago
Daniel (Fourdee)
3a483a1b20
install_web_server
...
+ Splits web interface and server into two variables.
+ Option to disable forced install of Lighttpd.
6 years ago
Adam Warner
310d33b8ee
Merge dev > FTLDNS fix merge conflicts
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
8b5dcc3872
Match change made by 7edab27
to prevent merge conflict
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
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
6 years ago
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.
6 years ago
Ludovic Rousseau
7edab27e53
Stylistic change to use an explicit if/then/fi
...
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
6 years ago
Ludovic Rousseau
9b3531f634
Fix stylistic issue
...
Expand variable using ${FTLconf}
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
6 years ago
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>
6 years ago