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
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
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
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
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
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
2292720fed
Merge pull request #2650 from mmphego/patch-1
...
Update README.md
2019-03-01 13:19:31 -05:00
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
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
54ae9d83b0
Stickler-lints
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2019-02-23 13:42:15 -08:00
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
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
0e14d11a20
Merge branch 'development' into new/gravitydb
2019-02-22 23:06:17 +01:00
bbc392caeb
More review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-02-22 22:49:02 +01:00
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
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
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
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
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
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
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
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
860ec1a7c4
basic_install: Use install for sudoers
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org >
2019-02-10 08:45:03 +01:00
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
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
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
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
f9250d91a5
Explictly escape the escape.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-02-06 19:17:13 +01:00
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
644ec36e64
Review comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-02-06 18:57:48 +01:00
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
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
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
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
ec5b16ef85
Fix incomplete comment
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-02-05 19:08:08 +01:00
c3c60e10f1
Rename regex field from domain to filter because this described better what it is
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-02-05 19:07:12 +01:00
8a2363621d
Rename fields from DateAdded to dateadded
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-02-05 19:06:46 +01:00
dbbf21071b
Invert logic to use ENABLED instead of DISABLED. We make sure to set "enabled = 1 WHERE enabled IS NULL" in gravity_store_in_database()
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-02-05 19:05:11 +01:00
e967fe2266
Merge pull request #2612 from pi-hole/hotfix/v4.2.1
...
Remove user/group from dnsmasq config
2019-02-03 11:36:57 -08:00
b5c7657e01
Merge pull request #2614 from pi-hole/hotfix/v4.2.1
...
Merge v4.2.1 hotfix to dev
2019-02-03 11:36:00 -08:00
680d6e2d31
Merge branch 'release/v4.2' into development
...
# Conflicts:
# automated install/basic-install.sh
2019-02-03 11:14:09 -08:00
7a19d24058
Remove user/group from dnsmasq config
...
In the case that FTL is started under root, dnsmasq changes the user to
pihole due to this setting. The shared memory is created before this
switch, and may cause issues such as failing to delete or reallocate
the shared memory.
These config lines were necessary before dnsmasq became part of FTL, but
now since dnsmasq runs under FTL, we can configure the user/group
through FTL.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2019-02-03 10:55:18 -08:00
995ee41d6b
Merge pull request #2600 from pi-hole/release/v4.2
...
Release v4.2
2019-02-03 08:52:07 -08:00
b2f4385232
Avoid infinity loop if gravity optimization fails
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-02-03 17:05:00 +01:00
1f9a7d0b0c
Only run VACUUM on "pihole -g -o"
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-02-03 17:01:38 +01:00
d5feffa117
Do not backup the database
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-02-03 16:45:19 +01:00
fc62cf7e2f
Only run VACUUM on "full" gravity runs
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-02-03 16:45:06 +01:00
93f1859bab
Store regex in gravity.db as well
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-02-03 15:13:18 +01:00
dcf0a605cf
Use views for all tables and set disabled column to false for those tables that support it
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-02-03 14:14:14 +01:00
710036adae
Add DISABLED field to white- and blacklist defaulting to false. The two views respect the DISABLED fields for both lists.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-02-03 13:34:08 +01:00
