Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 18:53:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
3962 commits 8 branches 109 tags 27 MiB
Commit graph

3962 commits

This branch
This branch
All branches
Author SHA1 Message Date
DL6ER
e3d9cf0ac1
Merge pull request #2718 from Piskvor/basic-install-package-manager-typo 
Show $UPDATE_PKG_CACHE content in error message.
 2019-04-24 10:17:23 +02:00
Mark Drobnak
bd572d8843
Merge pull request #2717 from pi-hole/fix/teleporter-extension 
Fix teleporter backup file extension
 2019-04-23 13:23:43 -04:00
Jan Piskvor Martinec
037737d653 Show $UPDATE_PKG_CACHE content in error message. 
Fixes the typo in update_package_cache(), where the error message
 contained the color code twice, instead of the $UPDATE_PKG_CACHE text.

Signed-off-by: Jan Piskvor Martinec <github@piskvor.org>
 2019-04-23 16:02:25 +02:00
Mark Drobnak
d2c7c426de
Fix teleporter backup file extension 
Fixes #2714 

Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
 2019-04-22 19:43:26 -07:00
Mark Drobnak
1d09c6e47d
Merge pull request #2709 from pi-hole/fix/checkout_indentation 
Fix pihole checkout indentation
 2019-04-16 22:51:01 -04:00
DL6ER
84244b7cd5
Fix indentation in display of branches available during pihole checkout 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-04-16 18:30:04 +02:00
Mcat12
422680ee9f
Fix chronometer refresh incorrectly reading the long argument sleep time 
`-r` worked, but `--refresh` did not.

Fixes #2703

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-04-14 13:03:25 -07:00
Mark Drobnak
42c7653e99
Merge pull request #2696 from pi-hole/tweak/FTL-privacy-doc-link 
Add a link to the documentation on FTL privacy levels during install
 2019-04-07 15:12:10 -04:00
Mcat12
78c0c58946
Add a link to the documentation on FTL privacy levels during install 
Closes #2695

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-04-07 12:00:43 -07:00
Mark Drobnak
cae61614f4
Merge pull request #2688 from pi-hole/fix/2687 
Add Check to `pihole -q -exact` to ensure there is no `#` char preceding a space before the domain
 2019-03-28 23:20:41 -04:00
Adam Warner
a7f6c9b3a0
Ignore matches that start # using negative lookbehind 
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
 2019-03-29 00:08:04 +00:00
Mark Drobnak
5950b4bb78
Merge pull request #2646 from pi-hole/fix/FTL_arch_detect_rpm 
Don't fail when trying to detect OS architecture on RPM-based systems
 2019-03-24 15:23:05 -04:00
DL6ER
817b19888f
Merge branch 'development' into fix/FTL_arch_detect_rpm 2019-03-23 08:55:46 +01:00
Mark Drobnak
b64fb578fc
Merge pull request #2674 from NiGhTTraX/development 
Fix uninstalling lighttpd when it's not installed
 2019-03-15 22:11:34 -04:00
Andrei Picus
e9e92368b0 Fix uninstalling lighttpd when it's not installed 
Signed-off-by: Andrei Picus <NiGhTTraX@users.noreply.github.com>
 2019-03-15 15:05:58 +01:00
Dan Schaper
ffcb173a7f
Merge pull request #2672 from pi-hole/fix/test-version-pinning 
Pin Python package versions to the versions in the last successful build
 2019-03-15 07:04:40 -07:00
Mcat12
b9c9c2797f
Pin Python package versions to the versions in the last successful build 
The last successful build was
https://travis-ci.org/pi-hole/pi-hole/builds/500825408

When `testinfra` became `2.0.0`, it removed the deprecated features that
the tests currently use.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2019-03-13 20:14:21 -07:00
Mark Drobnak
204a4e459b
Merge pull request #2637 from TheNoim/patch-1 
Support pi hole behind a reverse proxy with ssl
 2019-03-13 22:12:00 -04:00
DL6ER
0a53e966ea
Merge pull request #2659 from pi-hole/tweak/warn_if_FTL_not_on_master 
Warn user during update if FTL is on a custom branch
 2019-03-03 09:34:11 +01:00
DL6ER
2e17c23333
Don't warn if user is on development as this branch is constantly updated 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-03-02 16:40:59 +01:00
DL6ER
63f3381a2b
Warn user if FTL is not on branch master 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-03-02 16:36:49 +01:00
Mark Drobnak
2292720fed
Merge pull request #2650 from mmphego/patch-1 
Update README.md
 2019-03-01 13:19:31 -05:00
