Commit Graph

2288 Commits

Author SHA1 Message Date
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
Jacob Salmela 0fe5efba76 Merge pull request #1265 from ProtoFoo/ProtoFoo-redirect
Redirect pi.hole to pi.hole/admin/
2017-02-21 15:49:19 -06:00
ProtoFoo fb6631d317 Removed a line that did nothing. 2017-02-21 22:22:30 +01:00
ProtoFoo cd0b8927c5 Removed a line that did nothing. 2017-02-21 22:22:03 +01:00
ProtoFoo 3fab34687c Redirect pi.hole to pi.hole/admin/ 2017-02-21 20:38:09 +01:00
ProtoFoo b2d78edae9 Redirect pi.hole to pi.hole/admin/ 2017-02-21 20:36:59 +01:00
ProtoFoo 412cacac49 Merge pull request #1 from pi-hole/development
Development
2017-02-21 19:10:47 +01:00
Dan Schaper dcb9797f35
Tests changed to reflect `uname` calls.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-21 09:24:00 -08:00
Dan Schaper 4dcee5cd84
`arch` is not portable.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-21 09:14:49 -08:00
DL6ER a64211123f
Some debug additions 2017-02-21 16:46:54 +01:00
DL6ER 1645677c3a
Cosmetics 2017-02-21 16:42:52 +01:00
DL6ER 4f85ace525
Force pihole user to use sh-shell (instead of nologin) 2017-02-21 14:46:53 +01:00
DL6ER e8fde702a0
Also chown the other files 2017-02-21 11:52:07 +01:00
DL6ER e339f3852c
Change ownership of FTL log to pihole user 2017-02-21 11:50:08 +01:00
DL6ER 032f94afc0
Don't suppress su's output 2017-02-21 11:46:31 +01:00
DL6ER e9b50442fa
Remove test_FTL_support_files_installed as we create them using the init.d script as of now 2017-02-21 11:25:18 +01:00
DL6ER 77b3764481
Remove resundant code (FTL will later be enabled by enable_service) 2017-02-21 11:23:01 +01:00
DL6ER 90ccbef431
pihole-FTL init.d script 2017-02-21 11:18:47 +01:00
Dan Schaper 02ea9b9abc
Check file path and permissions in one go.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-20 18:15:40 -08:00
Dan Schaper 4cd598ae10
Check support files installed and permissions.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-20 18:12:51 -08:00
Dan Schaper 8eeb8ad779
Check binary installed and functional.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-20 17:15:04 -08:00
Dan Schaper 2ffb103acb
Move binary to final home.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-20 15:44:33 -08:00
Dan Schaper a0c17368ed
`cd` to directory to sha1sum
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-20 15:27:24 -08:00
Dan Schaper d76e761d0b
Merge remote-tracking branch 'origin/new/FTL-binary' into new/FTL-binary
# Conflicts:
#	automated install/basic-install.sh
2017-02-20 15:22:55 -08:00
Dan Schaper 6023984703
Silence sha check
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-20 15:13:54 -08:00
Dan Schaper cde7b53de3
Check sha1 of transferred file.
Sha1sum file in temp directory.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-20 15:13:26 -08:00
Dan Schaper b36a44a954
Check sha1 of transferred file. 2017-02-20 14:44:34 -08:00
Adam Warner fcc3d5450d Merge pull request #1263 from pi-hole/idea
accidentally the idea file
2017-02-20 22:16:50 +00:00
Dan Schaper 057cecb3e0
Replace ignored file. 2017-02-20 14:12:45 -08:00
Adam Warner 86c6e0e826 accidentally the idea file 2017-02-20 21:36:27 +00:00
Adam Warner 5c223b5f4e Merge pull request #1262 from pi-hole/gitAttributes
linux style line endings enforced
2017-02-20 21:28:16 +00:00
Dan Schaper 883aa30aca
Revert reversion. 2017-02-20 13:25:28 -08:00
Adam Warner 763b51fe22 linux style line endings enforced 2017-02-20 21:12:04 +00:00
Dan Schaper dd1aa9163c
Fix IDEA ignoring pullapprove.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-20 12:01:38 -08:00
Dan Schaper e087797edc
Test for format of tag version.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-20 11:49:20 -08:00
Dan Schaper 5e6f8489a9
Find 404 errors and relay message.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-20 11:45:58 -08:00
Dan Schaper 48351fed79
Remove trailing newline from curl'd variable.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-20 11:33:55 -08:00
Dan Schaper 875a5d309d
Check downloaded file for binary or text.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-20 11:28:36 -08:00
Dan Schaper 70e876ee13
Download tests.
Make sure we download a binary and not just get the GitHub page.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-20 11:11:16 -08:00
Dan Schaper 7a269e757e
Debian buildpack image for docker (Need `curl` for testing, using scm version to add `curl` and `git`.)
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-20 09:24:47 -08:00
Dan Schaper 87edbeaf58
Factor out downloader from detector function.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-20 08:40:17 -08:00
Dan Schaper 339f95b00c
Change from `uname -m` to straight `arch`
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-20 08:13:46 -08:00
Dan Schaper e480c761cd
Merge remote-tracking branch 'origin/new/FTL-binary' into new/FTL-binary
# Conflicts:
#	test/test_automated_install.py
2017-02-20 07:25:34 -08:00
Dan Schaper 26c628f8a5
Mock ldd command response.
Test aarch64 detection

Arm v6/v7 little endian.

x86_64 native

Test aarch64 detection

Unknown platform detection.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-20 07:22:25 -08:00
Dan Schaper 59d6907d71
Test aarch64 detection
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-20 06:34:57 -08:00
Dan Schaper b4450a3918
Mock ldd command response.
Test aarch64 detection

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-20 06:34:54 -08:00
Dan Schaper 7032be6049
Template for FTL engine type tests.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-20 06:34:40 -08:00
DL6ER 70a6a79b8c
Detect library differently 2017-02-20 13:40:32 +01:00
DL6ER f24f77c5bd
Detect if architecture is *aarch* + use hf binary only if ARMv7+ is detected 2017-02-20 11:14:23 +01:00