3466 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
DL6ER	8017be7d09	Merge pull request #2322 from pi-hole/release/v4.0 ... Git Flow - Release/v4.0 merge back to development.	2018-08-06 09:57:28 +02:00
Dan Schaper	5b628a4c77	Merge branch 'development' into release/v4.0	2018-08-05 21:16:19 -07:00
Dan Schaper	e80ae4906f	Merge pull request #2318 from pi-hole/tweak/wildcard-regex-format ... Use simpler regex format for wildcards	2018-08-01 01:01:08 -07:00
Mcat12	e4e22fb58e	Fix permissive regex ... The `\.?` is too permissive, letting in anything that ends in the domain Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-31 22:16:40 -04:00
Mcat12	7086a400e8	Use simpler regex format for wildcards ... Use `\.?domain\.com$` instead of `((^)|(\.))domain\.com$` Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-31 21:36:29 -04:00
Mark Drobnak	a25a13fde0	Merge pull request #2317 from pi-hole/fix/parse_pihole-FTL.conf ... Add empty pihole-FTL.conf file	2018-07-31 19:51:34 -04:00
Dan Schaper	993beab3b7	Changed wording. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-31 11:14:26 -07:00
Dan Schaper	06875f2cc9	Merge branch 'release/v4.0' into fix/parse_pihole-FTL.conf	2018-07-30 14:32:29 -07:00
Dan Schaper	448fc7231c	Installed to /etc/pihole as PI_HOLE_CONFIG_DIR variable. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-30 14:26:07 -07:00
Dan Schaper	d0d030bafc	Moved file creation to proper function. Included bash variables for file ... location. Set to pihole:pihole ownership with 644 permissions. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-30 14:02:18 -07:00
Dan Schaper	833131e15f	Merge pull request #2315 from pi-hole/fix/regex-file-ownership ... Allow PHP to edit the regex file if web is installed	2018-07-30 06:36:20 -07:00
Dan Schaper	fb2810557a	Allow web user group to access regex.list ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-29 16:09:03 -07:00
Dan Schaper	82a64db42b	Merge pull request #2313 from pi-hole/fix/pihole-man-usage ... Fix wildcard/regex usage formatting	2018-07-29 15:43:19 -07:00
Mcat12	57af0ba0a4	Use install to make the regex file ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-29 18:26:00 -04:00
Dan Schaper	17c1e64f7e	Moved FTL configuration copy in to scripts copy function. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-29 09:06:51 -07:00
Dan Schaper	af13ceac24	Touch file as ${USER} instead of copying template. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-29 08:42:59 -07:00
Dan Schaper	af2ec61965	Convert [] to () ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-29 08:17:57 -07:00
Mcat12	a55cc55338	Only touch the regex file if it doesn't already exist ... The other permission calls will always be run so that the file is in the expected state after install and repair. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-28 23:07:35 -04:00
Dan Schaper	b2fb3fd35a	Merge pull request #2310 from pi-hole/feature/pihole-FTL.conf ... Include template pihole-FTL.conf	2018-07-28 20:04:39 -07:00
Dan Schaper	94b7c8eb59	Added header for file. Not using standard Pi-hole copyright header. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-28 19:58:23 -07:00
Dan Schaper	6d671007dd	Merge pull request #2314 from pi-hole/fix/ftl-install-error-output ... Fix FTL install leaking error output	2018-07-28 19:53:04 -07:00
Mcat12	1a8d5fb4a9	Allow PHP to edit the regex file if installed ... Fixes permissions error on the web interface when modifying the regex. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-28 21:57:39 -04:00
Dan Schaper	f90c412b35	nroff checked pihole.8 for formatting. nroff -man pihole.8 ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-28 18:28:25 -07:00
Mcat12	c73b5456eb	Fix "which" error leaking ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-28 21:12:05 -04:00
Mcat12	3d87398721	Fix check_service_active leaking error output ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-28 20:50:04 -04:00
Mcat12	96681887b8	Fix wildcard/regex usage formatting ... Fix whitespace issue and missing backslashes in the regex example. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-28 20:35:15 -04:00
Dan Schaper	f2c675cff6	Formatted pihole-FTL.conf for readability. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-28 16:16:16 -07:00
Dan Schaper	1844bf17a7	Merge pull request #2311 from pi-hole/fix/git-head-flag ... Fix wrong git command flag	2018-07-28 10:48:29 -07:00
Mark Drobnak	47b56d6123	Fix wrong git command flag ... I could not find documentation on a `--head` flag, but there is a `--heads` flag which does the same thing. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	2018-07-27 23:27:44 -04:00
Mark Drobnak	814d5f6d6c	Merge pull request #2307 from borats/development ... Change the word "folder" to "directory" since the pi-hole is intended…	2018-07-27 22:36:20 -04:00
Dan Schaper	512d2dd5f8	Source git repo and not /opt location. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-27 15:47:20 -07:00
Dan Schaper	ad20d5ac1c	Remove -t SOURCE and DIRECTORY reversal flag on install. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-27 15:39:37 -07:00
Dan Schaper	b79ff05e29	Move template files to own subdir. Include pihole-FTL.conf in templates. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-27 15:21:25 -07:00
Borats Nolan	32b50f8188	Change the word "folder" to "directory" since the pi-hole is intended to run on rpi with Linux on it. ... Signed-off-by: Borats Nolan <borats@i.dont.use.email>	2018-07-28 02:35:39 +10:00
Dan Schaper	a44096a26d	Merge pull request #2303 from pi-hole/development ... Update release/v4.0 with latest development changes	2018-07-26 22:30:51 -07:00
Dan Schaper	32cf94fc74	Merge pull request #2297 from pi-hole/bugfix/locales ... Fixed locale issue, do not parse for string.	2018-07-26 16:44:52 -07:00
Dan Schaper	39e28cd80a	Merge pull request #2302 from pi-hole/revert/2282 ... Revert #2282	2018-07-26 16:38:44 -07:00
Adam Warner	9b1356ad01	Revert #2282 ... Signed-off-by: Adam Warner <adamw@rner.email>	2018-07-27 00:27:06 +01:00
Dan Schaper	46a366635c	Fixed locale issue, do not parse for string. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-26 05:30:05 -07:00
Dan Schaper	384b588a2d	Merge pull request #2291 from pi-hole/merge/FTLDNS-to-development ... Fix merge conflict in #2276	2018-07-24 11:51:56 -07:00
Mcat12	03e5a78d8f	Merge remote-tracking branch 'origin/FTLDNS' into development ... # Conflicts: # advanced/Scripts/piholeDebug.sh	2018-07-22 15:18:26 -04:00
Dan Schaper	e32c76b059	Merge pull request #2289 from pi-hole/feature/space_tab ... Adjusting spacing for utility scripts.	2018-07-20 19:23:50 -07:00
Dan Schaper	ba7782f867	Space/Tab piholeDebug.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-20 15:25:35 -07:00
Dan Schaper	c5091b0e49	Space/Tab wildcard_regex_converter.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-20 14:00:34 -07:00
Dan Schaper	b54e32f0ca	Space/Tab webpage.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-20 13:57:15 -07:00
Dan Schaper	328e7738d5	Space/Tab version.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-20 13:27:30 -07:00
Dan Schaper	aca359c2e2	Space/Tab updatecheck.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-20 13:24:05 -07:00
Dan Schaper	1cd40dc9e5	Space/Tab update.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-20 13:22:37 -07:00
Dan Schaper	dc9407281f	Space/Tab setupLCD.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-20 13:17:10 -07:00
Dan Schaper	8f727c1f35	Space/Tab query.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2018-07-20 13:13:42 -07:00