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
4691 commits 8 branches 109 tags 27 MiB
Commit graph

1169 commits

Author SHA1 Message Date
DL6ER
2809579dd7
Refine regex filter generation 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-17 14:59:21 +02:00
DL6ER
c7afe3e9a4
Please stickler by making clear that the variable regexFile is declared outside of this routine 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-17 14:46:26 +02:00
DL6ER
cd026cd865
Add comment where regexList is defined 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-17 14:43:33 +02:00
DL6ER
bc705aac03
Add automated wildcard list -> regex filter conversion 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-17 14:39:19 +02:00
Rob Gill
23adbf9540
remove quotes 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-15 14:45:27 +10:00
Rob Gill
a7347238e6
$adListsList replace filename in text 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-15 14:42:30 +10:00
Rob Gill
bf55666492
Appease stickler. 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-13 16:29:07 +10:00
Rob Gill
8ab0b0e460
colfile 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-13 16:25:43 +10:00
Rob Gill
b8e1849cec
wildcardlist 
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-13 16:19:07 +10:00
Rob Gill
45a8eda49b
Stop grep leak in query 
Fix grep error leak from #1805

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
 2018-06-13 16:08:21 +10:00
DL6ER
d254d6075a
First step from wildcards to regex lists for blocking 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-06-06 19:26:56 +02:00
Adam Warner
f5541860bc
Don't run the installer when doing ftl checkout, instead just run the ftl install functions 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-06-02 09:56:08 +01:00
Mark Drobnak
ab45360808
Merge pull request #1954 from ryanknapper/adlist.lists 
Prevent redundant entries from being added to Adlists.list
 2018-05-31 14:58:16 -04:00
Mark Drobnak
9fd70cbdf9
Merge pull request #2057 from pi-hole/fix/debug-empty-ports 
debug script: fix empty ports on some systems
 2018-05-30 21:48:53 -04:00
Mark Drobnak
f568012b9d
Merge pull request #2070 from pi-hole/new/debug-locale 
Get user locale when debugging
 2018-05-14 16:43:05 -04:00
DL6ER
2ef76d5e31
Remove LOCAL_DNS_PORT support 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-05-04 22:19:39 +02:00
Adam Warner
a6e4b0fea5
- Test for existence of remote non-master branch of FTL before attemtping to check for update 
- Move some functions from checkout to basic-install
- provide helpful error message on downlaod not existing

Signed-off-by: Adam Warner <adamw@rner.email>
 2018-05-01 23:15:26 +01:00
MichaIng
43f19034b9
"INSTALL_WEB" renamed to "INSTALL_WEB_INTERFACE" #2115 
+ Small fix, as due to PR https://github.com/pi-hole/pi-hole/pull/2115 variable "INSTALL_WEB" was renamed into "INSTALL_WEB_INTERFACE".
 2018-04-28 15:17:29 +02:00
Adam Warner
ceaf4bc6bc
Some extra code made it's way into the dev branch. Not entirely sure how that happened... related to #2115 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-23 20:46:57 +01:00
Dan
acfc49fd41
Merge branch 'development' into Install-Web-Server 2018-04-22 09:23:11 +01:00
DL6ER
ce35509a40
Change command to "pihole -a localdnsport X" 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-18 17:30:51 +02:00
DL6ER
24b8b4e904
Add backend changes for supporting a local recursive DNS server 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-18 17:12:20 +02:00
Adam Warner
6977f655e3
fix a typo 
comment out some unused variables, but not deleting them in case there is a plan for them in future...

Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-15 22:08:55 +01:00
Adam Warner
e6fc9dc75d
disable 2016 in two places and declare local variables 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-15 22:00:14 +01:00
Adam Warner
b57b3f4588
Disable SC2001 for generation of the_os 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-15 21:36:50 +01:00
Adam Warner
776ae92416
fix some shellcheck/stickler compaints in debug script 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-15 21:33:10 +01:00
Adam Warner
6ba53c1ac0
Merge branch 'development' into FTLDNS 2018-04-15 20:46:13 +01:00
Mark Drobnak
d4870b3854
Merge pull request #2053 from pi-hole/tweak/debug-logs 
Get head and tail of pihole-FTL.log during debug process
 2018-04-15 14:23:25 -04:00
Adam Warner
bca23dd896
Allow passing of --check-only to update script. 
Don't run installer for updating web files, it's handled by getGitFiles.
I think this works...

Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-15 18:25:35 +01:00
Daniel (Fourdee)
3a483a1b20 install_web_server 
+ Splits web interface and server into two variables.
+ Option to disable forced install of Lighttpd.
 2018-04-15 02:08:16 +01:00
Adam Warner
310d33b8ee
Merge dev > FTLDNS fix merge conflicts 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-13 17:01:54 +01:00
Adam Warner
8b5dcc3872
Match change made by 7edab27 to prevent merge conflict 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-13 16:53:57 +01:00
Ludovic Rousseau
7edab27e53 Stylistic change to use an explicit if/then/fi 
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
 2018-04-13 12:19:55 +02:00
Ludovic Rousseau
9b3531f634 Fix stylistic issue 
Expand variable using ${FTLconf}

Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
 2018-04-13 11:48:34 +02:00
Ludovic Rousseau
d8f85a8981 Avoid a "No such file or directory" error 
Check the file /etc/pihole/pihole-FTL.conf exists before trying to use
it.
without the patch I get, each day, in my logs:
sed: can't read /etc/pihole/pihole-FTL.conf: No such file or directory

I use a variable FTLconf to not repeat the file name twice.

Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
 2018-04-13 11:16:58 +02:00
Ludovic Rousseau
3b229489c2 Fix regex to find DBFILE= from configuration file 
The regex ^\s^.DBFILE\s*=\s* does not work to match "DBFILE="
I don't know what the second '^' is used for.

With the change I now have the results:

DBFILE=/foo/bar
-> /foo/bar

  DBFILE=/foo/bar
-> /foo/bar

 # DBFILE=/foo/bar
-> /etc/pihole/pihole-FTL.db

xDBFILE=/foo/bar
-> /etc/pihole/pihole-FTL.db

Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
 2018-04-13 11:16:50 +02:00
Jacob Salmela
5ffc3561ed
implement dschapers suggestions--better command, less subshells, and finer formatting 
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
 2018-04-11 20:35:51 -05:00
Dan Schaper
250b445eee
Split declaration and population for stickler. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-04-10 21:37:04 -07:00
DL6ER
82d5afe996
Silence error in log flush subroutine when no pihole-FTL.conf can be found 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-05 22:28:55 +02:00
DL6ER
6086614274
Add "-l, privacylevel" description to "pihole -a" 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-04 18:10:23 +02:00
Adam Warner
6bb4780d32
Merge pull request #2077 from pi-hole/tweak/FTLDNSExperiments 
FTLDNS tweaks
 2018-04-04 17:00:03 +01:00
Adam Warner
631f5b4848 Change order of updatable components to match the end output 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-04 16:35:11 +01:00
DL6ER
4941e0f8ad
Backend changes needed to be able to set the privacy level 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-04-04 13:12:39 +02:00
Adam Warner
f37b2bc7c1
move call to get_binary_name into FTLcheckUpdate() to avoid having to run that first 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-02 23:22:06 +01:00
Adam Warner
56278c6394
Fix shellcheck complaints 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-02 22:06:36 +01:00
Adam Warner
b1d6c03190
Break out binary name funtion to it's own function 
Remove duplicate code. get_binary_name is now in the install script
Add some "version" checking to ftl download when using an alt branch, uses checksum
Greatly simplify update process. Source pihole-FTL version checker from basic-install.sh
Always run install script to finalise changes.
Install script now outputs versions after an update
(This is a Squash of previous work into one commit)

Signed-off-by: Adam Warner <adamw@rner.email>
 2018-04-02 21:53:32 +01:00
Mark Drobnak
bb9a18ef08
Merge pull request #1987 from ryanknapper/patch-1 
Proper output for debug CPU detection
 2018-04-02 00:00:14 -04:00
Jacob Salmela
1a275ba184
debug user locale; improve function to parse variables and files 
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
 2018-04-01 06:40:48 -05:00
Perflyst
3390fbf238 Add RaspberryPi 3B+ 
Signed-off-by: Perflyst <mail@perflyst.de>
 2018-03-27 12:23:01 +02:00
Jacob Salmela
68c27eb2a1
add label to x-header so you know which one is being evaluated 
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
 2018-03-25 21:27:40 -05:00
Jacob Salmela
143e75d213
fix empty ports on some systems 
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
 2018-03-25 09:39:29 -05:00
Adam Warner
fbab930cb1
Allow install script to install FTL instead of the checkout script. Utilises the /etc/pihole/ftlbranch file. 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-03-23 22:46:41 +00:00
Jacob Salmela
d9d3caec22
new head tail function and get head tail of pihole-FTL.log instead of just head 
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
 2018-03-23 06:56:40 -05:00