Mpho Mphego
b77efa521f
Update README.md 
Removed the extra double quote.

Signed-off-by: Mpho Mphego <mpho112@gmail.com>
 2019-03-01 09:38:36 +02:00
Mpho Mphego
cfe221706b
Update README.md 
Changed badges from HTML code to markdown for consistency

Signed-off-by: Mpho Mphego <mpho112@gmail.com>
 2019-02-27 09:57:23 +02:00
Dan Schaper
54ae9d83b0 Stickler-lints 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2019-02-23 13:42:15 -08:00
Dan Schaper
293e2a8e80
Merge pull request #2647 from pi-hole/feature/curl_debug 
Use `curl` instead of `openssl` for debug upload.
 2019-02-23 09:11:02 -08:00
Dan Schaper
71cd6c137b Use curl instead of openssl for transmission of unmodified 
log file. We want ansi color codes to be sent.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2019-02-23 04:13:44 -08:00
DL6ER
0e14d11a20
Merge branch 'development' into new/gravitydb 2019-02-22 23:06:17 +01:00
DL6ER
bbc392caeb
More review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-22 22:49:02 +01:00
DL6ER
61840edb30
Fill comment field with NULL (default) instead of empty string and use a variable for the timestamp instead of periodically calling date 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-22 22:46:19 +01:00
DL6ER
9867b7fccf
Don't fail when trying to detect OS architecture on RPM-based systems 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-22 18:41:01 +01:00
Mark Drobnak
58f198626a
Merge pull request #2640 from pi-hole/new/DebugAdditions 
Add git status/diff to debug log
 2019-02-18 19:28:21 -05:00
Adam Warner
a145f1d931
Be more verbose with debug script output 
If output of `git status -s` is non-null display changes
if output of `git diff` is non-null, display diff

Signed-off-by: Adam Warner <adamw@rner.email>
 2019-02-18 22:32:53 +00:00
Mark Drobnak
9748f19172
Merge pull request #2639 from pi-hole/hotfix/v4.2.2 
Update development from hotfix/v4.2.2
 2019-02-18 13:54:08 -05:00
DL6ER
ba1e94d3d9
Merge pull request #2626 from pi-hole/hotfix/v4.2.2 
Pi-hole Core v4.2.2
 2019-02-18 18:36:13 +01:00
Nils Bergmann
cd9fadbc44
Remove protocol determination 
No protocol determination is neede, if you just use double slash.

Signed-off-by: Nils Bergmann <nilsbergmann@noim.io>
 2019-02-16 15:32:56 +01:00
Mark Drobnak
062a180a1c
Merge pull request #2621 from cryptomilk/development-fix 
A bunch of fixes for basic-install.sh
 2019-02-10 20:06:26 -05:00
Andreas Schneider
860ec1a7c4 basic_install: Use install for sudoers 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2019-02-10 08:45:03 +01:00
DL6ER
5ca1bfc11c
Delete /dev/shm/FTL-* files on (re)start of pihole-FTL 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-08 15:00:35 +01:00
Andreas Schneider
2f189cd076 basic_install: There is no pihole group, remove it 
Only a user has been created beforehand. Only some distributions create
a group with the same name based on their configuration. We cannot
assume this is always the default.

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2019-02-08 08:06:12 +01:00
Andreas Schneider
2f0e6a6dda basic_install: Make sure the PI_HOLE_CONFIG_DIR exists 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2019-02-08 08:06:12 +01:00
Andreas Schneider
f187b42a98 basic_install: Define webroot globally as a variable 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2019-02-08 08:06:02 +01:00
DL6ER
f9250d91a5
Explictly escape the escape. 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-06 19:17:13 +01:00
DL6ER
491c828661
Improved code, ensure that gravity.sh passes shellcheck as a whole 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-06 19:09:09 +01:00
DL6ER
644ec36e64
Review comments 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-06 18:57:48 +01:00
Andreas Schneider
838e1b19ec basic_install: Set permissons for PI_HOLE_DASHBOARD_DIR 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2019-02-06 10:41:37 +01:00
Andreas Schneider
d5bbb2b640 basic_install: Use a varibale for the pihole dashboard dir 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2019-02-06 10:40:47 +01:00
Andreas Schneider
dc91d4b1f9 basic_install: If a static interface is already set up we are done 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
 2019-02-06 07:50:21 +01:00
DL6ER
9984647ebb
After renaming column in regex, it also needs to be renamed in vw_regex 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-05 19:41:11 +01:00
DL6ER
ec5b16ef85
Fix incomplete comment 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2019-02-05 19:08:08 +01:00