Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-04-24 00:00:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use both old and new strings for detecting whether this is a Pi-hole dnsmasq config file

Browse source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2019-04-26 16:16:30 +02:00
parent a2a7e80007
commit 0efc46260f
No known key found for this signature in database
GPG key ID: 00135ACBD90B28DD
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gravity.sh
View file

@ -20,8 +20,9 @@ source "${regexconverter}"
basename="pihole"
PIHOLE_COMMAND="/usr/local/bin/${basename}"
PIHOLE_USER="pihole"
PIHOLE_GROUP="pihole"
DATABASE_USER="pihole"
DATABASE_GROUP="www-data"
DATABASE_PERMISSIONS="0660"
piholeDir="/etc/${basename}"
@ -86,7 +87,8 @@ fi
# Generate new sqlite3 file from schema template
generate_gravity_database() {
sqlite3 "${gravityDBfile}" < "${gravityDBschema}"
chown $PIHOLE_USER:$PIHOLE_GROUP "${gravityDBfile}"
chown ${DATABASE_USER}:${DATABASE_GROUP} "${piholeDir}" "${gravityDBfile}"
chmod ${DATABASE_PERMISSIONS} "${piholeDir}" "${gravityDBfile}"
}
# Import domains from file and store them in the specified database table