e1c3c53058
Merge branch 'release/v4.1' into fix/adlists.list_not_created
2018-11-08 20:29:07 +01:00
057fbfc2b9
Change field from digit to string for printf
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2018-11-08 11:10:09 -08:00
33156071cd
Fix literal "choice" being passed to appendToListsFile()
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-11-08 19:43:35 +01:00
e8c2e26358
Override shellcheck with explanations.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2018-11-03 13:39:43 -07:00
61c67849d7
Support multiple distributions and release versions in find_IPv4_information().
...
Add basic sanity check to function, remove unused variable.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2018-11-03 13:20:40 -07:00
2cdbb34763
Merge pull request #2488 from pi-hole/feature/command_function
...
Moved `command -v` calls to function in installer.
2018-11-02 22:16:44 -04:00
1789a2db29
Merge pull request #2384 from pi-hole/feature/install-privacy-level
...
Set FTL Privacy Level During Install
2018-11-01 15:16:11 -04:00
c270b83341
Use printf instead of echo
...
Co-Authored-By: Mcat12 <mark.drobnak@gmail.com >
2018-11-01 15:14:26 -04:00
02f0788033
Moved command -v calls to function.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2018-11-01 12:00:08 -07:00
9d2d45b473
Query php directly for major and minor version id strings.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2018-11-01 05:59:14 -07:00
0c892e6b3a
Addressed Stickler ShellCheck lints
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2018-10-31 14:35:55 -07:00
a0fc38d6a2
All terminal echo commands changed to printf.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2018-10-31 11:14:05 -07:00
e7e03e36de
fix pihole user creation function
...
- fix stdout newlines
- catch failed user creation
Signed-off-by: bcambl <blayne@blaynecampbell.com >
2018-10-12 11:05:44 -06:00
cc2f375b13
fix for #2450
...
Signed-off-by: Adam Warner <adamw@rner.email >
2018-10-07 11:51:36 +01:00
a89615365e
Merge pull request #2410 from stuartskelton/norton_dns_EOL_2018_11_15
...
Remove Norton Connect Safe as its EOL 2018-11-15
2018-09-10 17:52:09 -04:00
3c36c22ca8
Remove Norton Connect Safe as its EOL 2018-11-15
...
Signed-off-by: Stuart Skelton <stuarts@broadbean.com >
2018-09-10 22:37:45 +01:00
6f276ae4bb
Merge pull request #2299 from nullr0ute/net-tools
...
Use ip route rather than old net-tools route in chronometer.sh
2018-09-09 15:11:19 -04:00
3cea1bd423
Fix lighttpd v1.4.50 crashing on startup
...
It has a bug/regression causing it to fail if external.conf does not exist,
so touch external.conf when installing lighttpd config
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com >
2018-09-07 12:09:37 -04:00
c58e3acc78
add unsupported RPM distro warnings
...
Signed-off-by: bcambl <blayne@blaynecampbell.com >
2018-08-31 10:04:52 -06:00
6f8e8e98bb
update centos version check test
...
Signed-off-by: bcambl <blayne@blaynecampbell.com >
2018-08-29 22:16:11 -06:00
24b4aabae9
allow installer to continue with additional rpm based distros
...
- FedBerry (Fedora based ARM image)
- Scientific Linux (CentOS based)
- Add prompt to continue installing on unsupported RPM based distros
Signed-off-by: bcambl <blayne@blaynecampbell.com >
2018-08-29 20:49:06 -06:00
1813c25117
If config file was backed up: Print info message
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-08-21 13:07:23 +02:00
5d0d7336ff
Echo with newline when setting privacy level
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-08-20 20:21:03 -04:00
6a26a05dbf
Fix privacy level whiptail option format
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-08-20 19:40:43 -04:00
4aafa8cf47
Set the FTL privacy level during install
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-08-20 19:20:29 -04:00
28c6b1393f
Backup existing /etc/dnsmasq.conf if present and ensure that /etc/dnsmasq.conf contains only "conf-dir=/etc/dnsmasq.d"
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-08-20 22:52:22 +02:00
0d1b3cee4f
Enable FTL service before starting it
...
Signed-off-by: Realtebo <mirkotebaldi@yahoo.it >
2018-08-16 17:52:47 +02:00
476fecbcf5
Fixed typos as suggestes
...
Signed-off-by: Realtebo <mirkotebaldi@yahoo.it >
2018-08-14 15:04:42 +02:00
327b58fa03
Merge pull request #1 from pi-hole/development
...
Merge with current main development branch
2018-08-14 14:55:18 +02:00
d3eea9404d
Merge pull request #2331 from pi-hole/tweak/improve_FTL_download_errormsg
...
Improve error message when downloading FTL failed
2018-08-14 13:20:47 +02:00
d9195970b7
Create adlist file while running unattended setup
...
Signed-off-by: Realtebo <mirkotebaldi@yahoo.it >
2018-08-12 23:21:01 +02:00
ef8aaba014
Merge pull request #2320 from TronPaul/fix/no-tty
...
set noninteractive during unattended install
2018-08-08 19:28:12 -04:00
f5c3dc5d9d
Improve download error message that is shown when downloading or verifying the binary failed
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2018-08-07 16:51:58 +02:00
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 >
2018-08-06 21:15:16 -04:00
5b628a4c77
Merge branch 'development' into release/v4.0
2018-08-05 21:16:19 -07:00
0081a7ca92
set noninteractive during unattended install
...
Signed-off-by: Mark McGuire <mark.b.mcg@gmail.com >
2018-08-05 10:12:43 -05:00
993beab3b7
Changed wording.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net >
2018-07-31 11:14:26 -07:00
06875f2cc9
Merge branch 'release/v4.0' into fix/parse_pihole-FTL.conf
2018-07-30 14:32:29 -07:00
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
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
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
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
57af0ba0a4
Use install to make the regex file
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-29 18:26:00 -04:00
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
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
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
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
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
c73b5456eb
Fix "which" error leaking
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-28 21:12:05 -04:00
3d87398721
Fix check_service_active leaking error output
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com >
2018-07-28 20:50:04 -04:00
DL6ER