539 commits

Author	SHA1	Message	Date
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	da05491992	Merge pull request #1192 from pi-hole/fix/regex ... Remove misplaced start of string expression	2017-01-30 21:25:45 +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
DL6ER	8b22f435ad	Change how user and group are stored in the logrotate config file (necessary on Ubuntu 16.04.1)	2017-01-29 19:58:53 +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	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
DL6ER	bcb8a52418	Added user to cron file	2017-01-13 11:57:07 +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	6b6fbc4709	Remove --force on @reboot	2017-01-12 20:41:25 +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