be3a21ae07
Put quotes at ends of strings
...
Signed-off-by: David Haguenauer <ml@kurokatta.org >
2019-05-14 15:20:28 -04:00
69081a9175
Drop indirection from install_dependent_packages
...
Previously, install_dependent_packages would receive an array variable
name as its single parameter, and would use variable indirection to
access it; this change simplifies that function so that it instead
receives the expanded array.
Signed-off-by: David Haguenauer <ml@kurokatta.org >
2019-05-14 15:20:28 -04:00
ab2f8a0c09
Quote variables in basic-install.sh
...
This greatly reduces the number of warnings emitted by ShellCheck, and
in turn should make it more likely that errors are caught in the
future.
Signed-off-by: David Haguenauer <ml@kurokatta.org >
2019-05-14 15:20:28 -04:00
b961a501bb
Merge pull request #2611 from pi-hole/new/gravitydb
...
Store blocking domains in a database
2019-05-12 18:46:47 -04:00
8e1bf6e3d4
Merge branch 'development' into new/gravitydb
...
# Conflicts:
# advanced/Scripts/list.sh
# gravity.sh
# pihole
2019-05-12 15:20:52 -07:00
d6756eb46b
Merge pull request #2730 from pvogt09/development
...
Adds world readable attribute to files created by Pi-hole to circumve…
2019-05-12 15:44:20 -04:00
efbd42f7b5
Moves creation of pihole user before FTL installation
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
2019-05-12 11:27:25 +02:00
3f90261520
Moves chmod after every creation of ${destination} instead of end of function
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
2019-05-12 11:25:48 +02:00
ff5894d772
Merge pull request #2744 from pi-hole/fix/cron-job-errors-untagged
...
Fix for preventing git error message in cron logs
2019-05-11 22:59:32 -04:00
225285cb97
Removes chmod for ${source} and superfluous chmod for ${destination}
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
2019-05-11 11:14:07 +02:00
3220e2b978
Fix for preventing git error message in cron logs
...
Fix to prevent "fatal: No names found, cannot describe anything" git message during scheduled update checks
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-11 10:57:44 +02:00
54ae458b61
Merge pull request #2733 from pi-hole/fix/debug-curl
...
Pi-hole Debug - tricorder upload function calls
2019-05-11 10:54:30 +02:00
e076db5a4e
Changes ownership of macvendor.db to pihole
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
2019-05-10 11:19:28 +02:00
a3d2a1062f
Makes blocklists world readable
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
2019-05-10 11:13:19 +02:00
2e6198077d
chmod 644 adlists.list
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
2019-05-09 12:23:44 +02:00
55ab3b2dc7
Merge pull request #2739 from pi-hole/new/stickermule_reflink
...
README StickerMule URL
2019-05-07 23:26:20 -04:00
bdc8cf2bc8
Merge pull request #2738 from pi-hole/fix/untagged_version_fresh_install
...
Fix Untagged display on new installs
2019-05-07 23:25:33 -04:00
74836bebe4
README StickerMule URL
...
Change StickerMule reflink to Team Pi-hole link.
2019-05-07 11:10:51 -07:00
95150a5d85
Clone twenty instead of only one commit when installing Pi-hole. This ensures that we clone at least one tagged commit in case we need to push changes to master.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-07 19:42:11 +02:00
4d23b3267f
Adds X to chmod for git operations
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
2019-05-07 10:46:16 +02:00
e19adccd9c
Moves chmod for /var/www/html into INSTALL_WEB_SERVER block
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
2019-05-05 22:34:13 +02:00
a25f331e83
Adds chmod 644 for /var/www and /var/www/html
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
2019-05-05 09:20:49 +02:00
69c06ba6fe
Sets permissions for dnsmaq.conf
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
2019-05-05 00:32:10 +02:00
8abeb2204b
Merge pull request #2735 from pi-hole/fix/gravity-blocked-domain
...
Fix incorrect adlist query when an adlist is blocked during gravity
2019-05-04 23:14:49 +02:00
ec06fd0ad4
Fix incorrect adlist query when an adlist is blocked during gravity
...
hosts-file.net was hard-coded as the domain to check instead of the
actual domain.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2019-05-04 11:35:21 -07:00
a904c183df
Use printf to escape domain content. This prevents possible SQL injection issues
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-04 18:25:11 +02:00
5246b3e496
Explicitly escape backslash in ESCAPE clause. This has been suggested by Stickler bot.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-04 13:24:36 +02:00
f80fdd7e83
Improve comments
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-04 13:19:50 +02:00
6ba58896d2
Simplify code
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-04 13:15:30 +02:00
3aa838bbe4
Implement black- and whitelist searching with SQL statements. We use the ESCAPE clause in the LIKE query as the underscore "_" wildcard matches any single character but we want to suppress this behavior (underscores can be legitimate part of domains)
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-04 13:02:14 +02:00
2c3a27e9c7
Replaces cp chmod with install and add read permission to repository files after checkout and pull
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
2019-05-03 12:27:56 +02:00
5532df24e4
Pi-hole Debug - tricorder upload function calls
...
Fix tricorder upload function calls to use new curl function.
2019-05-03 02:46:27 -07:00
b3898b9b2a
Merge pull request #2732 from pi-hole/dschaper-patch-1
...
Update cryptocoin addresses
2019-05-03 02:42:41 -07:00
9ce84714cd
Update cryptocoin addresses
...
We no longer have access to the old coinbase account. Updating to new Coinbase Commerce account.
2019-05-02 18:08:10 -07:00
0bc112ce52
Query only those columns we actually use when showing domains on the CLI. Show date of last modification instead of addition date for domains.
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-02 17:11:39 +02:00
d46ff1d2d7
Remove UNIQUE on gravity table as the only column is already PRIMARY KEY. Primary keys must contain UNIQUE values, and cannot contain NULL values
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-01 22:08:30 +02:00
0cfecd31d3
Invert logic to reduce nesting
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-01 22:07:14 +02:00
008e88b84b
Only migrate legacy list files when we create gravity.db in the same gravity run
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-01 18:04:31 +02:00
2f698904e4
Use PRIMARY KEY instead of NOT NULL also in gravity and info tables
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-01 18:03:35 +02:00
106f079afc
Improve indentation (single tab) in SQLite template
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-01 17:57:23 +02:00
6c1e3a17f7
Remove NOT NULL constraint on list ids as this is implied by PRIMARY KEY (even though most, if not all, examples on the web still use both attributes at the same time)
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-01 17:54:29 +02:00
540c57f755
Add comment for automigrated list entries
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-01 17:51:25 +02:00
5e26e8245b
Order results of queries to list views by id key
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-01 17:51:10 +02:00
983117d788
Add id (primary key, autoincrement) field to lists tables
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-01 17:47:15 +02:00
b372f808dd
Fix lint errors
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-01 17:06:14 +02:00
bc9b623638
Modify query.sh to use the gravity database
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-01 16:56:16 +02:00
d5781fb110
Fix extra space in front on END statement in CREATE TRIGGER commands
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-01 16:38:41 +02:00
487718512d
Remove DISTINCT attribute from views. They are not needed as the corresponding data is obtained from fields with UNIQUE attribute so duplications are already prevented at domain insertion. The elimination of the duplication check on imort through the views slightly reduces the load during import (I observed about 8 percent time saved on my NanoPi NEO).
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2019-05-01 16:37:23 +02:00
8a92fb24c4
Incorporates changes requested by @Mcat12
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
2019-05-01 11:20:26 +02:00
5c575e73c7
Adds world readable attribute to files created by Pi-hole to circumvent #2724
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com >
2019-04-30 22:41:12 +02:00