Jacob Salmela
7159ecb632
reduce ping times for faster script completion 
Signed-off-by: Jacob Salmela <jacob.salmela@pi-hole.net>
 2018-03-23 00:11:21 -05:00
Adam Warner
76cb129d3c
don't forget master and development branches! 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-03-07 21:48:09 +00:00
Adam Warner
246d5cd587
store checked out FTL branch in /etc/pihole/ftlbranch 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-03-07 21:41:00 +00:00
Ryan Knapper
5ecfc58e5f
Require exact match 
Updated to require an exact match to reduce false-positives, as suggested by DL6ER.

Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>
 2018-02-28 13:06:07 -05:00
Ryan Knapper
c17d95bfed
Proper output for debug CPU detection 
Inserted "log_write" to properly output CPU detection lines.

Signed-off-by: Ryan Knapper (ryanknapper@gmail.com>
 2018-02-19 10:22:28 -05:00
Mark Drobnak
f14184df30
Merge pull request #1982 from LudovicRousseau/master 
Create blacklist.txt if not existant
 2018-02-18 15:32:01 -05:00
Ludovic Rousseau
47bbea9ba7 Use " " to protect parameter substitution 
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
 2018-02-18 21:20:04 +01:00
Mark Drobnak
7265935cd4
Merge pull request #1915 from ryanknapper/development 
Add conditional forwarding options to webpage.sh
 2018-02-18 12:51:46 -05:00
Ludovic Rousseau
b7891f92a5 Create blacklist.txt if not existant 
Closes: https://github.com/pi-hole/pi-hole/issues/1888

Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
 2018-02-18 14:19:49 +01:00
DL6ER
b8eaa9a527
Use double quotes to precent globbing and word splitting 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-02-17 13:01:00 +01:00
DL6ER
5d274008db
Use possibly user-defined database location when flushing 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-02-17 12:58:57 +01:00
Ryan Knapper
f2b3752f3d
lan to local 
Reduced differences.

Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>
 2018-02-07 17:08:55 -05:00
Ryan Knapper
36945a67d0
Prevent redundant entries in to adlists.list 
Grep ${args[3]} and only add if grep -c -eq 0

Signed-off-by: Ryan Knapper <ryanknapper@gmail.com>
 2018-02-07 17:04:10 -05:00
DL6ER
4c249a1186
Flush most recent 24 hours from FTL's database 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-21 13:48:13 +01:00
DL6ER
158ea1d43b
Add sqlite3 dependency 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-21 11:54:49 +01:00
DL6ER
52cc8e2fcf
Use "lan" as fallback TLD for DHCP generated domains 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-16 22:10:27 +01:00
ryanknapper
607664c860
Update webpage.sh 
Updated webpage.sh to include conditional forwarding options.
 2018-01-14 21:01:08 -05:00
Vasilis Gerakaris
939806f021
piholeDebug.sh: Correct typo mistake 
Signed-off-by: Vasilis Gerakaris <vgerak@gmail.com>

**By submitting this pull request, I confirm the following:** 
`{please fill any appropriate checkboxes, e.g: [X]}`

- [x] I have read and understood the [contributors guide](https://github.com/pi-hole/pi-hole/blob/master/CONTRIBUTING.md), as well as this entire template.
- [x] I have made only one major change in my proposed changes.
- [] I have commented my proposed changes within the code.
- [] I have tested my proposed changes, and have included unit tests where possible.
- [] I am willing to help maintain this change if there are issues with it later.
- [x] I give this submission freely and claim no ownership.
- [x] It is compatible with the [EUPL 1.2 license](https://opensource.org/licenses/EUPL-1.1)
- [x] I have squashed any insignificant commits. ([`git rebase`](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html))
 2018-01-12 02:17:31 +02:00
DL6ER
793bdd9743
No need for cat | sed here as we source setupVars.conf, so we can use interface="${PIHOLE_INTERFACE}" 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-07 14:36:03 +01:00
DL6ER
9d50f52bb2
Add fallback interface for DNS listening behavior in case PIHOLE_INTERFACE is not set in setupVars.conf 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-07 14:34:02 +01:00
DL6ER
afa2e9c2f7
Exchange hard-coded domain "localhost" by hard-coded address "127.0.0.1" 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-30 17:44:59 +01:00
Adam Warner
8e0d76b63b
initiated -> initialized 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-12-24 13:26:32 +00:00
DL6ER
cca8412921
Use "echo -n" to avoid haveing newlines in the files 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-23 11:52:27 +01:00
DL6ER
d15a5ad5c1
Add required documentation in the source code 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-23 00:46:51 +01:00
DL6ER
8ed75dd176
Add extra entry to the end of the saved branches and versions such that PHP's explode() subroutine can correctly disentangle the first three entries and does not get confused by the newline character at the end of the FTL version/branch... 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-23 00:42:41 +01:00
Dan Schaper
8ca0582afc
Merge branch 'release/v3.2.1' into fix/DNSSEC_trustanchor 2017-12-21 10:56:37 -08:00
DL6ER
be0c457445
Sleep 30 seconds after reboot to be sure that the system is ready 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 12:42:28 +01:00
DL6ER
cfca367eef Quickly verified in dnsmasq's source code: It has to be "trust-anchor" (with "-") 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-18 21:45:24 -05:00
DL6ER
8a243c5872 Insert also old trust anchor 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-18 21:45:15 -05:00
DL6ER
b30b3f3aeb Update DNSSEC trust anchor 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-18 21:44:34 -05:00
DL6ER
05d015169c
Check for local version and branches every 10 minutes, check for remote versions only once a day 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-09 19:00:46 +01:00
Jacob Salmela
28bed0041e
remove comment 
Signed-off-by: Jacob Salmela <github@decoy.email>
 2017-12-08 18:29:28 -06:00
Jacob Salmela
6f03e30151
fixes #1537 by checking if systemctl is found 
Signed-off-by: Jacob Salmela <github@decoy.email>
 2017-12-08 18:23:55 -06:00
Adam Warner
a9a40ca46c
Useless cat. Consider 'cmd < file | ..' or 'cmd file | ..' instead. 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-12-06 23:27:40 +00:00
Adam Warner
162a7b56fe
force mode is no longer referenced. Regression. Same with domToRemoveList 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-12-06 22:42:08 +00:00
WaLLy3K
2dc1851892
Allow passwords with spaces 
e.g: `pihole -a -p "foo bar"`

 Signed off by WaLLy3K <wally3k@pi-hole.net>
 2017-11-23 13:17:34 +11:00
Jacob Salmela
9631519eb1
Merge pull request #1752 from pi-hole/new/bashupdatechecker 
Add bash / cron based update checker for Pi-hole
 2017-11-08 20:38:40 -06:00
DL6ER
90efa3b610
Simplify git subroutines 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-11-08 19:11:41 +01:00
Adam Warner
5221767a70
Merge pull request #1735 from bcambl/debug_selinux 
add SELinux checks to debug script
 2017-10-30 13:07:36 +00:00
DL6ER
0db76aada0
Silence errors when directory to be checked does not exist (system may have been installed without a web interface!) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-10-28 15:44:17 +02:00
DL6ER
9be854031f
Don't store FTL branch until the next release of FTL which supports returning the branch in an easy way 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-10-28 13:41:24 +02:00
DL6ER
709851503f
Use "pihole-FTL branch" to get FTL's branch 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-10-28 13:27:12 +02:00
DL6ER
6ca47dc3b3
Add bash / cron based update checker for Pi-hole 2017-10-28 13:20:02 +02:00
WaLLy3K
2390b80359 Silence non-numeric domains_being_blocked output 
* Round $cpu_mhz to 1 decimal place
* Remove ".0" from $cpu_freq
* Silence non-numeric domains_being_blocked output
* Use "Core" and "Web" as appropriate

Signed off by WaLLy3K <wally3k@pi-hole.net>
 2017-10-25 21:04:43 +11:00
bcambl
0f868f7649 remove un-used DONE variable 
(still available via sourced COL_TABLE on line 29)
 2017-10-19 22:57:07 -06:00
bcambl
31730e7197 add missing colors to COL_TABLE fallback 2017-10-13 09:14:19 -06:00
bcambl
7d76db00ac update 'SELinux not detected' message 2017-10-13 08:58:35 -06:00
bcambl
8aceb8bf53 replace deprecated colors in debug script 
- COL_LIGHT_GREEN  -> COL_GREEN
 - COL_LIGHT_RED    -> COL_RED
 - COL_LIGHT_PURPLE -> COL_PURPLE
 2017-10-12 23:33:28 -06:00
bcambl
a17d1be7a4 simplify selinux debug variables 2017-10-12 23:24:02 -06:00
bcambl
1e6cc63abe add SELinux checking to debug script 2017-10-12 20:55:14 -06:00
DL6ER
e0edac32c7 Merge pull request #1728 from pi-hole/new/nuke_lists 
Add nuclear option to list.sh
 2017-10-10 19:12:16 +02:00
WaLLy3K
bd33018660 Shellcheck OR validation 
Signed off by WaLLy3K <wally3k@pi-hole.net>
 2017-10-08 12:16:05 +11:00
Mcat12
67a5594909 Allow emails which include -h in them 
For example, mcat12@pi-hole.net would previously spit out the help message
 2017-10-07 16:06:16 -04:00
DL6ER
70ad656af0
Save backup as ".bck~" to prevent reading of the file by dnsmasq 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-10-07 22:04:14 +02:00
DL6ER
f22b83d379
Create a backup before emptying the list 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-10-07 17:46:40 +02:00
DL6ER
114f84c948
Add --nuke option to list.sh that can be used e.g. by Teleporter to empty out lists before importing new content 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-10-07 17:29:47 +02:00
DL6ER
ee2169dd13
Merge branch 'development' into tweak/gravity 2017-09-21 17:05:30 +02:00
WaLLy3K
28063aa7f7 Add administrative contact address functionality 
* Disable shellcheck for SC1090
 2017-09-15 00:24:29 +10:00
WaLLy3K
34ae4844fa Merge branch 'development' into tweak/gravity 2017-09-14 16:44:14 +10:00
DL6ER
b8fedf76cd Merge pull request #1572 from pi-hole/gedetil-development 
Add web frontend shutdown command
 2017-09-08 20:21:20 +02:00
DL6ER
c9d4995900
Update to comply with current development code 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-08 19:35:05 +02:00
DL6ER
279e809aaf
Use poweroff instead of halt 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-08 19:33:06 +02:00
DL6ER
0d037e96fb
Merge branch 'development' into gedetil-development 
Signed-off-by: DL6ER <dl6er@dl6er.de>

Conflicts:
	advanced/Scripts/webpage.sh
 2017-09-08 19:32:38 +02:00
WaLLy3K
bea99abd8d Ensure colour consistency between terminal themes 
* Comment file for review-ability
* Add BOLD and UNDERLINE options
* Select most readable colours out of LIGHT/DARK options
* Provide empty variables for `set -u`
* Deprecate unnecessary variables
* Correct colours for TICK/CROSS/DONE
* Escape r twice and add ESC to OVER
 2017-09-05 23:28:33 +10:00
WaLLy3K
7cac207c00 Merge branch 'development' into tweak/gravity 2017-08-28 03:11:38 +10:00
WaLLy3K
1ae403b742 Merge pull request #1667 from pi-hole/install-space 
Remove erroneous space
 2017-08-24 14:00:20 +10:00
Adam Warner
18b41adbf6 Merge branch 'development' into tweak/gravity 2017-07-29 17:14:39 +01:00
Adam Warner
0a9965292c
Additional check to fix any existing cases of "24h" in setupVars.conf automatically. 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-07-28 19:40:13 +01:00
Adam Warner
4fb66e632f
The other h 2017-07-28 16:30:03 +01:00
Adam Warner
5787895794
stop an extra h being added to leasetime of DHCP server. We already storethe h in setupVars.conf 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-07-28 16:10:13 +01:00
Adam Warner
d90489b31d
Include branch we're switching from 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-07-27 22:21:25 +01:00
Adam Warner
f38912a0c9
- Correctly overwrite ${INFO} boxes with ${CROSS} etc 
- Notify user that branch has been changed

Signed-off-by: Adam Warner <adamw@rner.email>
 2017-07-27 21:33:41 +01:00
WaLLy3K
2d8fff099f Pass correct options to gravity.sh 
* Optimise $validDomain function by using bashism and `grep`
* Add black/white/wildcard variables to pass to Reload()
* Revert reload variable behaviour
* Ensure Reload() function passes correct options to gravity.sh

Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
 2017-07-27 12:34:26 +10:00
WaLLy3K
fdf2649f2f Clean up known remaining colour output issues (#1613) 
* Print newline on error message

* Output last three lines of error if update fails

* Consistent error messages & housekeeping

* Add shellcheck directive to ignore COL_TABLE
* Quoted and braced variables for codebase consistency
* Escaped newlines correctly
* Made error messages consistent (indenting and wording)
* Removed consecutive echos

* Conditional formatting consistency

* Braced, quoted and used [[ on conditionals

* Fix specific ShellCheck issues

* Fixed issues that could be safely changed without extensive testing

* Update SELinux whiptail behaviour & more

* Colourised some strings
* Fixed multiple line string indenting
* Made output consistent with existing codebase
* Removed sequential echos
* Make SELinux whiptail use "--defaultno", and change text wording

* Add help text for hostrecord, and colourise output

* this should fix the tests...

Signed-off-by: Adam Warner <adamw@rner.email>

* revert changes to `update_package_cache()` to prove tests

Signed-off-by: Adam Warner <adamw@rner.email>
 2017-07-26 18:00:08 +01:00
Mcat12
b09c660833 Always process DNS and DHCP settings in installer (#1630) 
* Always process DNS and DHCP settings in installer

* Make sure dnsmasq config exists before modifying it

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>

* Make sure the dnsmasq config directory exists

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>

* Only remove the DHCP config if it exists (fixes tests, hopefully)

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
 2017-07-26 17:15:23 +01:00
WaLLy3K
714fd93292 Provide correct FTL stats (#1619) 
* Provide correct FTL stats

* Use the correct lines in the array when displaying FTL stats
* Treat ads_blocked_today/dns_queries_today as currency, like domains_being_blocked is on large screens

* Chronometer Shellcheck validation

* Remove unnecessary \ from CPU usage readout
 2017-07-25 23:03:23 +01:00
WaLLy3K
61ff0452e1 Remove duplicate code 
* Make RestartDNS() use `pihole restartdns`

Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
 2017-07-24 21:27:12 +10:00
WaLLy3K
406098e55a Speed up refresh time 
* Add "--blacklist-only" to only run essential gravity functions
* Pass "--wildcard" option to `gravity.sh` to ensure dnsmasq is restarted

Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
 2017-07-24 21:26:39 +10:00
Adam Warner
0a062d26e6 Merge pull request #1611 from pi-hole/developmentNew 
Sort out Merge conflicts with master
 2017-07-17 14:49:55 +01:00
Adam Warner
eb8333c772
Merge branch 'development' into developmentNew 2017-07-16 16:45:33 +01:00
Adam Warner
247d3ed729
list availible branches for FTL 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-07-16 13:54:23 +01:00
Adam Warner
031c6428d5
Merge branch 'tweak/checkout_FTL' of https://github.com/pi-hole/pi-hole into tweak/checkout_FTL 
Signed-off-by: Adam Warner <adamw@rner.email>

# Conflicts:
#	advanced/Scripts/piholeCheckout.sh
 2017-07-16 13:34:20 +01:00
Adam Warner
f2e9d585f7
* Add helptext for pihole checkout ftl 
* Only attempt to install FTL if branch was found
* ~~corebranches~~ webbranches (web branches now actually listed)

Signed-off-by: Adam Warner <adamw@rner.email>
 2017-07-16 13:33:00 +01:00
WaLLy3K
8af9853b9a Fixed minor formatting issues 
* Removed useless echo
* Quoted and braced conditionals
* Explicit escaping of newline
* Fixed arrays implicitly concatenating (SC2199)
* Fixed incorrect variable used in checkout web
 2017-07-16 22:32:34 +10:00
Adam Warner
783f50657b
Merge branch 'development' into tweak/checkout_FTL 
Signed-off-by: Adam Warner <adamw@rner.email>

# Conflicts:
#	advanced/Scripts/piholeCheckout.sh
 2017-07-16 12:25:27 +01:00
WaLLy3K
3631d1349e Prevent Web Admin from printing restartdns colour codes (#1575) 
* Prevent Web Admin from printing unnecessary msgs

* Make DNS restart behaviour consistent
 2017-07-15 11:11:06 +01:00
Adam Warner
7d56e2a937
FTL has an L in it, innit? 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-07-14 20:54:41 +01:00
Jacob Salmela
e1f818ffb7 Tweak/debug improvements (#1585) 
* check for CIDR notation when comparing IPv6 address to that found in setupVars.conf

* highlight bad address entries in pihole.log and reference a corresponding FAQ

* show header output if Pi-holes x-header does not match

* fix automated mode when running from the dashboard.  It would previously not automatically upload and generate a token.

* show disclaimer message

* undocumented feature for now: obfuscate domains in pihole.log so they are not visible when sent to the Pi-hole developers.  We need to make an additonal flag for this in the pihole command.  if the variable OBFUSCATE has a value, it will replace the domain in the log with a placeholder value

* fix small typo in the disclaimer
 2017-07-14 16:53:45 +01:00
Jacob Salmela
fb66fb12c5
put "no password will be set" on a newline. 2017-07-06 20:54:09 -05:00
Jacob Salmela
042dcf795c
fixes #1430 2017-07-06 20:44:40 -05:00
Jacob Salmela
cb65907e60 Merge branch 'development' of https://github.com/pi-hole/pi-hole into revamp/debug 
merge in development to avoid shellcheck from travis
 2017-07-05 16:55:34 -05:00
DL6ER
bb8a263d70
ShellCheck 2017-07-05 19:34:20 +02:00
DL6ER
70fd94edb3
Edit message when requested branch of FTL is not available 2017-07-05 19:30:05 +02:00
WaLLy3K
1bebcef265 Make Chronometer usable on smaller screens (#1518) 2017-07-04 13:52:51 +10:00
DL6ER
6ce79ae1d0 Fix git commands (#1577) 2017-07-01 23:52:10 +02:00
Adam Warner
b3eb5c4f0e Colour Tweaks (#1549) 2017-07-01 22:08:17 +10:00
DL6ER
ec4e9780ed Accept underscores when validating domain names (#1571) 2017-06-30 22:52:33 +10:00
Adam Warner
22abbffbb7
Merge branch 'development' of https://github.com/gedetil/pi-hole into gedetil-development 
Signed-off-by: Adam Warner <adamw@rner.email>

# Conflicts:
#	advanced/Scripts/webpage.sh
 2017-06-29 19:47:32 +01:00
Jacob Salmela
05a724afae
codacy appeasement: remove useless cats 2017-06-29 11:49:28 -05:00
Jacob Salmela
1957b002bc
add comments about X-Headers and further explain the file descriptor cod. 2017-06-29 11:37:58 -05:00
Jacob Salmela
04cef25add
remove color character codes before uploading so the log is more readable on our plaintext tricorder server 2017-06-29 11:17:19 -05:00
DL6ER
98afb0e998
pihole checkout ftl 2017-06-27 14:28:05 +02:00
DL6ER
e9d81fc883 Backend additions for aufit log feature (#1399) 2017-06-27 10:53:24 +02:00
Jacob Salmela
22fac5e1e0
additional shellcheck fixes 2017-06-26 22:03:45 -05:00
Jacob Salmela
b6a2a4ad5a
more shellcheck fixes 2017-06-26 21:51:41 -05:00
Jacob Salmela
5f00347019
appease shellcheck by removing two unneccesary functions and making some if/else blocks 2017-06-26 21:34:39 -05:00
Mcat12
8dc94e014f
Merge branch 'development' into fix/invalid-ipv6-wildcard 2017-06-25 18:04:38 -04:00
Dan Schaper
c29c4ceb0f
Integrate DL's update.sh fixes. 
`shellcheck -x` for following files.

Do not test for included files SC1091

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-06-25 14:39:09 -07:00
Mcat12
cb09e0bc9a Strip /* from the end of the IPv6 address 
Fixes #1536
 2017-06-24 11:14:23 -04:00
Adam Warner
536585b846 Colourise Core Output Text (#1471) 
* Define colours within COL_TABLE
* Do not output colours for non-terminal instances
* Removed ":::"
* Fixed indenting & spacing
* Made output consistent throughout project
* Reworded text to fit on standard 80 char wide Terminal screen
* Made 'sudo raspi-config' warning (insufficient disk space) only show on RPi
* Make "Installation/Update Complete" the final msg
* Remove redundant messages
* Simplify update available message
* Confirm user would like to begin uninstall
* If "git pull" string says "Already up-to-date.", place [i] before it
* Colour Temp/Interface output
* Made `pihole disable 5z` invalid
* Added error fallback if invalid argument (not s/m) is detected
* Quoted "$2" for consistency
* Updated help text
* L185/286: Replaced echo with redirect
* User agents for adblock.mahakala.is/adaway.org unnecessary 
* Print newline on confirmation of repository reset
* Add output to admin-related dnsmasq restarts
* Return error message for "pihole -q"
* Imply default checkout behaviour with y/N
* Fix uninstall failing to remove pihole user
* Print checkout 'git remote show origin' STDERR on new line
* Replaced checkout "AdminLTE" wording with "Web Admin"
 2017-06-21 21:49:05 +10:00
WaLLy3K
aff5ff08d5 Trim version output when update is successful (#1527) 2017-06-15 09:50:05 +02:00
Jacob Salmela
fc0440546f
add functions to parse head and tails of gravity.list and pihole.log 2017-06-10 23:20:27 -05:00
Jacob Salmela
172b8d2427
parse ftl log 2017-06-10 22:18:33 -05:00
Jacob Salmela
6d10a498a5
implement a limit on how many lines of a file we want to view 2017-06-10 21:57:17 -05:00
Jacob Salmela
881819ed5f
ignore big files we dont need to know about; also fix diagnosing pihole processes 2017-06-10 18:37:28 -05:00
Jacob Salmela
3275c5f710
more comments to help understand the script 2017-06-10 15:54:27 -05:00
Jacob Salmela
b0cc1a38c3
adjust minor formatting for better readability 2017-06-10 15:28:04 -05:00
Jacob Salmela
e10182c839
only parse files required by Pi-hole 2017-06-10 12:27:05 -05:00
Jacob Salmela
b4f1fe08f0
variablize all files and directories. also put required files and folders into an arry so we can compare them in later functions by parsing through them 2017-06-09 23:22:37 -05:00
Jacob Salmela
64171fa2a1
small color and formatting changes 2017-06-09 15:42:54 -05:00
Jacob Salmela
048eacd305
parse array in correct location 2017-06-07 12:31:08 -05:00
Jacob Salmela
24aa72c19d
condense repetative code into functions; parse the content of each file 2017-06-07 12:25:00 -05:00
Jacob Salmela
92b5fe4be4
check arch compatibility and add gateway faq url 2017-06-05 14:55:58 -05:00
DL6ER
f1146a3443
Don't update FTL when there is a core update (as this will update FTL a second time). Fixes #1516 2017-06-04 12:41:44 +02:00
DL6ER
2516a1e298 Make clear that NO is the default if the user just hits return (#1514) 2017-06-03 17:23:47 +02:00
Jacob Salmela
8b4c0b456b
exclude webpassword from being uploaded. also check that the IP addresses detected match those defined in setupVars.conf 2017-06-01 01:15:11 -05:00
Jacob Salmela
02a601deff
comment out dir checks for lighttpd, cronm and http as they have a lot of other files that need parsing through. May need to increase the logic there if this is information we really need to know. 2017-06-01 00:19:15 -05:00
Jacob Salmela
b207fadc04
check if os is supported based on pretty name 2017-06-01 00:18:06 -05:00
Jacob Salmela
d51c067e1b
change some verbiage; new function to compare the ports in use to the services assigned to them. 2017-05-27 21:21:18 -05:00
Jacob Salmela
2fea5d428d
condense repetitive code into functions 2017-05-27 15:47:15 -05:00
Jacob Salmela
d51e0c49b1
remove comments and blank lines when parsing files 2017-05-27 13:44:33 -05:00
Jacob Salmela
36907edd50
parse contents of each file in each dir, several log_writes 2017-05-27 00:04:42 -05:00
Jacob Salmela
7ec169ab10
more comments, fixed automated tricorder, variablizing echos, verify FTL version 2017-05-26 22:05:50 -05:00
Jacob Salmela
7873da1ae5
more colors. shortened dig timeouts 2017-05-26 15:17:26 -05:00
Jacob Salmela
ef5a6e7880
add faq urls to some functions, added more colors, also use a static url for remote digs 2017-05-26 14:26:02 -05:00
Jacob Salmela
96f01e670f
add functions to write to console and log at the same time 2017-05-26 12:16:22 -05:00
WaLLy3K
10139241f5 Fix output IPv4 addr when removing CIDR notation (#1498) 2017-05-26 09:57:27 +02:00
Jacob Salmela
5902be2a49
comments for every line 2017-05-24 22:07:15 -05:00
Jacob Salmela
cc946ce068
upload to tricorder functions 2017-05-24 21:11:15 -05:00
Jacob Salmela
1102fdc44b
append everything the user sees to the pihole_debug.log file 2017-05-24 20:24:23 -05:00
Jacob Salmela
c995c81fff
adjust some spacing 2017-05-24 19:36:06 -05:00
Jacob Salmela
6684af9938
add lighttpd list function and gravity analysis 2017-05-24 18:31:55 -05:00
Jacob Salmela
8bafd12f95
fix resolver functions and add x-header function 2017-05-24 16:10:14 -05:00
Jacob Salmela
76266cf31b
add resolver functions and check directory content functions 2017-05-24 15:29:31 -05:00
WaLLy3K
4ad0cdf5d4 Rewrite Chronometer to output more stats 2017-05-25 01:03:13 +10:00
Jacob Salmela
1a87d3a659
add process check function 2017-05-23 22:57:22 -05:00
Jacob Salmela
085f2c6ca0
add port check function 2017-05-23 22:32:30 -05:00
Jacob Salmela
b74300f67c
add ping internet function and fix some spacing issues 2017-05-22 12:57:55 -05:00
Jacob Salmela
107babe8f4
add ping gateway function 2017-05-22 12:35:57 -05:00
Jacob Salmela
8fd9a22d18
add detect IP function 2017-05-22 12:05:42 -05:00
Jacob Salmela
8c5c1316dd
add php version and processor check functions 2017-05-22 08:48:56 -05:00
Jacob Salmela
daff5d8b5a
add critical dependencies version check functions 2017-05-22 03:05:51 -05:00
Jacob Salmela
6c4a7b626e
add pihole version check functions 2017-05-22 02:39:00 -05:00
Jacob Salmela
1aa5943e67
add if directory exists function 2017-05-22 01:06:15 -05:00
Jacob Salmela
69fe889f92
comments for all lines and small formatting changes 2017-05-21 23:25:53 -05:00
Jacob Salmela
5d7ef9281f
get just the OS pretty name for Dan 2017-05-20 02:01:56 -05:00
Jacob Salmela
6fa00e7cc8
first functions with pretty colors. check OS, setupVars, and contents of .d dirs 2017-05-20 01:34:13 -05:00
WaLLy3K
f6732a484e Merge pull request #1317 from r0ckarong/development 
Fixed handling of `pihole -wild` help text
 2017-05-18 11:16:25 +10:00
DL6ER
42eb811910
Add "quiet" mode + update comments in the cron file 2017-05-17 12:54:43 +02:00
DL6ER
c9042ffedd
Print echos only when manual flushing is requested 2017-05-17 12:51:04 +02:00
DL6ER
4e2c6a7b8e
Fix logrotation: manual flushing should be done twice, but automated rotation at midnight should only be done *once*! 2017-05-17 12:44:35 +02:00
WaLLy3K
7453bf2ee6 Fix wildcard help text 
* -wild is not a valid option since we're already using -wild
 2017-05-16 10:23:53 +10:00
WaLLy3K
7d17c652f3 Merge branch 'development' into development 2017-05-16 10:18:32 +10:00
Adam Warner
90119c75d5
more merge conflicts! 2017-05-14 16:43:20 +01:00
WaLLy3K
30035ce1c2 Merge branch 'development' into tweak/help-output 2017-05-14 13:03:33 +10:00
WaLLy3K
3bd677c102 Show help for "pihole -v -h" 
* Indent output text
* Minor help text change
 2017-05-14 11:57:46 +10:00
WaLLy3K
0e4473685b Show help for "pihole -a -i --help" 2017-05-14 11:47:56 +10:00
WaLLy3K
b721ed49ab Update Help Output (#1467) 
* File consistency

* Tabs to 2 spaces
* Corrected indenting
* Double braced conditionals
* Quoted variables within conditionals

* Standardise core help text

* Added help text for disable command
* Added help text for logging command

* Clean up

* Fixed certain new lines and spaces

* Sync with development branch

* Formatting consistency

* Tabs to 2 spaces
* Corrected indenting
* Double braced conditionals
* Quoted variables within conditionals
* Fixed certain newlines and spaces

* Admin help text

* Added help text for interface command

* Sync with development branch

* Formatting consistency

* Tabs to 2 spaces
* Fixed some wording
* Fixed certain spaces

* Formatting consistency

* Minor wording changes
* Tabs to 2 spaces
* Corrected indenting
* Double braced conditionals
* Quoted variables within conditionals
* Fixed certain newlines and spaces

* Blacklist help text

* Formatting consistency

* Tabs to 2 spaces
* Corrected indenting

* Cronometer help text

* Formatting consistency

* Fixed certain newlines and spaces
* Corrected indenting

* Checkout warning alteration

* Add checkout help text

* Corrected help output
 2017-05-14 11:11:44 +10:00
Dan Schaper
25601b9fcc Document sed substitution for user readability 
Comment the oneliner with explanations of what each step does.
 2017-05-13 17:49:58 -07:00
Adam Hill
55f78e3b64 Update list.sh 
I believe this has feature parity with `sed /foo/ Id` but also supports busybox, and my alpine docker ;)
 2017-05-13 18:44:41 -05:00
Hans Geiblinger
b166410cbf Solve piholeLogFlush.sh having to be issued 2 x to clear logs (#1460) 
Simplified the command -v syntax, and added a sleep 3 timer to the first execution of the log rotation. The second execution was being issued while the first was still running, thus it would fail and you would have to issue the "Flush Logs" command a second time.
 2017-05-12 22:39:55 +02:00
Dan Schaper
5bb91759b4 Merge pull request #1459 from WaLLy3K/patch-2 
Provide remote hashes for version.sh
 2017-05-12 12:38:13 -07:00
Dan Schaper
80c4b7c9bb Merge pull request #1455 from pi-hole/tweak/logecho_gateway 
Debug: Log and echo gateway responses
 2017-05-12 12:02:21 -07:00
WaLLy3K
ea0a9ceb37 Provide remote hashes for version.sh 
* Provide remote hashes for comparison
 * Use double braces for all conditions (for consistency)
 * Suppress potential "cd" error output
 * Provide "not applicable" output upon any hash request for FTL
 2017-05-12 15:25:01 +10:00
Dan Schaper
501b26decd Log and echo gateway responses 2017-05-10 22:08:06 -07:00
WaLLy3K
c6596f2c54 Modified syntax to be valid for Shellcheck 2017-05-11 14:19:13 +10:00
WaLLy3K
2863308090 Minimise string duplication & other minor changes 
Instead of duplicating output strings, rewrite core/web/ftlOutput() into one neat versionOutput().
 2017-05-11 13:34:58 +10:00
WaLLy3K
7fef1fdc83 Fixed indentation 2017-05-11 10:11:04 +10:00
WaLLy3K
fe0a35cc7a Update -h to work as --hash 
Also provide error output as per https://github.com/pi-hole/pi-hole/pull/1447#issuecomment-300600093
 2017-05-11 08:30:49 +10:00
WaLLy3K
03201e2f20 Display FTL version & version.sh rewrite 
While testing to make sure `pihole -v` would output `pihole-FTL version`, I noticed some options didn't work how I expected them to. For example, if I use `pihole -v -p`, I would expect to see the version output of Pi-hole Core. Instead, I'm informed that it's an invalid option.

I've had the following things in mind while rewriting this:
  * I'm operating under the assumption that FTL is only installed if the Admin Console is (Line 113 exit 0)
  * I have modified the help text to only output with `pihole -v --help`
  * I have modified all output to be more similar to the output style of `grep` and `curl` (Ditching ":::")

Testing output:
```
w3k@MCT:~$ pihole -v
  Pi-hole version is v3.0.1-14-ga928cd3 (Latest: v3.0.1)
  Admin Console version is v3.0-9-g3760482 (Latest: v3.0.1)
  FTL version is v2.6.2 (Latest: v2.6.2)
w3k@MCT:~$ pihole -v -c
  Current Pi-hole version is v3.0.1-14-ga928cd3
  Current Admin Console version is v3.0-9-g3760482
  Current FTL version is v2.6.2
w3k@MCT:~$ pihole -v -l
  Latest Pi-hole version is v3.0.1
  Latest Admin Console version is v3.0.1
  Latest FTL version is v2.6.2
w3k@MCT:~$ pihole -v -p --hash
  Current Pi-hole hash is a928cd3
w3k@MCT:~$ pihole -v -a --hash
  Current Admin Console hash is 3760482
w3k@MCT:~$ pihole -v --help
Usage: pihole -v [REPO | OPTION] [OPTION]
Show Pi-hole, Web Admin & FTL versions
  <Shows all Repositories and Options>
w3k@MCT:~$ pihole -v -foo
  Invalid Option!
```
 2017-05-10 13:07:56 +10:00
Adam Warner
9beb9fd941 Merge pull request #1384 from pi-hole/checkoutImprovements 
Stash changes when switching branches
 2017-05-05 23:22:54 +01:00
DL6ER
9cc392fa02
Update Marks PR after the Promo code has been merged 2017-05-04 11:43:48 +02:00
Adam Warner
9c136a5579
functionise Hashing 2017-05-02 22:24:37 +01:00
DL6ER
30dcf6ff47
Include pihole-FTL.log in debug report 2017-05-02 09:18:58 +02:00
DL6ER
db1e5f10ea
Make changes according to comment in #1384 2017-04-21 17:08:15 +02:00
DL6ER
320c06e0a4
Flush twice to move data out-of-sight of FTL 2017-04-17 21:25:15 +02:00
Adam Warner
2e398c5da4
stash changes on branch switch, else it fails if any changes have been made. 2017-04-14 17:20:13 +01:00
gedetil
ff6df76e36 Update webpage.sh 
Implement "Halt system" button, next to "Restart system" button, on
admin/settings page.  Useful for doing clean shutdown before powering off.

(This affects 4 files, 3 for the web content, 1 for backend script.)

Gilbert Detillieux <gedetil> 2017-04-11
 2017-04-11 12:04:44 -05:00
Mcat12
a96b4d28e1 Merge pull request #1365 from pi-hole/adlistImprovements 
Adlist improvements
 2017-04-06 16:15:50 -04:00
Mcat12
57e8b7f924 Merge pull request #1355 from pmo3/development 
Mask password input when changing password
 2017-04-03 20:23:19 -04:00
Flo
7e0aa822b6 Match the Pi-hole brand (#1358) 
* Update README.md

* Update index.php

* Update basic-install.sh

* Update piholeCheckout.sh

* Update update.sh

* Update CONTRIBUTING.md

* Update the Pi-hole brand tip in CONTRIBUTING.md

Use a better formulation.

* Update README.md 2
 2017-04-03 17:29:57 +02:00
Adam Warner
3cf9942465
spacing fixed 2017-03-31 23:00:56 +01:00
Adam Warner
153031482f
Add delete mode to adlist command. Might be abetter way to do this 2017-03-31 22:51:10 +01:00
Adam Warner
af2cff5177
remove call to user list 2017-03-31 20:13:04 +01:00
Adam Warner
5435b93df2
remove spaces 2017-03-31 20:05:45 +01:00
Adam Warner
3a3dde6298
add adlist argument redirector 2017-03-31 20:03:56 +01:00
Adam Warner
b4bc90fb85
add in CustomizeAdlists function 2017-03-31 19:35:52 +01:00
Patrick O'Brien
a463250ecf don't hash an empty password 2017-03-27 13:37:19 -04:00
Patrick O'Brien
94f15f1b3c Merge remote-tracking branch 'upstream/development' into development 2017-03-23 18:47:50 -04:00
Patrick O'Brien
ee296f36c1 mask password input on command line 2017-03-23 18:47:30 -04:00
Mcat12
fb3e6ee35c Source setupVars before attempting to use it 
Fixes #1347
 2017-03-21 18:01:51 -04:00
Dan Schaper
2740c68a63 Merge pull request #1335 from pi-hole/tweak/debug_templog 
Debugging tweaks for temporary logfiles
 2017-03-16 23:35:15 -07:00
Dan Schaper
b1f769b671
Output cleaning, IP stack check headers. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-15 23:50:29 -07:00
Dan Schaper
77378da70a
Cat out temp files to final log. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-15 23:43:41 -07:00
Dan Schaper
160030b75f
Quiet systemctl output to just the current daemon status. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-15 23:27:18 -07:00
Dan Schaper
0a0c3a2fb7
Copy working temp to final location. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-15 23:20:12 -07:00
Dan Schaper
e9f1ca338f
Create temp files for working storage, log to working storage temps. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-15 22:49:47 -07:00
Adam Warner
cfaf1ac67c
add check on file_parse to not include WEBPASSWORD= in the debug log 2017-03-15 18:59:41 +00:00
Adam Warner
6b862dd9e9 Only remove from wildcard list if domain is being added to whitelist or blacklist 2017-03-13 20:38:34 +00:00
Markus Napp
bb7a7d94ef Replace misleading letter variable 2017-03-12 16:16:45 +01:00
Markus Napp
9a475cc010 Rewrite help text for better handling of params 2017-03-12 15:50:48 +01:00
Markus Napp
ae30c285a2 Fix handling of wildcard help text 2017-03-12 15:45:11 +01:00
Dan Schaper
2e74219ff9 Merge pull request #1313 from pi-hole/new/piholecheckout 
Checkout adjustments
 2017-03-11 13:01:11 -08:00
Dan Schaper
b0ae954f1e
Only update when update flag is set to "true" 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-11 12:37:36 -08:00
Dan Schaper
a2404f104a
Just some style and linting. And a cd in fetch_checkout_pull_branch 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-11 12:21:15 -08:00
DL6ER
38547ced7a
Can only diff once upstream branch is tracked 2017-03-11 16:55:37 +01:00
DL6ER
9a9d9007cd
Add missing "== true" 2017-03-11 16:49:47 +01:00
DL6ER
bd2d81f691
source setupVars.conf to see if INSTALL_WEB is true or not 2017-03-11 16:46:52 +01:00
DL6ER
1b9e7fbf2e
Test if branch is locally available is not reliable because of possible ambiguities 2017-03-11 16:40:10 +01:00
DL6ER
d4a49d192f
Correct variable name 2017-03-11 16:38:28 +01:00
DL6ER
8cb66544d2
Remove "\ " 2017-03-11 16:36:54 +01:00
DL6ER
140ac192aa
The web repo might actually be missing and this is n error (not installed because the user didn't want it) 2017-03-11 16:30:58 +01:00
DL6ER
b961b13d60
Small bugfix 2017-03-11 16:27:00 +01:00
DL6ER
febdb4a190
Use git diff to determine if code has changed (no need to run the installer if it hasn't changed at all) 2017-03-11 16:24:13 +01:00
DL6ER
1d60b62e7a
Testing alternative way of fetching/checking out of a single branch 2017-03-11 16:11:23 +01:00
Dan Schaper
41e1e4cb68
Rearrange pull logic, some optimization. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-10 11:25:35 -08:00
Dan Schaper
d5b88e0df8
Get the right name for the options. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-10 11:07:58 -08:00
Dan Schaper
20fd61468d
Require branch to check out 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-10 11:04:37 -08:00
Dan Schaper
0a0d25dff4
Script runs in subshell, no need to cd back to pwd. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-10 10:57:46 -08:00
DL6ER
2b3afbfef8 Merge pull request #1310 from pi-hole/new/piholecheckout 
Pi-hole checkout feature
 2017-03-09 00:43:35 +01:00
DL6ER
81a1057cac
Fix something Dan has overlooked 2017-03-09 00:30:36 +01:00
DL6ER
fd310c6445
Back to how we had it before, because --unshallow does not work at all 2017-03-09 00:28:02 +01:00
Dan Schaper
a9b52518bf
Shift numbers for argument identifiers, functions are called after shift 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-08 14:29:51 -08:00
Dan Schaper
87da40068c
Always exited with value 1, now exits with proper value. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-08 14:18:08 -08:00
Dan Schaper
b8f1eadb7f
Shift off checkout from being passed to script from pihole 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-08 14:17:56 -08:00
Dan Schaper
b522d8eaf6
Source and reuse existing variables, centralize code. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-08 13:41:11 -08:00
Dan Schaper
89ff99322d
Don't need to remember pwd inside a function, calling function doesn't change directories. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-08 13:30:08 -08:00
Dan Schaper
56e17d1010
Source functions and variables from basic-install.sh 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-08 13:28:24 -08:00
DL6ER
d2ab0694b7
Add "master" shortcut 2017-03-08 13:18:34 +01:00
DL6ER
8a14a63d5d
Pi-hole checkout feature 2017-03-08 13:16:40 +01:00
DL6ER
8235b18854
Remove duplicated line 2017-03-08 12:09:34 +01:00
DL6ER
e0e9ebbe74 Merge pull request #1307 from pi-hole/fix/versionwithoutwebinterface 
Don't try to obtain version of web interface it it is not installed
 2017-03-07 23:54:32 +01:00
DL6ER
10bc8414b9
Move FTL querying before clearing the terminal to avoid flashing on Pi B+ 2017-03-07 18:10:05 +01:00
DL6ER
4e25e0dc5c
Add missing } to JSON output 2017-03-07 17:57:57 +01:00
DL6ER
b1a9793d94
Let Chronometer query all data from FTL (no need for having the API). Fixes #1305 2017-03-07 17:54:11 +01:00
DL6ER
6dea00668e
Don't try to obtain version of web interface it it is not installed. Fixes #1303 2017-03-07 13:08:01 +01:00
DL6ER
ae9182c92e Merge pull request #1301 from pi-hole/fix/removewildcard 
Remove wildcard entry when adding the very same domain either the white- or blacklist
 2017-03-06 23:53:06 +01:00
DL6ER
cf31561267
Remove wildcard entry when adding the very same domain either the white- or blacklist 2017-03-06 16:25:35 +01:00
DL6ER
a97f0b1298 Merge pull request #1300 from pi-hole/fix/deletehostrecord 
Bugfix for when deleting host-record
 2017-03-06 16:16:42 +01:00
Dan Schaper
d1e0f3ae18 Merge pull request #1294 from pi-hole/tweak/debugDNS 
Tweak DNS debugging
 2017-03-06 05:50:37 -08:00
DL6ER
47a6786e8f
Use proper test syntax 2017-03-06 14:02:56 +01:00
DL6ER
a69fcbb91e
Bugfix for when deleting host-record 2017-03-06 13:44:13 +01:00
Dan Schaper
8e2b51b391 Merge pull request #1296 from pi-hole/fix/debugVersion 
Debug version detection improvements
 2017-03-05 07:13:41 -08:00
Dan Schaper
560af43204 Merge pull request #1293 from pi-hole/fix/version 
Account for hash in versioning
 2017-03-05 07:10:18 -08:00
DL6ER
baefec86f2
Add CLI teleporter feature 2017-03-05 14:08:44 +01:00
Dan Schaper
512c650441
Shellchecking. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-04 19:07:55 -08:00
Dan Schaper
dc44fc9e27
Version check amalgamation and removal of && || logic. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-04 17:54:38 -08:00
Dan Schaper
6f2fb57c08
Protocol specific records checks. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-04 15:16:33 -08:00
Dan Schaper
2547cc4c8d
Only run IPv6 if enabled, split out Chaos TXT checks. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-04 15:06:34 -08:00
DL6ER
9f4ef66f41
Add IPv6 resolver test 2017-03-04 22:38:52 +01:00
DL6ER
086f0790fc
Add Google's IPv6 address for potential IPv6 resolver tests 2017-03-04 22:31:18 +01:00
Dan Schaper
709b44f736
IPv4 DNS tests 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-04 12:16:43 -08:00
Dan Schaper
6cd4ff6d68
Organize functions and function calls. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-04 12:16:32 -08:00
Dan Schaper
abd3e828de
Optimize normalOutput 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-04 07:46:00 -08:00
DL6ER
b85af50d14
Generate only the information that is actually asked for 2017-03-04 14:08:11 +01:00
Dan Schaper
0e8fd49669
Function... 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-03 23:30:57 -08:00
Dan Schaper
945e22874e
Collapse duplicate functions, and take out argument loops. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-03 23:12:28 -08:00
Dan Schaper
77ab47a984
Awk for perl 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-03 22:34:55 -08:00
Dan Schaper
ed8088f203
Functions for Core/Web version and hash. And only check first argument in each section. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-03 22:10:32 -08:00
Dan Schaper
8831b22fc8
Prototype function for getting version of local repo 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-03 21:36:38 -08:00
Dan Schaper
0341bd1758
Optimize code, undoc flag for current hash. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-03 20:32:26 -08:00
Dan Schaper
9bb4a5fb25
Factor out variables from display. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-03 20:16:53 -08:00
Dan Schaper
ebfffea5dc
Always show something, even if it's just the short hash of the latest commit. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-03 20:04:55 -08:00
Dan Schaper
81939ab265
Get short hash of local and remote 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-03-03 19:14:30 -08:00
DL6ER
f2fe84c9d3 Merge pull request #1292 from pi-hole/master 
Merge patches back into devel
 2017-03-03 23:45:29 +01:00
DL6ER
dd971b6ee5
Default behavior is old behavir (listen on gravity interface (e.g. eth0), permit all origins) 2017-03-03 22:58:41 +01:00
DL6ER
f1b8abf503 Merge pull request #1146 from pi-hole/tweak/chronometer_recentlyblocked 
[FTL] Show most recently blocked domain in chronometer
 2017-03-03 12:20:43 +01:00
DL6ER
66b7d04b82
Merge branch 'development' into new/FTL-binary 2017-03-01 12:42:48 +01:00
DL6ER
7ba47f504c
Add special "except-interface" line in case of listening on all interfaces 2017-03-01 12:15:04 +01:00
DL6ER
0be1717ff4
Fix config error 2017-03-01 11:46:48 +01:00
DL6ER
189a4e0078
Add option to skip restarting of dnsmasq 2017-03-01 11:26:06 +01:00
DL6ER
3adf8785d8
Move "all" down in help text to not suggest that it is the default 2017-03-01 11:07:05 +01:00
DL6ER
b74862bfc5
Actually apply new setting by restarting dnsmasq 2017-03-01 11:02:08 +01:00
DL6ER
01273124ea
Change to -i, interface 2017-03-01 10:59:55 +01:00
DL6ER
721ada7e16
Fix typo 2017-03-01 10:52:21 +01:00
DL6ER
bd9dc91396
Add response for users manually setting this up via CLI 2017-03-01 10:50:13 +01:00
DL6ER
de6c43a8d3
Setup interface listening behavior of dnsmasq 2017-03-01 10:46:20 +01:00
Dan Schaper
83b0600863
Carriage return or newline based webcalls. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-02-27 11:03:57 -08:00
Dan Schaper
6c130b7960
Vebiage and highligh the token, also ::: 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-02-27 10:27:11 -08:00
Dan Schaper
7244d44a1d
Notify user that log is being uploaded. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-02-27 10:02:00 -08:00
Dan Schaper
9b060aab34
Debug auto mode engaged 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-02-26 18:22:06 -08:00
DL6ER
ce6c465942 Merge pull request #1266 from pi-hole/new/host-record 
Add host-record option
 2017-02-23 17:32:10 +01:00
Jacob Salmela
7a1a2dec67
update license to EUPL on core files 2017-02-22 11:55:20 -06:00
DL6ER
7ed1bbad49
Add host-record option 2017-02-22 14:43:07 +01:00
DL6ER
078cc7660e
Improved updater logic 2017-02-22 11:00:45 +01:00
DL6ER
af2893d2ce
Updater implementation for FTL 2017-02-22 10:43:13 +01:00
DL6ER
a64211123f
Some debug additions 2017-02-21 16:46:54 +01:00
Dan Schaper
053b38e0bd
Set up for IP matching in detection. 2017-02-16 19:45:44 -08:00
Dan Schaper
2aa3a109a0
Ping gateways and Internet. 2017-02-16 18:38:05 -08:00
Dan Schaper
472708376d
Split out IP checks. 2017-02-16 18:30:15 -08:00
Dan Schaper
cfed3d59e9
Begin fixing IP detection functions. 2017-02-16 16:49:14 -08:00
DL6ER
af8e629df4 Merge pull request #1239 from pi-hole/tweak/debug48h 
Change description as we want to save the debug log for 48h instead of only 24h
 2017-02-10 20:46:12 +01:00
DL6ER
01f980d49c
Change description as we want to save the debug log for 48h instead of only 24h 2017-02-10 17:45:20 +01:00
DL6ER
99fab7e52a
Scan whole dnsmasq.d directory for cofigurations files 2017-02-10 17:42:37 +01:00
Mcat12
ba67144e34 Merge branch 'development' into adminPageAsOption 2017-02-09 16:27:07 -05:00
DL6ER
7785dac50e Merge pull request #1228 from r0ckarong/development 
Justify and improve help texts, add missing wildcard description
 2017-02-08 14:05:53 +01:00
Markus Napp
01f643e5eb fixup! Fix spacing for wildcard help in list script 2017-02-08 12:56:28 +01:00
Markus Napp
8037f3e332 Fix spacing for wildcard help in list script 2017-02-08 12:55:14 +01:00
Markus Napp
afe5176e01 Justify help output to match main script 2017-02-08 12:41:53 +01:00
Mcat12
a48317883d Fix indentation 2017-02-07 18:14:41 -05:00
Promofaux
4fcf8fd23f Merge in development branch - resolve conflict in update.sh 2017-02-05 19:39:02 +00:00
Promofaux
10a30344e5 No need to source setupVars, as basic-install.sh is sourced, which sources setupVars itself. Sourception. 2017-02-05 19:29:56 +00:00
Promofaux
b764d17c64 comment 2017-02-05 19:18:27 +00:00
Promofaux
ba0abdb88d wrap update logic in admin_installed bool check 2017-02-05 19:12:09 +00:00
Promofaux
1428b58dde source setupVars and only check admin repo if it is enabled 2017-02-05 19:07:04 +00:00
Mcat12
18eb8a2159 Merge pull request #1185 from pi-hole/cleanup/git_functions 
Move git functions to one script
 2017-01-31 19:05:53 -05:00
DL6ER
3239c7023a Merge pull request #1170 from pi-hole/new/DHCPstaticleases 
Backend changes for static DHCP leases
 2017-01-31 21:07:36 +01:00
DL6ER
3d4516dc95
Improve regex 2017-01-29 20:27:20 +01:00
DL6ER
509c864cc3
Merge branch 'development' into fix/regex 2017-01-29 20:27:04 +01:00
Mcat12
f8944177a0 Fix chronometer interpreting summaryRaw 2017-01-29 13:32:48 -05:00
DL6ER
06873fe69e
Remove misplaced start of string expression. Fixes #1191 2017-01-29 13:54:39 +01:00
Dan Schaper
3d9d13222b
Use constants for leading paths. 2017-01-28 17:42:55 -08:00
Dan Schaper
745adabb05
Path to source basic-install.sh 2017-01-28 17:38:14 -08:00
Dan Schaper
3861b57dc6
Start moving reused utility functions to one script. 2017-01-28 17:32:42 -08:00
Dan Schaper
99a4a80017
Spelling 2017-01-28 17:08:38 -08:00
Mcat12
033ba26041 Stay in repo directory until we error check 2017-01-28 20:00:02 -05:00
DL6ER
08cddba200
There should be no echo here 2017-01-28 21:49:31 +01:00
DL6ER
1bf43b0425
Improved regex: Remove all leading points from domain (.....xyz => .xyz). Return not only a part, but fill validated domain 2017-01-28 21:48:19 +01:00
DL6ER
85b3fef08d
Use perl instead of grep? 2017-01-28 00:39:10 +01:00
DL6ER
15037fa888
Typo 2017-01-28 00:17:32 +01:00
DL6ER
d595fef18f
Fix regex 2017-01-28 00:15:06 +01:00
Dan Schaper
be5fa22b6f Merge pull request #1174 from pi-hole/tweak/logrotate_insecure_directory 
Improve logrotate support
 2017-01-27 11:18:06 -08:00
DL6ER
6fd7e0311c
Install customized version of logrotate script 2017-01-27 14:16:24 +01:00
DL6ER
1bcf2dd0fc
Tweak CLI domain filter 2017-01-27 00:45:57 +01:00
DL6ER
dad18dc5de
Changed keywords 2017-01-25 10:35:45 +01:00
DL6ER
5c95c4074b
Remove static leases from DHCP static leases file 2017-01-25 10:35:03 +01:00
DL6ER
4301b9a12a
Add static DHCP leases to new file 2017-01-25 10:33:25 +01:00
DL6ER
6a89c6bf3b
Silence rm warning if no DHCP server is used 2017-01-23 15:06:36 +01:00
Promofaux
fe8c365d17 codacy never lies 2017-01-22 20:53:30 +00:00
Promofaux
9acc3aac01 pipe du -h output to awk to ensure we only get the file size, and not the filename too. Yeah that's right Dom, pipe. 2017-01-22 20:44:07 +00:00
Promofaux
1ad23a065e switch out wc -l with grep -c ^ 2017-01-22 20:38:46 +00:00
Promofaux
de102fde5c Add line count and size check for pihole.log 2017-01-22 20:38:09 +00:00
DL6ER
8bb9dd460b
Be able to disable the DHCP domain name 2017-01-18 12:22:03 +01:00
Mcat12
58f3ff69d8 Align comment with referenced line 2017-01-16 18:51:13 -05:00
DL6ER
72d8d10e64
Show most recently blocked domain in chronometer (using FTL). Fixes #717 2017-01-16 22:39:58 +01:00
Mcat12
63d02df0bc Merge pull request #1130 from pi-hole/new/logrotate 
Use logrotate for pihole.log
 2017-01-16 15:11:11 -05:00
DL6ER
08f08fea61 Merge pull request #1135 from pi-hole/new/multipleDNSservers 
Allow multiple DNS servers
 2017-01-13 23:48:38 +01:00
DL6ER
1ed2a8637f
Removed debug echo's 2017-01-13 23:39:57 +01:00
Mcat12
d196c13f2c Merge pull request #1131 from pi-hole/chronometerJsonUnixTools 
No excuse for chronometer not to match API
 2017-01-13 16:34:51 -05:00
DL6ER
bd1c5a42e8
Allow multiple DNS servers 2017-01-13 17:49:55 +01:00
DL6ER
845d8c0e63
Ensure LC_NUMERIC=C is set when evaluating floating point number (non-English systems might expect "," as decimal separator 2017-01-13 12:59:49 +01:00
Promofaux
b4c32e47c6 Missed one! 2017-01-12 22:07:07 +00:00
Promofaux
248d8680f7 actual codacy complaints 2017-01-12 21:51:10 +00:00
Promofaux
1bda965a7c Codacy complaints 2017-01-12 21:50:16 +00:00
Promofaux
2ee305769d Replace all calculations with values read directly web admin API. Parse JSON using native unix tools, no additional requirements needed. 2017-01-12 21:23:58 +00:00
DL6ER
3a8a936575
Corrected path 2017-01-12 21:01:52 +01:00
DL6ER
3fd2ffd466
Add logrotate for pihole.log 2017-01-12 20:39:25 +01:00
DL6ER
b56ca2b834
Add DNSSEC support to Pi-hole core 2017-01-12 16:02:41 +01:00
DL6ER
a263936243
Merge branch 'development' into wildcardblacklisting 2017-01-11 18:25:51 +01:00
DL6ER
2935275227
Merge branch 'development' into wildcardblacklisting 2017-01-09 14:53:01 +01:00
DL6ER
74a4e62cc9
Codacy fix 2017-01-08 11:26:56 +01:00
DL6ER
63a414a544
Align outputs 2017-01-08 11:21:50 +01:00
DL6ER
7d1f5091a7
Fixed small typo 2017-01-08 11:21:10 +01:00
DL6ER
3b54cab3bc
Show branches and revisions (incl. possible dirty state) in debug log 2017-01-08 11:17:25 +01:00
DL6ER
d9e949b27c Merge pull request #1096 from pi-hole/fix/updater 
Fix updater failing on non-English systems
 2017-01-06 23:36:42 +01:00
DL6ER
168397e90d
Fixed typo in webpage.sh 2017-01-05 21:45:06 +01:00
DL6ER
e3c1fcd2c6
NEW LOGIC FOR THE UPDATER 
Compare local and remote hashes. Update is available if current remote hash is different from current local hash since we assume that local should never be newer than remote for user
 2017-01-05 13:10:19 +01:00
DL6ER
200995bf29
Make IPv6 features of Pi-hole DHCP server switchable 2017-01-03 14:24:33 +01:00
DL6ER
3a90c1c192
Source setupVars.conf before trying to access variables 2017-01-03 13:34:01 +01:00
Adam Warner
12bec1df68 Merge pull request #1048 from pi-hole/tweak/simplify_webpage.sh 
Major simplification of webpage.sh + extend DHCP to IPv6
 2017-01-02 14:28:26 +00:00
DL6ER
ad61852804
Test against empty string 2017-01-02 11:10:38 +01:00
DL6ER
dbd8aee4ee
Add 'local' domain if not set in setupVers.conf 2017-01-02 11:08:54 +01:00
DL6ER
677694b01a
Set 24h lease time if settings was empty before 2017-01-02 11:05:40 +01:00
DL6ER
85f0241c0d
Reprocess DHCP settings after update 2017-01-02 10:50:59 +01:00
DL6ER
ebf0db4bbf Typo fixed 2016-12-31 17:17:46 +00:00
DL6ER
9ac265980f Add .conf to filename 2016-12-31 13:41:19 +00:00
DL6ER
40798da6b1 Add blacklisting wildcard support 2016-12-31 12:49:04 +00:00
Dan Schaper
fc596e41d4
All scripts set executable 2016-12-30 18:35:16 -08:00
DL6ER
5c7fc05a32 Enable DHCP logging by default 2016-12-30 16:31:57 +00:00
DL6ER
9181a4a1d8 Apply dhcp lease time also for IPv6 2016-12-29 14:26:23 +00:00
DL6ER
3268e1611a Backend accept and apply dhcp lease time 2016-12-29 14:19:44 +00:00
DL6ER
cf724176dc Do stateful DHCPv6 and SLAAC 2016-12-28 20:02:48 +00:00
DL6ER
1e627c7e8f Make webpage.sh fully library style 2016-12-28 16:25:14 +00:00
DL6ER
9af26cbaac Major simplification of webpage.sh 2016-12-28 02:14:47 +00:00
DL6ER
321ea8a3a9 Merge branch 'development' into webUIprivacymode 2016-12-27 21:27:11 +01:00
Dan Schaper
ef8292d371 Merge branch 'development' into updater_rewrite 2016-12-27 11:59:52 -08:00
DL6ER
e50947eb58
mend 2016-12-25 21:26:06 +01:00
DL6ER
ca056d32d2
Remove git -C 2016-12-25 21:22:59 +01:00
DL6ER
e15548cbf5
Add --quiet to git fetch in GitCheckUpdateAvail() 2016-12-25 01:18:58 +01:00
DL6ER
5e28e6b9ac
Removed remaining git -C 2016-12-25 01:17:46 +01:00
Dan Schaper
3365ef7aaa
is_repo() returns values to caller, silence function. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-24 11:54:04 -08:00
Dan Schaper
68c17b26dc
Bashisms 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-24 11:41:42 -08:00
Dan Schaper
e647efd471
Shell script, not javascript 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-24 11:24:20 -08:00
DL6ER
15db1ffdd5
Remove variables not needed any more 2016-12-24 15:48:43 +01:00
DL6ER
4632b0f797
Updated updater logic 2016-12-24 15:40:31 +01:00
DL6ER
65c35a5530
Use new subroutine to determine if updates are available 2016-12-24 15:32:25 +01:00
DL6ER
c449a1c0e0
Added GitCheckUpdateAvail() 2016-12-24 15:19:39 +01:00