arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 14:58:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2467 from pi-hole/fix/dnsmasq-license

Browse Source 
Update dnsmasq config license
This commit is contained in:
Mark Drobnak 2018-10-17 11:56:41 -04:00 committed by GitHub
commit f87f3b9199
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
advanced/01-pihole.conf
View File

@ -1,13 +1,11 @@
# Pi-hole: A black hole for Internet advertisements # Pi-hole: A black hole for Internet advertisements
# (c) 2015, 2016 by Jacob Salmela # (c) 2017 Pi-hole, LLC (https://pi-hole.net)
# Network-wide ad blocking via your Raspberry Pi # Network-wide ad blocking via your own hardware.
# http://pi-hole.net
# dnsmasq config for Pi-hole
# #
# Pi-hole is free software: you can redistribute it and/or modify # Dnsmasq config for Pi-hole's FTLDNS
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 2 of the License, or # This file is copyright under the latest version of the EUPL.
# (at your option) any later version. # Please see LICENSE file for your rights under this license.
############################################################################### ###############################################################################
# FILE AUTOMATICALLY POPULATED BY PI-HOLE INSTALL/UPDATE PROCEDURE. # # FILE AUTOMATICALLY POPULATED BY PI-HOLE INSTALL/UPDATE PROCEDURE. #
@ -16,8 +14,8 @@
# IF YOU WISH TO CHANGE THE UPSTREAM SERVERS, CHANGE THEM IN: # # IF YOU WISH TO CHANGE THE UPSTREAM SERVERS, CHANGE THEM IN: #
# /etc/pihole/setupVars.conf # # /etc/pihole/setupVars.conf #
# # # #
# ANY OTHER CHANGES SHOULD BE MADE IN A SEPERATE CONFIG FILE # # ANY OTHER CHANGES SHOULD BE MADE IN A SEPARATE CONFIG FILE #
# OR IN /etc/dnsmasq.conf # # WITHIN /etc/dnsmasq.d/yourname.conf #
############################################################################### ###############################################################################
addn-hosts=/etc/pihole/gravity.list addn-hosts=/etc/pihole/gravity.list