Mcat12
a96b4d28e1
Merge pull request #1365 from pi-hole/adlistImprovements
...
Adlist improvements
7 years ago
Mcat12
ce86205df0
Use correct agent when downloading adaway.org list
...
See https://discourse.pi-hole.net/t/2278
7 years ago
Adam Warner
02040cd25d
We no longer need to do this, either
7 years ago
Adam Warner
bdc6bd4135
Don't need this comment anymore
7 years ago
Adam Warner
e720de401d
One file to rule them all, same functionality (made changes and want to go back to default? Delete your adlists.list)
7 years ago
Adam Warner
ce97896ffd
account for new `adlists.custom` file
7 years ago
DL6ER
d7b5870ba6
Use absolute path for pihole command in gravity.sh. Fixes #1318
7 years ago
Jacob Salmela
7a1a2dec67
update license to EUPL on core files
7 years ago
Markus Napp
66616eb0f0
Rename missing plurals check
8 years ago
Markus Napp
72a1fc3f64
Fix output for wildcards in gravity.sh
8 years ago
DL6ER
a8ac212ee6
Show number of wildcard blocked domains in gravity's summary
8 years ago
Promofaux
c2e1819098
This should not have been commented out. It's stopping any changes we make to the default lists getting out.
8 years ago
DL6ER
322cb2387b
Also accept the last line of the adlist file if there is no newline at the end
8 years ago
DL6ER
cd0c3f9418
Better output if file has not been downloaded because it has not been changed
8 years ago
DL6ER
efaee2b68b
Improvements for gravity (errors shouldn't be able to escape the black hole if even light cannot do this!)
8 years ago
Promofaux
a3d519b671
no need to remove list, because of echo >
8 years ago
Promofaux
8591f9d576
check for list before removing it
8 years ago
Promofaux
db89fa9881
initial support for additional hosts file
8 years ago
Mcat12
d8912fd0a7
Merge pull request #952 from pi-hole/fix/exit_codes
...
Fix/exit codes
8 years ago
Dan Schaper
d92646324c
Double worded
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
c9fe62a691
Clarify what the command is doing.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
2ec4acfe52
Begin fixing exit values.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Adam Warner
c97cfde9f9
Update gravity.sh
...
Only include domain part of lines that contain `/` e.g `www.fakenewswatch.com/megynkelly`
8 years ago
DL6ER
cdee6d55d3
Minor change
8 years ago
DL6ER
e5a1afaa26
Added another missing "done"
8 years ago
Mcat12
08e7b7e0ad
Fix typo
8 years ago
DL6ER
4945f33254
Added "-n" to first echo call
8 years ago
DL6ER
3fa05293fc
Fixed file permissions
8 years ago
DL6ER
27e5f2798d
Added missing "done." output
8 years ago
Adam Warner
99057ed859
Update var names from setupVars.conf in gravity.sh
8 years ago
Adam Warner
21fc6344bf
Merge pull request #849 from pi-hole/aManHasNoNameResolution
...
[BugFix] A man has no name resolution
8 years ago
Promofaux
9e4e1d1cb2
improve comments
8 years ago
Promofaux
60142cd960
remove reference to whitelist.sh (no longer exists) replace with `pihole -w`
8 years ago
Promofaux
4c853defb2
add if traps to check for existence of whitelist.txt / blacklist.txt
8 years ago
Adam Warner
e0ac109dd1
remove hostname insertion into gravity.list from gravity.sh
8 years ago
Adam Warner
7653b3d088
Remove pi.hole references in gravity.sh
8 years ago
Promofaux
d0826b2c33
Merge branch 'development' of https://github.com/airencracken/pi-hole into airencracken-dev
8 years ago
Marcus Hildum
ebbe1fc236
More consistency
...
Odd mix of variables quoted with and without no-op parameter expansion
(i.e. ${thing})
More ${thing} than not, make that the standard
8 years ago
Marcus Hildum
aac8e45397
Imbue gravity.sh with some consistency
...
Mish-mash of tabs and spaces used for indentation. Mostly tabs though,
so going with those. Also indenting blocks and enforcing the
loop statement; do
done
style over the newline for do since it seemed to be more common.
8 years ago
Adam Warner
8f9ff930b3
Merge pull request #823 from tuplink/EnableOrDisable
...
Enable or disable
8 years ago
Promofaux
9ab6df0e54
Merge branch 'development' into promoTweaksTheSecond
...
# Conflicts:
# advanced/Scripts/blacklist.sh
# advanced/Scripts/whitelist.sh
8 years ago
Tommy Huff
15d68467a1
attempt to fix
8 years ago
Tommy Huff
3b6ecc573e
fix conflict
...
Merge remote-tracking branch 'upstream/promoTweaksTheSecond' into EnableOrDisable
8 years ago
Tommy Huff
3ca3eaa62c
change restartdnsmasq to restartdns
8 years ago
Tommy Huff
dda448e050
use finction in pihole to restart dnsmasq
8 years ago
Tommy Huff
60873144ea
make last line of script return a new line been bugging me for awhile
8 years ago
Tommy Huff
a9d17c96be
include status at end of gravity so if it is disabled you will see it when running
8 years ago
Tommy Huff
7d7e17b351
add toggle to enable or disable pi-hole
8 years ago
Adam Warner
c71a976e76
kill off an old ugly hack
8 years ago
Marcus Hildum
0efda04920
Use heredocs instead of multiple calls to echo
...
There were a lot of places (like in help functions) that used multiple
echo calls instead of heredocs. Personal opinion but this seems cleaner.
8 years ago
Marcus Hildum
28eeaf201b
Standardize function declaration
...
There were no fewer than three styles of function declaration going
on in these files, so I attempted to standardize them to the typical
myfucn() {
}
style.
8 years ago
Promofaux
9aa38cf0ae
mv patternbuffer instead of cp, then no need to clean up
8 years ago
Promofaux
a7fa7466fb
remove no longer needed code
8 years ago
Promofaux
3f73c61cee
cache event horizon before white/blacklists are applied for quicker processing on white/blacklist calls of gravity
8 years ago
Promofaux
b88fe572fe
Whitelist/Blacklist domains directly in the Event Horizon.
8 years ago
Promofaux
59ba6f8aec
add flag to skip download of lists
8 years ago
Promofaux
25343da6b7
wrong variable name
8 years ago
Promofaux
60d17b97f5
spacing
8 years ago
Promofaux
8cb72d87e4
make IPv4/IPv6 checking more robust in gravity
8 years ago
Promofaux
49f48e2aaa
wrong word. #admincrimes
8 years ago
Promofaux
8c0f860601
Use systemctl/service calls instead of killall to restart/reload dnsmasq
8 years ago
Promofaux
7ee1110351
ugh. pihole.conf.
8 years ago
Promofaux
51c4c51d9e
Add trap to check existence of setupVars
8 years ago
Promofaux
fc4fe54099
standardise function naming
8 years ago
Promofaux
4c42f00a86
remove uses of ${SUDO} and root check from gravity. As this is handled by `pihole` command.
8 years ago
Promofaux
4f35aac6dd
transpose `$` and `"`
8 years ago
Dan Schaper
4418ca9e9f
Missing quote replacement.
8 years ago
Dan Schaper
07b7e8a1a6
Track down a couple more variable name changes.
8 years ago
Dan Schaper
7ae2fc37c0
Match up descriptive variable names with `setupVars.conf`. Rectifies Ubuntu 16.04 `gravity.list` bug.
8 years ago
Adam Warner
ac49e639bd
Fix #718
8 years ago
bcambl
21d4199a38
Merge branch 'development' into dns-hostname-fixes
8 years ago
Promofaux
3ed62d45f5
Source IP addresses from /etc/pihole/setupVars.conf
8 years ago
bcambl
640af300cb
additional hostname checks in gravity.sh
...
- Test if /etc/hostname exists before attempting to cat the file.
- Add alternative hostname discovery via hostname command
- Add an error message to stdout if unable to determine host fqdn
8 years ago
Promofaux
6796b8bdad
pass argument from pihole command to gravity for -f check
8 years ago
Promofaux
475d016029
hmmm
8 years ago
Promofaux
201304e678
fix variables in gravity to stop it using -f wether it's set or not
8 years ago
Promofaux
f6ac0d73b4
Add force delete option
8 years ago
Promofaux
ae47be0ce9
Add HelpFunc
8 years ago
Dan Schaper
024b741552
Merge pull request #490 from bcambl/fedora-armhf7
...
Fedora Support
8 years ago
Mcat12
4e95f4678f
Merge pull request #540 from pi-hole/bugfix/curl-redirect
...
Have `curl` auto-redirect
8 years ago
Dan Schaper
7670b4e380
Mahakala User Agen modernization
...
Update Curl User Agent for Maha list.
8 years ago
Dan Schaper
636a9123b8
Have `curl` auto-redirect
...
This should solve the redirection issue if a list is moved.
8 years ago
bcambl
27a9642090
check for sudo via 'command -v' instead of dkpg-query
8 years ago
Jim Liu
08e95ed606
Update gravity.sh
...
Change piholeIPfile to a permanent location.
8 years ago
Jim Liu
a5ad48aa18
Update gravity.sh
8 years ago
Promofaux
ad574f5e90
Replace kill with killall
8 years ago
Promofaux
4941a657bf
remove -s switch, as it turns out it worked afterall.
8 years ago
Promofaux
3d4bff9414
Add -s switch to kill command to increase compatability
8 years ago
Adam Warner
99a5b3a98a
remove all mentions of spinner
8 years ago
Promofaux
8514f42d0d
Correct variable name (Missing capital letter! whoops!)
8 years ago
Promofaux
0c0dd914f7
Fix source lists not being skipped if they are already up to date
8 years ago
Promofaux
c6405bc93b
Ensure addn-hosts value is updated in /etc/dnsmasq.d/01-pihole.conf if user has a custom value set in pihole.conf
8 years ago
nate
5347ee4896
Write verbose status of processes to debug log & Minor UI Fixes
8 years ago
Promofaux
d710b97276
Fix issue raised in #421 (Use variable instead of hardcoded path, do not delete user created pihole.conf!)
8 years ago
Promofaux
0e6e8040ba
Change spinstr to match install and uninstall scripts
8 years ago
nate
767b72fbfa
Merged branch development into PiHoleController
8 years ago
Mcat12
0fbf72bb09
Change dummy domain and show device's hostname in ping
...
* Change dummy domain
Allows users to access Pi-hole console with my.pi-hole.net instead of the IP address
* Cleaned up formatting
* Put device hostname at the top of the list
Changed my.pi-hole.net to pi.hole and placed it under the device hostname. This way, ping will return the device hostname but you still can access the web interface with pi.hole/admin
8 years ago
nate
bb66d559e7
Merge branch 'development'
...
Conflicts:
gravity.sh
8 years ago
nate
7b8fa3b922
Permissions changed for /etc/pihole and cleaned up some output
8 years ago
nate
28f2a1309e
Merge branch 'development'
...
Conflicts:
automated install/uninstall.sh
8 years ago