DL6ER
f2b820079a
Merge pull request #2329 from pi-hole/tweak/remove-ppc
...
Remove PowerPC from FTL binaries
6 years ago
WaLLy3K
083024496a
Merge pull request #2327 from pi-hole/header-fix
...
Fix Chronometer heading
6 years ago
Mcat12
e01eea8ba8
Remove PowerPC from FTL binaries
...
It is no longer built, and may cause 404 errors if it attempts to
download the binary.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
WaLLy3K
eef948d797
Fix header newlines
...
* Added \\n to each $xxx_ver_str, resolving issue #2325
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
6 years ago
DL6ER
8017be7d09
Merge pull request #2322 from pi-hole/release/v4.0
...
Git Flow - Release/v4.0 merge back to development.
6 years ago
Dan Schaper
5b628a4c77
Merge branch 'development' into release/v4.0
6 years ago
Dan Schaper
e80ae4906f
Merge pull request #2318 from pi-hole/tweak/wildcard-regex-format
...
Use simpler regex format for wildcards
6 years ago
Mcat12
e4e22fb58e
Fix permissive regex
...
The `\.?` is too permissive, letting in anything that ends in the domain
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
7086a400e8
Use simpler regex format for wildcards
...
Use `\.?domain\.com$` instead of `((^)|(\.))domain\.com$`
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mark Drobnak
a25a13fde0
Merge pull request #2317 from pi-hole/fix/parse_pihole-FTL.conf
...
Add empty pihole-FTL.conf file
6 years ago
Dan Schaper
993beab3b7
Changed wording.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
06875f2cc9
Merge branch 'release/v4.0' into fix/parse_pihole-FTL.conf
6 years ago
Dan Schaper
448fc7231c
Installed to `/etc/pihole` as PI_HOLE_CONFIG_DIR variable.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
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>
6 years ago
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
6 years ago
Dan Schaper
fb2810557a
Allow web user group to access regex.list
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
82a64db42b
Merge pull request #2313 from pi-hole/fix/pihole-man-usage
...
Fix wildcard/regex usage formatting
6 years ago
Mcat12
57af0ba0a4
Use `install` to make the regex file
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Dan Schaper
17c1e64f7e
Moved FTL configuration copy in to scripts copy function.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
af13ceac24
Touch file as ${USER} instead of copying template.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
af2ec61965
Convert [] to ()
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
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>
6 years ago
Dan Schaper
b2fb3fd35a
Merge pull request #2310 from pi-hole/feature/pihole-FTL.conf
...
Include template pihole-FTL.conf
6 years ago
Dan Schaper
94b7c8eb59
Added header for file. Not using standard Pi-hole copyright header.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
6d671007dd
Merge pull request #2314 from pi-hole/fix/ftl-install-error-output
...
Fix FTL install leaking error output
6 years ago
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>
6 years ago
Dan Schaper
f90c412b35
nroff checked pihole.8 for formatting. `nroff -man pihole.8`
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Mcat12
c73b5456eb
Fix "which" error leaking
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
3d87398721
Fix `check_service_active` leaking error output
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
96681887b8
Fix wildcard/regex usage formatting
...
Fix whitespace issue and missing backslashes in the regex example.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Dan Schaper
f2c675cff6
Formatted pihole-FTL.conf for readability.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
1844bf17a7
Merge pull request #2311 from pi-hole/fix/git-head-flag
...
Fix wrong git command flag
6 years ago
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>
6 years ago
Mark Drobnak
814d5f6d6c
Merge pull request #2307 from borats/development
...
Change the word "folder" to "directory" since the pi-hole is intended…
6 years ago
Dan Schaper
512d2dd5f8
Source git repo and not /opt location.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
ad20d5ac1c
Remove -t SOURCE and DIRECTORY reversal flag on install.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
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>
6 years ago
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>
6 years ago
Dan Schaper
a44096a26d
Merge pull request #2303 from pi-hole/development
...
Update release/v4.0 with latest development changes
6 years ago
Dan Schaper
32cf94fc74
Merge pull request #2297 from pi-hole/bugfix/locales
...
Fixed locale issue, do not parse for string.
6 years ago
Dan Schaper
39e28cd80a
Merge pull request #2302 from pi-hole/revert/2282
...
Revert #2282
6 years ago
Adam Warner
9b1356ad01
Revert #2282
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Dan Schaper
46a366635c
Fixed locale issue, do not parse for string.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
384b588a2d
Merge pull request #2291 from pi-hole/merge/FTLDNS-to-development
...
Fix merge conflict in #2276
6 years ago
Mcat12
03e5a78d8f
Merge remote-tracking branch 'origin/FTLDNS' into development
...
# Conflicts:
# advanced/Scripts/piholeDebug.sh
6 years ago
Dan Schaper
e32c76b059
Merge pull request #2289 from pi-hole/feature/space_tab
...
Adjusting spacing for utility scripts.
6 years ago
Dan Schaper
ba7782f867
Space/Tab piholeDebug.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
c5091b0e49
Space/Tab wildcard_regex_converter.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
b54e32f0ca
Space/Tab webpage.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
328e7738d5
Space/Tab version.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago