a1d6ef04ec
Merge pull request #1758 from mettacrawler/fix-for-RHELish-ifcfg
...
basic-install.sh - no CIDR in ifcfg-*
2018-03-30 17:28:52 -04:00
238a56cac3
Remove CreateLogFile function, as this is handled by the FTL service
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-23 10:53:22 +00:00
51765b1f65
chown pihole log to pihole:pihole, rather than pihole:root
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-23 10:15:40 +00:00
e131395cce
Merge pull request #2037 from justinamcafee/master
...
Adds FamilyShield DNS server address to the "Choose DNS" screen in installer.
2018-03-21 17:47:24 -04:00
d26ea2b948
remove trailing whitespace
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-18 00:38:34 +00:00
e2e8b733a8
tidy up function
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-18 00:13:10 +00:00
f18bf35b20
use `systemctl is-enabled` to check enabled status of service
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-17 22:56:50 +00:00
44d8cb77e3
Kill off `mask_service` function
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-17 22:48:11 +00:00
b92ccb2de4
Additionally `mask` the dnsmasq service on systems with systemctl
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-14 20:01:06 +00:00
30af6e73be
added ;; to line 825
...
Misformated case. Updated correct case
2018-03-10 17:36:47 -06:00
2895b9bfb7
Added support for FamilyShield from OpenDNS
...
With a very minor code change, individuals can now implement restrictions on dangers, disturbing, or otherwise adult oriented content without the need for managed restrictions.
This is a fairly non-invasive change and will benefit users who intend to use VPN for home or small business uses where access to such material may be undesirable.
2018-03-10 17:33:31 -06:00
84bd86f1ee
- Test to see if dnsmasq service is enabled before stopping and disabling it.
...
- Some formatting tweaks to the `start_service` `stop_`service` `disable_service` and `enable_service` commands
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-07 23:31:28 +00:00
7193f40b87
remove libnettle, missed a >/dev/null
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-07 22:23:05 +00:00
acd69fa4b0
silence push/popd
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-07 22:21:09 +00:00
6584933e92
fix stickler complaints
...
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-06 18:51:02 +00:00
8cf8da4c78
- Check file /etc/pihole/ftlbranch for current FTL branch, download from github if master, or pi-hole.net if other
...
- Check if downloaded binary file can resolve queries, if so stop and disable dnsmasq
- Add service_disable function
- Add dependency libcap2-bin on debian to enable setcap. Need to check other distos
-Always download FTL binary if /etc/pihole/ftlbranch does not contain "master"
- Change some strings/variables that reference dnsmasq and change them to pihole/pihole-FTL
Signed-off-by: Adam Warner <adamw@rner.email>
2018-03-06 18:44:57 +00:00
cadab61a21
Merge branch 'development' into FTLDNS
2018-03-05 21:33:53 +00:00
3425b9a82e
Fix mktmp > mktemp
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-03-02 12:28:53 -08:00
fcdc85eab8
Remove dnsmasq from dependencies
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-25 23:47:11 +01:00
4606693e62
Use pushd/popd and create random temporary directory to prevent potential backdoor binary injection.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-02-22 20:13:38 -08:00
e61d8e4fb8
adlists.default no longer used. No need to reference it.
...
Use --force switch of gravity to force the cache refresh
Signed-off-by: Adam Warner <adamw@rner.email>
2018-02-22 14:45:31 +00:00
8b79017d0f
Always replace pihole-FTL.service
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-02-18 13:07:22 +01:00
5465ac9ba0
Merge pull request #1929 from pi-hole/fix/flushDB
...
pihole -f: Flush database
2018-02-17 17:45:15 +01:00
3472241289
Merge pull request #1962 from floek/master
...
Fixes https://github.com/pi-hole/pi-hole/issues/1772
2018-02-14 13:02:56 -05:00
a944b6ff79
Fixes https://github.com/pi-hole/pi-hole/issues/1772
2018-02-12 21:28:43 +01:00
c5a2ca5c98
Trivial spelling mistakes in basic-install.sh comments
...
Signed-off-by: Sebastian Pucilowski <smopucilowski@gmail.com>
2018-02-07 16:56:21 +11:00
2b6d9c34c9
Fixed a typo
...
Signed-off-by: Elias Ojala <ojala.s.elias@gmail.com>
2018-01-27 14:36:11 +02:00
158ea1d43b
Add sqlite3 dependency
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2018-01-21 11:54:49 +01:00
535b8458d4
Merge pull request #1901 from bcambl/epel_check
...
Fix epel-release install for CentOS
2018-01-20 14:03:24 -05:00
9543203610
Echo the right location for the log.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-01-20 08:45:41 -08:00
cacfe4d387
Linting changes
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-01-20 07:39:11 -08:00
a7f0137e5f
Use more secure installation log process.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-01-20 05:55:48 -08:00
b2eb364a4b
Update header
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-01-20 05:36:28 -08:00
bb3b1bc6ba
Move ascii berry to after root check, stops the double berry for the sudo refire.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-01-20 05:13:55 -08:00
cc47bf8f6c
Fix epel-release install for CentOS
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-01-07 22:21:04 -06:00
a154f1540f
Merge pull request #1778 from loganaden/development
...
Add secondary quad9 server
2017-12-30 18:19:55 +01:00
677033afca
Force update of "remote" part in th update checker (may take up to 24hrs for new installs otherwise)
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-28 18:41:22 +01:00
95e5baa967
Source setup vars before we attempt to do anything on an update/repair
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-24 13:09:45 +00:00
f89f7ecd3e
Randomize GitHub API update check time
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-12-21 12:42:47 +01:00
29ee8250e9
Change package install notification from CROSS to TICK.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-12-11 09:45:30 -08:00
863ea7294f
Merge pull request #1815 from pi-hole/release/3.2
...
Merge Release 3.2 in to development. GitFlow
2017-12-08 13:06:18 -08:00
f89d69b081
check NetworkManager status prior to using the cli ( #1653 )
...
Closes #1653
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2017-12-07 21:43:14 -06:00
79aada0b87
travis didn't like that
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 22:57:05 +00:00
69dc22c10f
fix some codacy and intelliJ idea complaints
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 22:31:12 +00:00
dd6a9a0b84
supress output of `which command` on centos/fedora as per https://github.com/pi-hole/pi-hole/pull/1776#discussion_r155156819
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 15:28:58 +00:00
945dcc6c2b
Indent two spaces as per https://github.com/pi-hole/pi-hole/pull/1776#discussion_r155157116
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 15:17:31 +00:00
f60791ac7c
Add dependencies as per https://github.com/pi-hole/pi-hole/pull/1776#discussion_r155149349
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 14:42:01 +00:00
b64155a165
Add in an extra check to enable lighttpd.
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-12-06 14:32:39 +00:00
9c8526db49
Add secondary quad9 server
2017-11-20 22:05:41 +04:00
616962200a
Update the list size to show all the options
2017-11-17 18:18:13 +13:00
eb9c44a347
Add support for Quad9 secure dns server
...
See www.quad9.net
2017-11-17 15:54:04 +13:00
f63267a7f9
Merge pull request #1757 from Mausy5043/development
...
Various small fixes
2017-11-11 16:45:16 -06:00
2c8dcd86e5
remove package_check to avoid situations like #1760
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-11-09 20:47:15 +00:00
9631519eb1
Merge pull request #1752 from pi-hole/new/bashupdatechecker
...
Add bash / cron based update checker for Pi-hole
2017-11-08 20:38:40 -06:00
35dc4800e0
basic-install.sh - no CIDR in ifcfg-*
...
Do not expect CIDR format IP addresses in /etc/sysconfig/network-scripts/ifcfg-* files as it is not a requirement.
Expect only:
IPADDR=10.10.10.10
Do not expect:
IPADDR=10.10.10.10/24
2017-11-05 15:28:44 -05:00
ec4e4d3b72
fix indentation
2017-11-05 11:02:04 +01:00
63312ac4b8
removed duplicate word
2017-11-05 10:18:39 +01:00
d158a7d51e
spelling corrected
2017-11-05 10:16:56 +01:00
209a2ab3ec
grammar corrected (double negative)
2017-11-05 10:05:25 +01:00
06764d0f36
Randomize gravity update time between 03:01 - 04:58 (excluding 04:00)
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-29 15:37:39 +01:00
7362416afb
Force an update of the updatechecker after update/install
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-28 15:40:48 +02:00
c34c3eb016
Shift randomized time interval from 00:00-01:59 to 02:00-03:59
2017-10-21 15:58:37 +02:00
85d159bdd1
Randomize gravity update time
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-21 15:52:53 +02:00
a9ad8d67aa
Remove superseded index.js
...
Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-10-04 01:13:02 +11:00
7884423e05
Merge pull request #1719 from 19wolf/patch-1
...
Update basic-install.sh
2017-10-01 12:51:20 -04:00
1615fa63e3
Update basic-install.sh
...
Fixed comment line 40
2017-09-30 16:34:38 -04:00
feb2150d9b
Fix `LIGHTTPD_ENABLED` dupes in `setupVars.conf`
...
* Fix issue merged [here](fdf2649f2f (diff-689793e68cde6270d074695b71c969afL1488)
2017-09-22 19:14:11 +10:00
a0bd517380
Merge pull request #1694 from pi-hole/fix/qf-opt
...
Slow query fix & queryFunc optimisation
2017-09-21 20:05:42 +01:00
4316b15ae2
Merge pull request #1700 from pi-hole/fix/start-ftl
...
Start and enable FTL prior to running Gravity
2017-09-21 20:00:08 +01:00
a643f40cce
Merge pull request #1663 from pi-hole/new/UninstallCleanup
...
Cleanup uninstall script
2017-09-21 19:56:12 +01:00
909bc92c01
Tweak wording to fit on 80 character screen
...
* Also move colour after $INFO
2017-09-21 00:22:47 +10:00
911596daf8
Start and enable FTL prior to running Gravity
2017-09-20 17:29:11 +10:00
d56beedd7a
Add idn2 dependency
2017-09-18 00:41:53 +10:00
5f4be0de35
adjust lighttpd config depending on whether or not custom.php exists
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-09-09 19:30:53 +01:00
6c605f55f9
always overwrite default blockpage, so that changes can be rolled out
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-09-09 19:07:48 +01:00
774c6e8ac0
Merge branch 'development' into new/UninstallCleanup
...
Signed-off-by: Adam Warner <adamw@rner.email>
# Conflicts:
# automated install/uninstall.sh
2017-09-09 18:56:17 +01:00
c65c26b463
Merge branch 'development' into new/UninstallCleanup
2017-08-31 15:36:47 +01:00
6b6d105c2f
Merge branch 'development' into sqlite-dependency
2017-08-28 10:17:33 +01:00
939c99cdbf
accidentally an entire group of letters.
2017-08-23 11:48:11 +01:00
2f36acae49
Remove errornous space
2017-08-23 11:51:16 +10:00
e938132c53
accidentally a space
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-17 21:02:10 +01:00
1b34286264
verbiage
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-17 20:33:53 +01:00
54f4f6d2d7
Add "${INSTALLER_DEPS[@]}" to package array
...
add `-f` to rm commands so that `set -e` is not kicked
Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-17 20:23:07 +01:00
07e5e8e67a
need to include `PH_TEST="true"` so that the install script isn't run when sourcing it.. doh
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-17 20:03:19 +01:00
3c25094495
No need to declare `PKG_MANAGER`, as it's already declared in basic-install
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-17 19:56:36 +01:00
95e3a5944d
Initial overhaul of uninstall script sourcing `distro_check()` from `basic-install.sh` Totally untested as yet...
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-17 19:53:43 +01:00
64f29120c8
indent nested function in basic-install.sh
...
fix dependency in uninstall.sh
Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-17 19:43:07 +01:00
d92434b1e9
Merge branch 'development' into sqlite-dependency
...
Signed-off-by: Adam Warner <adamw@rner.email>
# Conflicts:
# automated install/basic-install.sh
2017-08-16 16:31:47 +01:00
01cd056bcc
Work out correct SQLITE version for php-sqlite
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-16 16:27:50 +01:00
56f2ea3ec2
Add Fedora/Centos dependency
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-16 15:56:39 +01:00
fdf2649f2f
Clean up known remaining colour output issues ( #1613 )
...
* Print newline on error message
* Output last three lines of error if update fails
* Consistent error messages & housekeeping
* Add shellcheck directive to ignore COL_TABLE
* Quoted and braced variables for codebase consistency
* Escaped newlines correctly
* Made error messages consistent (indenting and wording)
* Removed consecutive echos
* Conditional formatting consistency
* Braced, quoted and used [[ on conditionals
* Fix specific ShellCheck issues
* Fixed issues that could be safely changed without extensive testing
* Update SELinux whiptail behaviour & more
* Colourised some strings
* Fixed multiple line string indenting
* Made output consistent with existing codebase
* Removed sequential echos
* Make SELinux whiptail use "--defaultno", and change text wording
* Add help text for hostrecord, and colourise output
* this should fix the tests...
Signed-off-by: Adam Warner <adamw@rner.email>
* revert changes to `update_package_cache()` to prove tests
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-26 18:00:08 +01:00
b09c660833
Always process DNS and DHCP settings in installer ( #1630 )
...
* Always process DNS and DHCP settings in installer
* Make sure dnsmasq config exists before modifying it
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
* Make sure the dnsmasq config directory exists
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
* Only remove the DHCP config if it exists (fixes tests, hopefully)
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2017-07-26 17:15:23 +01:00
c02a24cf71
Fix/unbreak development ( #1635 )
...
* Always process DNS and DHCP settings in installer
* change where finalExports is called and where LIGHTTPD_ENABLED is set.
Signed-off-by: Adam Warner <adamw@rner.email>
* this may or may not work. If it does, can be functionised to reduce code duping
Signed-off-by: Adam Warner <adamw@rner.email>
* This will fix the tests, but break the patch
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-26 14:34:40 +01:00
a77136bd1d
Merge pull request #1600 from pi-hole/tweak/OnlyDownloadFTLNew
...
Only download FTL if a newer version than currently installed is detected (or if no version is detected)
2017-07-25 22:11:31 -04:00
a293b5a371
prevent `./automated install/basic-install.sh: line 1886: /usr/bin/pihole-FTL: No such file or directory` on new install, or if pihole-FTL is missing for whatever reason.
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-25 22:49:06 +01:00
1c93868ae1
Adjust wording of echos
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-24 23:22:04 +01:00
c9a98b68c8
Avoid reactivating a deactivated lighttpd service ( #1485 )
...
* Do not activate disabled lighttpd upon update
* Fixes #1362
* Use systemctl when available
* Move `finalexports` to the very end of the install script
set value of LIGHTTPD_ENABLED to 1 or 0 depending on whether or not lighttpd is enabled or disabled.
actually save LIGHTTPD_ENABLED value to setupvars.conf
Signed-off-by: Adam Warner <adamw@rner.email>
* add [[ -z "${LIGHTTPD_ENABLED}" ]] back in!
Signed-off-by: Adam Warner <adamw@rner.email>
* Ensure "Loaded:" is the line being checked
* Colourise disabled lighttpd message
* Prevent disabled lighttpd triggering error
* change of plan, don't need that [[ -z "${LIGHTTPD_ENABLED}" ]]
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-16 16:44:14 +01:00
edb594461d
Remove CIDR from IPv6 address when detecting it in the install script
...
Signed-off-by: Adam Warner <adamw@rner.email>
# Conflicts:
# automated install/basic-install.sh
2017-07-14 22:31:43 +01:00
bf70c2c660
initial changes to tests to take into account changes to strings
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-12 22:57:57 +01:00
74b912a0b7
Check if FTL is already installed, do not download if it is detected, and the sha1sum matches the remote
...
This will probably break some tests. I'll work that out in a bit
Signed-off-by: Adam Warner <adamw@rner.email>
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-12 22:37:51 +01:00
2778d88e8a
Fix missing `then` clause
2017-07-12 00:12:54 -07:00
e7ad972783
fix thre spelling errors
2017-07-10 14:12:30 -05:00
2f939d8c56
fix two spelling errors
2017-07-07 09:05:19 -05:00
aad39c5ffc
add comments for nearly every line of code.
2017-07-06 19:25:56 -05:00
d0492898eb
Add "php5-sqlite" to uninstall dependencies
2017-07-05 17:21:17 +10:00
c6ba03802f
Add "php5-sqlite" to dependencies
2017-07-05 17:18:21 +10:00
b3eb5c4f0e
Colour Tweaks ( #1549 )
2017-07-01 22:08:17 +10:00
ab1a6d8829
Fix install script using IPv6 CIDR notation ( #1570 )
2017-06-29 11:18:52 +10:00
0de15f7a97
Merge branch 'development' into patch-1
2017-06-25 18:15:33 -04:00
536585b846
Colourise Core Output Text ( #1471 )
...
* Define colours within COL_TABLE
* Do not output colours for non-terminal instances
* Removed ":::"
* Fixed indenting & spacing
* Made output consistent throughout project
* Reworded text to fit on standard 80 char wide Terminal screen
* Made 'sudo raspi-config' warning (insufficient disk space) only show on RPi
* Make "Installation/Update Complete" the final msg
* Remove redundant messages
* Simplify update available message
* Confirm user would like to begin uninstall
* If "git pull" string says "Already up-to-date.", place [i] before it
* Colour Temp/Interface output
* Made `pihole disable 5z` invalid
* Added error fallback if invalid argument (not s/m) is detected
* Quoted "$2" for consistency
* Updated help text
* L185/286: Replaced echo with redirect
* User agents for adblock.mahakala.is/adaway.org unnecessary
* Print newline on confirmation of repository reset
* Add output to admin-related dnsmasq restarts
* Return error message for "pihole -q"
* Imply default checkout behaviour with y/N
* Fix uninstall failing to remove pihole user
* Print checkout 'git remote show origin' STDERR on new line
* Replaced checkout "AdminLTE" wording with "Web Admin"
2017-06-21 21:49:05 +10:00
ecde222512
[Staging] 3.1 ( #1502 )
...
* Fix handling of wildcard help text
* Rewrite help text for better handling of params
* Replace misleading letter variable
* stash changes on branch switch, else it fails if any changes have been made.
* Make changes according to comment in #1384
* Update queryFunc()
* Allow scanList() to search files using a wildcard by removing quotes wrapped around `${list}`
* scanList() will not provide a domain ouput on each string if exact is specified (`grep -l`)
* Remove unused processWildcards() function
* Return a message if no domain is specified
* IDN domains are converted to punycode when running a `pihole -q` search if the `python` package is available, otherwise will revert to current behaviour
* Scan Blacklist & Wildcards first, exiting from search if a match is found (Fixes #1330 )
* Use one `grep` subshell to search for all "*.domains" lists at once (opposed to looping to get every matching file name, and then spawning a `grep` instance for every matching file)
* queryFunc() will not return "(0 results)" output from files where no match is found
* Sort results based off list number
* Return a message if no results are found
* Update basic-install.sh
* Update block page. Allow for setupVars setting of CUSTOMBLOCKPAGE (bool) to prevent it being overwritten
* simplify
* further simplify
* fix inteliJ IDEA complaints
* even further simplify
* tidy up output
* revert line, looks tidyer
* clarify
* Revert "Ensure any changes to blocking page are updated."
* We test for dpkg lock on line 830 directly, no need for the check also
in the template section.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
* Display FTL version & version.sh rewrite
While testing to make sure `pihole -v` would output `pihole-FTL version`, I noticed some options didn't work how I expected them to. For example, if I use `pihole -v -p`, I would expect to see the version output of Pi-hole Core. Instead, I'm informed that it's an invalid option.
I've had the following things in mind while rewriting this:
* I'm operating under the assumption that FTL is only installed if the Admin Console is (Line 113 exit 0)
* I have modified the help text to only output with `pihole -v --help`
* I have modified all output to be more similar to the output style of `grep` and `curl` (Ditching ":::")
Testing output:
```
w3k@MCT:~$ pihole -v
Pi-hole version is v3.0.1-14-ga928cd3 (Latest: v3.0.1)
Admin Console version is v3.0-9-g3760482 (Latest: v3.0.1)
FTL version is v2.6.2 (Latest: v2.6.2)
w3k@MCT:~$ pihole -v -c
Current Pi-hole version is v3.0.1-14-ga928cd3
Current Admin Console version is v3.0-9-g3760482
Current FTL version is v2.6.2
w3k@MCT:~$ pihole -v -l
Latest Pi-hole version is v3.0.1
Latest Admin Console version is v3.0.1
Latest FTL version is v2.6.2
w3k@MCT:~$ pihole -v -p --hash
Current Pi-hole hash is a928cd3https://github.com/pi-hole/pi-hole/pull/1447#issuecomment-300600093
* Perform EXACT searches on HOSTS lists correctly
`\s` on the end may be overkill, but it is the existing scanList() behaviour.
* Fixed indentation
* Minimise string duplication & other minor changes
Instead of duplicating output strings, rewrite core/web/ftlOutput() into one neat versionOutput().
* Modified syntax to be valid for Shellcheck
* Log and echo gateway responses
* Update queryFunc() to search Whitelist
If there is a match in Whitelist/Blacklist/Wildcards, `[ ! -t 1 ]` will cause the search to end if the terminal is closed when the script is called. This has the intended effect of allowing a user to search for a W/B/W domain (as well as all the adlists it's found in) using `pihole -q` via Terminal, but the script will stop searching after a W/B/W match when called by the block page.
* Wrap in double brackets
* Provide remote hashes for version.sh
* Provide remote hashes for comparison
* Use double braces for all conditions (for consistency)
* Suppress potential "cd" error output
* Provide "not applicable" output upon any hash request for FTL
* whitelist on website blocked doesnt work (#1452 )
Since Pi-hole redirects ad domains to itself, accessing the script via de.ign.com is the same as pi.hole in this case. The fix should be as simple as adding a / before admin on this line.
* Solve piholeLogFlush.sh having to be issued 2 x to clear logs (#1460 )
Simplified the command -v syntax, and added a sleep 3 timer to the first execution of the log rotation. The second execution was being issued while the first was still running, thus it would fail and you would have to issue the "Flush Logs" command a second time.
* Use `echo "ABC" | pihole tricorder` to upload to Pi-hole's medical tricorder. Uses SSL if available.
* Update list.sh
I believe this has feature parity with `sed /foo/ Id` but also supports busybox, and my alpine docker ;)
* Document `sed` substitution for user readability
Comment the oneliner with explanations of what each step does.
* Update Help Output (#1467 )
* File consistency
* Tabs to 2 spaces
* Corrected indenting
* Double braced conditionals
* Quoted variables within conditionals
* Standardise core help text
* Added help text for disable command
* Added help text for logging command
* Clean up
* Fixed certain new lines and spaces
* Sync with development branch
* Formatting consistency
* Tabs to 2 spaces
* Corrected indenting
* Double braced conditionals
* Quoted variables within conditionals
* Fixed certain newlines and spaces
* Admin help text
* Added help text for interface command
* Sync with development branch
* Formatting consistency
* Tabs to 2 spaces
* Fixed some wording
* Fixed certain spaces
* Formatting consistency
* Minor wording changes
* Tabs to 2 spaces
* Corrected indenting
* Double braced conditionals
* Quoted variables within conditionals
* Fixed certain newlines and spaces
* Blacklist help text
* Formatting consistency
* Tabs to 2 spaces
* Corrected indenting
* Cronometer help text
* Formatting consistency
* Fixed certain newlines and spaces
* Corrected indenting
* Checkout warning alteration
* Add checkout help text
* Corrected help output
* Show help for "pihole -a -i --help"
* Fix "pihole disable --help" and "pihole -l --help"
* Show help for "pihole -v -h"
* Indent output text
* Minor help text change
* Show help for "pihole checkout --help"
* Tricorder: Insecure Opt-out
* Check to see if Tricorder is being called directly
* Provide opt-out for insecure transmission of debug log
* Remove mention of internal function from help menu
* 🌮 is the new :shipit: squirrel
* Wording changes and bug fix
* Fix wildcard help text
* -wild is not a valid option since we're already using -wild
* Fix logrotation: manual flushing should be done twice, but automated rotation at midnight should only be done *once*!
* Print echos only when manual flushing is requested
* Add "quiet" mode + update comments in the cron file
* Confirm Tricorder is online
* Scan port 9998 to confirm the availability of "tricorder.pi-hole.net"
* Exit codes for upload process
* Formatting consistency
* Add link to Windows DNS Swapper
See #1400
* Install loopback firewall rules for FTL (#1419 )
* Install loopback firewall rules for FTL
* FirewallD FTL ports
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
* Remove firewallD FTL local rules.
Local rules should not be blocked in firewallD, not requred for internal service FTD>
* Reinstate https rules, and delete FTL rules
Fixes earlier commit.
* Retrieve local repos on repair (#1481 )
* Retrieve local repos on repair
* Change conditional to check for repair
* Change wording of Update/Reconfigure message
* Fixed indenting
* Perform "git reset --hard" on reconfigure
* Change directory before trying to reset repository. Fixes #1489
* No need to `cd $PWD` as it doesn't affect flow of caller script.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
* Refine output of password status in basic-install.sh:displayFinalMessage(). Fixes #1488 (#1490 )
* Rewrite Chronometer to output more stats
* Fix output IPv4 addr when removing CIDR notation (#1498 )
* Move wildcards file if blocking is disabled (#1495 )
* Move wildcards file if blocking is diabled
* Delete newline
* Roll back merge #1417 (#1494 )
* Update ISSUE_TEMPLATE.md
* Remove Question option
* Prefer ULA over GUA addresses [IPv6] (#1508 )
* On installs with GUA and ULA's we should prefer ULA's as it's been demonstrated that GUA's can and often are rotated by ISPs. Fixes #1473
* Add test for link-local address detection
* Add ULA-only and GUA-only tests
* Add test_IPv6_GUA_ULA_test and test_IPv6_ULA_GUA_test
* Add ""
* Add mock_command_2 command that can mock a command with more than one argument (as "ip -6 address") and result multiple lines of results
* Make mock_command_2 more similar to the original mock_command
* Correct comments
* Fixed remaining comments
* Fixed one last comment...
* Fixed a comment...
* Add weekly logrotation of FTL's log (#1509 )
* Update LICENSE of the project to EUPL v1.2
* Make clear that NO is the default if the user just hits return (#1514 )
* Add tricorderFunc back as usable function (#1515 )
As per #1464
* Don't update FTL when there is a core update (as this will update FTL a second time). Fixes #1516
* Add FTL tests to the test suite (#1510 )
* Add first version of FTL tests
* Wait one second to allow FTL to start up and analyze our mock log
* Add test_FTL_telnet_statistics
* Added test_FTL_telnet_top_clients
* Add test_FTL_telnet_top_domains
* Revert "Add FTL tests to the test suite (#1510 )" (#1519 )
This reverts commit cf6a1ac9ad#1527 )
* Change ownership of /etc/pihole to user/group pihole. Fixes #1529 (#1530 )
* Delete temporary files after installing the FTL binary. Fixes #1525
* Change from admin to approvers teams
* Introduce new file black.list for blacklist content
* Add "pihole -g -b" to *only* update black.list (saves a bunch of time when adding/changing only blacklisted files - won'tdownload lal lists, but only processes the blacklist and restars dnsmasq)
* Remove useless cat
* Improve displayed messages and overall logic
* Disable black.list on "pihole disable"
* cp + rm === mv (well, almost)
2017-06-20 22:17:41 +01:00
5b472ff67c
Add support for PowerPC architecture
...
Related to https://github.com/pi-hole/FTL/pull/88
2017-06-20 08:28:04 +12:00
3d7582faec
Delete temporary files after installing the FTL binary. Fixes #1525
2017-06-17 08:54:26 +02:00
8ef64dbe74
Add weekly logrotation of FTL's log ( #1509 )
2017-06-03 14:51:35 +02:00
01e091fd17
Prefer ULA over GUA addresses [IPv6] ( #1508 )
...
* On installs with GUA and ULA's we should prefer ULA's as it's been demonstrated that GUA's can and often are rotated by ISPs. Fixes #1473
* Add test for link-local address detection
* Add ULA-only and GUA-only tests
* Add test_IPv6_GUA_ULA_test and test_IPv6_ULA_GUA_test
* Add ""
* Add mock_command_2 command that can mock a command with more than one argument (as "ip -6 address") and result multiple lines of results
* Make mock_command_2 more similar to the original mock_command
* Correct comments
* Fixed remaining comments
* Fixed one last comment...
* Fixed a comment...
2017-06-02 23:01:48 +02:00
98fdb95645
Merge pull request #1491 from pi-hole/fix/ResetInRepoDir
...
Change directory before trying to reset repository
2017-05-23 19:02:03 +10:00
3035c9a366
Refine output of password status in basic-install.sh:displayFinalMessage(). Fixes #1488 ( #1490 )
2017-05-23 10:44:11 +02:00
5004cf331a
No need to `cd $PWD` as it doesn't affect flow of caller script.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-05-22 15:36:51 -07:00
74eb8c8622
Change directory before trying to reset repository. Fixes #1489
2017-05-22 23:43:52 +02:00
2ef87ad110
Retrieve local repos on repair ( #1481 )
...
* Retrieve local repos on repair
* Change conditional to check for repair
* Change wording of Update/Reconfigure message
* Fixed indenting
* Perform "git reset --hard" on reconfigure
2017-05-21 22:47:25 +02:00
c655e6ea73
Install loopback firewall rules for FTL ( #1419 )
...
* Install loopback firewall rules for FTL
* FirewallD FTL ports
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
* Remove firewallD FTL local rules.
Local rules should not be blocked in firewallD, not requred for internal service FTD>
* Reinstate https rules, and delete FTL rules
Fixes earlier commit.
2017-05-20 15:47:51 +02:00
c793295be0
Merge pull request #1446 from pi-hole/tweak/install_lockcheck
...
Clarify error message on apt failures.
2017-05-10 15:40:13 -07:00
dfc32b26a6
We test for dpkg lock on line 830 directly, no need for the check also
...
in the template section.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-05-09 13:11:28 -07:00
89fd962615
Revert "Ensure any changes to blocking page are updated."
2017-05-06 11:45:31 +01:00
a928cd3fa1
Merge pull request #1437 from pi-hole/blockPage
...
Ensure any changes to blocking page are updated.
2017-05-06 01:06:22 +01:00
525a1228c3
clarify
2017-05-05 22:43:37 +01:00
19fd25c7cd
revert line, looks tidyer
2017-05-05 22:40:10 +01:00
5b0927ca4b
tidy up output
2017-05-05 22:32:27 +01:00
324d4433c3
even further simplify
2017-05-05 22:31:31 +01:00
615ca56ea3
fix inteliJ IDEA complaints
2017-05-05 22:27:58 +01:00
41dd163453
further simplify
2017-05-05 22:27:33 +01:00
5cd2c77d98
simplify
2017-05-05 22:24:40 +01:00
f270f7430c
Update block page. Allow for setupVars setting of CUSTOMBLOCKPAGE (bool) to prevent it being overwritten
2017-05-05 22:10:24 +01:00
99b23627d0
Update basic-install.sh
2017-05-05 12:03:51 -07:00
b13171cc45
$1 is not $pw. Seriously, who let me onto this project
2017-05-02 22:37:38 +01:00
9c645e2010
Seriously.
2017-05-02 22:30:02 +01:00
bb6f409e89
dropped a "
2017-05-02 22:28:32 +01:00
61ec7723f6
use function in install script
2017-05-02 22:25:47 +01:00
9c136a5579
functionise Hashing
2017-05-02 22:24:37 +01:00
a5733508ae
Double hash the password directly in the install script
2017-05-02 21:36:08 +01:00
8c657910ae
Merge pull request #1280 from technicalpyro/development
...
fixes missing dialog package from some distros
2017-05-01 16:07:32 -07:00
57e8b7f924
Merge pull request #1355 from pmo3/development
...
Mask password input when changing password
2017-04-03 20:23:19 -04:00
474881e4c7
Merge pull request #1346 from pi-hole/varChanges
...
Clean up previous PR
2017-04-03 17:32:02 +02:00
7e0aa822b6
Match the Pi-hole brand ( #1358 )
...
* Update README.md
* Update index.php
* Update basic-install.sh
* Update piholeCheckout.sh
* Update update.sh
* Update CONTRIBUTING.md
* Update the Pi-hole brand tip in CONTRIBUTING.md
Use a better formulation.
* Update README.md 2
2017-04-03 17:29:57 +02:00
94f15f1b3c
Merge remote-tracking branch 'upstream/development' into development
2017-03-23 18:47:50 -04:00
ee296f36c1
mask password input on command line
2017-03-23 18:47:30 -04:00
af1d1bd9c2
One more change
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-21 05:04:58 -07:00
f32ad7699d
Merge pull request #1320 from georou/development
...
Use Firewalld --add-service instead of port
2017-03-21 04:49:59 -07:00
79294bb6ca
Merge pull request #1332 from pi-hole/varChanges
...
replace instances of "/etc/.pihole" with ${PI_HOLE_LOCAL_REPO}
2017-03-21 04:49:10 -07:00
2834f2ccc2
Let `ip` determine which links are candidates.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-15 22:05:48 -07:00
0d794226ab
Removed unsupported POSIX brace expansion
2017-03-16 09:29:33 +11:00
83662c9e50
additional requested changes
2017-03-15 19:50:22 +00:00
6c1d52199f
Merge branch 'master' of https://github.com/jftuga/pi-hole into jftuga-master
2017-03-15 19:47:31 +00:00
76bd53ef1f
replace instances of "/etc/.pihole" with ${PI_HOLE_LOCAL_REPO}
2017-03-13 20:24:04 -04:00
e45559da20
Use Firewalld services instead of ports
2017-03-14 01:13:23 +11:00
5e16487ef6
add ascii berry to beginning of installer
2017-03-08 21:14:21 -06:00
f2fe84c9d3
Merge pull request #1292 from pi-hole/master
...
Merge patches back into devel
2017-03-03 23:45:29 +01:00
f626406685
Revert #1273
2017-03-03 23:14:12 +01:00
8776b822db
Merge pull request #1287 from pi-hole/fix/update_fail
...
Exit script immediately if we can't update package cache.
2017-03-03 12:20:29 -08:00
fc76b1a6a3
Merge pull request #1244 from pi-hole/new/FTL-binary
...
FTL
2017-03-03 13:41:27 +01:00
9502356980
Move test_dpkg_lock to initial UPDATE_PKG_CACHE. There was unpredictable interference with debconf-apt-progress
2017-03-03 11:55:15 +01:00
a535ca9db4
Some tweaks to the new dpkg lock detector
2017-03-03 11:55:13 +01:00
2c762899de
Add loop to wait if package manager is blocked externally
2017-03-03 11:55:10 +01:00
24fd23493d
Exit script immediately if we can't update package cache.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-02 15:54:58 -08:00
66b7d04b82
Merge branch 'development' into new/FTL-binary
2017-03-01 12:42:48 +01:00
93dea7b942
Moved to installers dependencies
2017-02-27 15:21:59 -05:00
ca24f7c143
Merge pull request #1273 from pi-hole/new/no_fixed_interface
...
Don't save `interface=` line to `dnsmasq`s config file
2017-02-27 11:50:28 -08:00
697b0295f3
fixes missing dialog package from some ditros
2017-02-26 14:24:08 -06:00
ae24f1255f
Bugfix: Delete INSTALL_WEB line before adding new one
2017-02-25 11:29:12 +01:00
ec7e75a6e3
Don't save `interface=` line to `dnsmasq`s config file
2017-02-24 16:02:24 +01:00
2a881a90ac
Update old install command to new
2017-02-24 11:29:19 +01:00
7a1a2dec67
update license to EUPL on core files
2017-02-22 11:55:20 -06:00
af2893d2ce
Updater implementation for FTL
2017-02-22 10:43:13 +01:00
4dcee5cd84
`arch` is not portable.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-21 09:14:49 -08:00
1645677c3a
Cosmetics
2017-02-21 16:42:52 +01:00
77b3764481
Remove resundant code (FTL will later be enabled by enable_service)
2017-02-21 11:23:01 +01:00
90ccbef431
pihole-FTL init.d script
2017-02-21 11:18:47 +01:00
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
2ffb103acb
Move binary to final home.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-20 15:44:33 -08:00
a0c17368ed
`cd` to directory to sha1sum
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-20 15:27:24 -08:00
6023984703
Silence sha check
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-02-20 15:13:54 -08:00
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
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
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
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
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
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
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
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
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
70a6a79b8c
Detect library differently
2017-02-20 13:40:32 +01:00
f24f77c5bd
Detect if architecture is *aarch* + use hf binary only if ARMv7+ is detected
2017-02-20 11:14:23 +01:00
378338c684
Install pihole-FTL to /usr/bin instead of /usr/local/bin
2017-02-20 10:42:07 +01:00
36166c129a
Merge pull request #1253 from Skittels0/even_more_dns
...
Adds DNS.WATCH to default dns servers
2017-02-18 19:12:32 +00:00
4e7a485e23
Update basic-install.sh
2017-02-18 13:42:13 +01:00
9e5795bf55
Added DNS.WATCH to default dns servers
2017-02-18 13:03:40 +01:00
4035c933df
Moved echo to else block
2017-02-13 16:50:48 +01:00
abd44dd284
Add 32bit message
2017-02-13 16:33:22 +01:00
95d7fe76b5
Make comments more pretty
2017-02-13 14:50:25 +01:00
a052f397fe
Be more verbose during install
2017-02-13 14:47:06 +01:00
09d6e73b0a
Don't print error message on 32bit platforms
2017-02-13 14:42:11 +01:00
7fb6b71d52
Fix install path
2017-02-13 14:40:31 +01:00
07e37d7fc3
Proper error handling
2017-02-13 11:33:09 +01:00
fbe3dc0dcd
Have to get latest tag via GitHub API for downloading the binaries
2017-02-13 11:27:52 +01:00
6018c0c2fc
Add FTLinstall()
2017-02-13 11:07:29 +01:00
52a2f166fd
Add FTLdownload() subroutine
2017-02-13 10:29:27 +01:00
ba67144e34
Merge branch 'development' into adminPageAsOption
2017-02-09 16:27:07 -05:00
34f326c559
Update basic-install.sh
2017-02-08 14:13:49 -08:00
8fb6ba19a1
Remove double echos
2017-02-06 12:06:38 +01:00
314f7e7889
Merge pull request #1183 from pi-hole/tweak/update_cache_trap
...
Trap for package cache update failures.
2017-02-05 16:04:19 -08:00
4fcf8fd23f
Merge in `development` branch - resolve conflict in update.sh
2017-02-05 19:39:02 +00:00
1206dda347
testing putting `runGravity` at a different part of the script
2017-02-05 19:23:04 +00:00
e57425df5f
0.0.0.0 instead of pi-holes IP address for redirect purposes
2017-02-04 15:25:11 +00:00
b8d0e5e5a1
Merge pull request #1210 from pi-hole/fix/dhcpcd_int
...
Remove comment leaders from DHCPCD interface
2017-02-02 12:48:29 -08:00
26ad23f01e
Remove comment leaders from DHCPCD interface
...
We need to set the interface in DHCPCD, comments were inadvertently added a while ago.
2017-02-01 18:33:42 -08:00
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
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
3861b57dc6
Start moving reused utility functions to one script.
2017-01-28 17:32:42 -08:00
7291aa07ca
Silenc cache updater.
2017-01-28 16:46:37 -08:00
409f76aa34
Error check.
2017-01-28 16:37:31 -08:00
a281d87315
Eval variable. (Not a fan.)
2017-01-28 16:37:26 -08:00
2d18b2d784
Start test templates.
2017-01-28 16:37:04 -08:00
c31b4383e6
add back in code to stop `dnsmasq` and `lighttpd` during install.
2017-01-28 21:37:21 +00:00
35828f9cea
Source setupvars earlier in update/repair process
2017-01-28 19:05:55 +00:00
90af12fdb8
Remember the [@]
2017-01-28 18:41:37 +00:00
5fede23cf7
trying another tactic
2017-01-28 18:39:15 +00:00
bc4762f270
no need to stop dnsmasq/lighttpt if we're going to reload them at the end anyway.
2017-01-28 16:27:02 +00:00
01429d59bd
more web checks
2017-01-28 15:45:14 +00:00
731d15f9b5
don't display web admin info in final dialog if it's not selected
2017-01-28 15:43:33 +00:00
f0bd7fae5c
) not }
2017-01-28 15:32:07 +00:00
f8322cc2d4
use the web install flag. Could be optimised
2017-01-28 15:25:02 +00:00
dfdb9e393b
move repo clone to function
2017-01-28 15:15:42 +00:00
bd07d7f32e
Only install web dependenices if flag is true
2017-01-28 15:11:39 +00:00
f588c6f93c
introduce web toggle flag
2017-01-28 14:40:47 +00:00
d9ec3d2c22
spelling
2017-01-28 14:28:18 +00:00
e2b87759d8
split out web dependencies
2017-01-28 14:27:08 +00:00
52e0aa11af
Have install create directory
2017-01-27 22:06:48 -08:00
1421c31179
`install` index and blockingpage assets.
2017-01-27 21:41:17 -08:00
91bcc18e6a
Make full path to directory for pihole web page.
2017-01-27 21:40:52 -08:00
5b43f13935
Fresh install web page directory tests
2017-01-27 20:24:20 -08:00
2c16a75ef1
Use stat to get owner of /var/log
2017-01-27 14:28:59 +01:00
6fd7e0311c
Install customized version of logrotate script
2017-01-27 14:16:24 +01:00
cec214f900
User decline to install shouldn't be an error return.
2017-01-26 14:38:02 -08:00
b16f797317
`firewall-cmd --state` returns 0 on 'running' non 0 on 'not running',
...
so check retval and not text returned.
FirewallD conversion to multicall
IPTables test
2017-01-24 19:57:31 -08:00
8bba3a257c
Merge branch 'tweak/firewall_tests' into tweak/firewall_warning
2017-01-24 11:51:41 -08:00
31aa42c35e
Transparency in `sudo` refire.
2017-01-23 14:28:56 -08:00
f7a17248b7
Warn with whiptail if `firewall-cmd` is running.
2017-01-23 14:19:51 -08:00
77554fbd13
Merge pull request #1145 from pi-hole/cleanup/more_shellcheck
...
Cleanup/more shellcheck
2017-01-22 13:31:09 +00:00
eaf6938c35
DNS whiptail from radio to menu
2017-01-21 16:14:05 -08:00
0635309f23
Move distribution check to function.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-21 12:34:47 -08:00
cef0211c00
Merge pull request #1151 from pi-hole/fix/CIDR
...
Include CIDR notation for IPv4 non-natural blocks.
2017-01-19 14:02:28 -08:00
86052540d9
Add back CIDR notation for non-natural blocks. Includes multi-address
...
configs.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-19 13:50:42 -08:00
62a5e36afd
Remove firewall configuration from update portion of script.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-17 14:40:30 -08:00
00b28f0aed
IPTables Whiptal option to install.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-17 14:19:19 -08:00
ec8c40b69b
Fix array declaration for Fedora package management.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-17 13:00:17 -08:00
34df34ba27
Actually rm the Pi-hole scripts.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-14 20:16:27 -08:00
2689b37c35
Combine multiple calls to interface length code.
...
&& ||
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-14 19:40:29 -08:00
9b6427144f
|| && conversion.
...
Fedora deps array.
Use full name of `source`
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-14 19:39:37 -08:00
9212eea8bd
Only ignore DOWN interfaces, `tun` interfaces are UNKNOWN.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-14 15:25:42 -08:00
0b72c639fb
Check for existance of iptables command. Fixes #1125
2017-01-13 18:13:10 +01:00
c58a95ca2e
`setDNS` whiptail direct, not in array.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-09 00:10:14 -08:00
80a3bce6d5
PI_HOLE_INSTALL_DIR global variable
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
`"${pw}"`
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Absolute path for pihole
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Debian PKG_INSTALL as array
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-09 00:10:06 -08:00
6f0289de49
Vestigial variable that was never populated.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-09 00:09:52 -08:00
0966d7660e
Take out some whiptail subshells that aren't needed.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Take out some whiptail subshells that aren't needed.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-09 00:09:45 -08:00
27e90cc4e6
Repetitive `ip route get` was resetting counts.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-09 00:09:39 -08:00
b785213c3a
Shellcheck for Test for $? -eq 0
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Shellcheck for Test for $? -eq 0
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-09 00:09:32 -08:00
0e4d5e9103
Bash splitting and globin
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-08 14:49:08 -08:00
76531da340
Merge pull request #1067 from pi-hole/fix/firewall_redux
...
Fix/firewall redux
2017-01-02 11:36:38 -05:00
12bec1df68
Merge pull request #1048 from pi-hole/tweak/simplify_webpage.sh
...
Major simplification of webpage.sh + extend DHCP to IPv6
2017-01-02 14:28:26 +00:00
85f0241c0d
Reprocess DHCP settings after update
2017-01-02 10:50:59 +01:00
8ee2bdec4d
Plain grep, escape the special characters.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-01 14:38:10 -08:00
de6ce276d0
Merge branch 'development' of github.com:pi-hole/pi-hole into fix/firewall_redux
2017-01-01 14:13:32 -08:00
fbea81dcd7
Merge pull request #1068 from pi-hole/fix/anti_glob
...
Misc tweaks to the installer script. Defensive git cloning, and ability to source the installer script.
2017-01-01 14:10:55 -08:00
502c349b8b
Merge branches 'development' and 'fix/firewall_redux' of github.com:pi-hole/pi-hole into fix/firewall_redux
2017-01-01 13:47:56 -08:00
5fb0aa70de
Merge pull request #1008 from pi-hole/feature/track_pre-installed_packages
...
Feature/track pre installed packages
2017-01-01 20:29:02 +00:00
7750e1344c
DRY `displayFinalMessage`
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-01 07:10:14 -08:00
8be37130e9
Move first check to `main()`, `basic-install.sh` can now be sourced.
...
Set `PH_TEST=true` then `source basic-install.sh`. Careful for `set -e`.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-01 06:45:03 -08:00
fa055481a7
Shellcheck screen size
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-01 06:32:49 -08:00
ad07655630
Defensive git cloning
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-01 00:14:12 -08:00
7cceb8615a
`make_repo` more defensive.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-01 00:13:51 -08:00
45587194e5
Regex fun
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-31 21:33:05 -08:00
ccbf391913
More intelligence in iptables rulesets. Account for Policy ACCEPT, with
...
default rule DROP or REJECT as last rule.
Regex the conditions to make sure we are getting the right conditions.
Reframe the logic to simplify the chains and rules
Reframe the logic to simplify the chains and rules
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-31 21:16:22 -08:00
02d4b6794c
Merge pull request #1066 from dgnthr/patch-1
...
Fixed a typo in the installation script
2016-12-31 17:30:56 +01:00
836b717346
Fixed a typo in the installation script
2016-12-31 17:25:48 +01:00
1a3bdbaabf
Merge pull request #1057 from pi-hole/new/whitelistonblockingpage
...
Allow whitelisting from blocking page
2016-12-30 21:07:34 +01:00
5e35fdbc52
Save blocking page CSS to pihole directory instead of admin
2016-12-30 14:42:15 -05:00
a4a9879643
Restructure firewall detection and application.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-29 15:57:29 -08:00
ea9ec384c6
Disambiguate nested ifs.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-29 01:35:52 -08:00
bbb958b7ed
Detect RPF breaking kernel updates.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-29 01:34:49 -08:00
03d4fcd17d
Don't actually have to reapply DHCP settings since we are going to save it in a different file we don't replace by a template
2016-12-28 16:32:24 +00:00
02d658be65
Look for DHCP / DNS server settings which would have to be reapplied after updating (since we overwrite 01-pihole.conf)
2016-12-28 16:31:55 +00:00
b02730a5ad
Merge branches 'development' and 'feature/track_pre-installed_packages' of github.com:pi-hole/pi-hole into feature/track_pre-installed_packages
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
# Conflicts:
# automated install/basic-install.sh
2016-12-27 22:50:00 -08:00
9a9cb61345
Shift `epel-release` to installer dependencies for CentOS
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-27 12:59:53 -08:00
c3b51b4ceb
Merge branch 'development' into feature/track_pre-installed_packages
2016-12-27 12:37:19 -08:00
bc6a985f7c
Merge branch 'development' of github.com:pi-hole/pi-hole into tweak/subshells
2016-12-27 11:53:46 -08:00
7320fc11d2
Check command -v directly, instead of subshelling out.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-27 11:53:23 -08:00
a328326e39
Formatting
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-27 11:41:07 -08:00
4eedf8a746
Always update package cache where we can.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-27 10:59:24 -08:00
c5f5252145
Merge pull request #961 from pi-hole/customblockpage
...
Custom Pi-Hole block page
2016-12-27 10:25:03 -08:00
7fadd469c9
Merge pull request #1038 from pi-hole/fix/IPV6_detection
...
Check IPv6 routing
2016-12-27 11:42:23 -05:00
7eb6124721
Don't call for package installs if there are no packages to install.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 16:57:07 -08:00
f458780ba7
Rebase onto development
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 16:56:31 -08:00
8ad52806de
Quiet DNF
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 16:54:23 -08:00
dc22a50dcc
Fedora dependency installer overhaul
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Modify Fedora dependency installer
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Fedora now installs and arrays only non-installed packages. Fedora also noops the cache update, since it updates at every dnf call anyays.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 16:54:20 -08:00
852341c601
Check for installation status within the parent function.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 16:54:16 -08:00
d5ed6c1901
Find which packages already exist and only install new packages. Set up for unintall to know what packages we installed for later removal.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 16:54:13 -08:00
da41383476
Check IPv6 to see if the route is reachable, if not, don't use.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 15:26:05 -08:00
6ff79835da
If only one interface available, don't show whiptail, just use that interface.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 15:08:39 -08:00
1d608b204a
Only allow UP interfaces to be selected. (DOWN interfaces would have not given IP addresses anyways.)
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 14:50:50 -08:00
c2b8bed3a8
Get the IP address that is the source for the default route out. Fixes interfaces with multiple IP's assigned getting the wrong IPv4 chosen.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 14:43:57 -08:00
d12efccd0b
Merge pull request #1028 from pi-hole/bcambl-selinux_notification
...
Bcambl selinux notification
2016-12-23 17:36:33 +00:00
54afffed19
Remove newline
...
Issue was already fixed
2016-12-23 12:30:33 -05:00
fc8fcdbece
Add newline
2016-12-23 12:28:18 -05:00
abd1fedc9d
.
2016-12-23 17:25:55 +00:00
9725985037
printf to echo. idgaf
2016-12-23 17:24:33 +00:00
754f3359ec
too many echos spoil the branch
2016-12-23 17:22:31 +00:00
4c131b8c28
newlines
2016-12-23 17:21:23 +00:00
15c674ba29
verbosity
2016-12-23 17:20:33 +00:00
00aff6a906
maybe
2016-12-23 17:16:03 +00:00
c45c3a72b5
words words words
2016-12-23 17:06:33 +00:00
662d450651
adjust size of whiptail dialog
2016-12-23 16:58:58 +00:00
a8897becd2
Make sure whiptail is installed...
2016-12-23 16:55:56 +00:00
fdb64a5702
untested convert user prompt to whiptail
2016-12-23 16:53:42 +00:00
73a80ff7dc
Align installer output for updating repo
2016-12-23 11:51:34 -05:00
a795fd698d
Merge branch 'selinux_notification' of https://github.com/bcambl/pi-hole into bcambl-selinux_notification
2016-12-23 16:48:16 +00:00
2fb0dc0a4a
add warning if SELinux is Enforcing
2016-12-23 10:27:52 -06:00
aa8e1497a3
Fixed error
2016-12-23 17:12:38 +01:00
afabf30ec6
Fix Fedora web UI support
2016-12-23 16:57:51 +01:00
420158494d
Merge pull request #1022 from pi-hole/fix/adlists.default
...
Internal (/etc/pihole/adlists.default)
2016-12-23 16:08:06 +01:00
6b7b0e0eb3
Test if /etc/pihole/adlists.default exists
2016-12-23 16:00:48 +01:00
ad70db7e0e
Merge pull request #1020 from bcambl/setDNS_before_ifcfg
...
Set dns before ifcfg (Fixes #1019 )
2016-12-23 12:12:05 +00:00
1e7e3259b5
choose dns servers prior to interface configuration
...
upstream DNS servers must be chosen prior interface configuration.
Fixes #1019
2016-12-22 22:42:32 -06:00
513bc32d87
is_repo: ensure directory exists
2016-12-22 20:00:45 -06:00
9355a8ad0e
Merge pull request #1011 from pi-hole/fix/sudoers
...
Fix: Dynamic instead of static sudoers file
2016-12-22 12:20:01 -08:00
ea5ee7b0f9
Execute gravity in same shell as installer, don't subshell it.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-22 11:30:36 -08:00
bc8cf1b2d8
Fixed wrong indentation
2016-12-22 19:23:06 +01:00
bb28d94884
Merge branch 'development' into customblockpage
...
Conflicts:
automated install/basic-install.sh
2016-12-22 19:22:09 +01:00
8f402f5c77
Merge pull request #1009 from bcambl/fix_1004
...
replace 'git -C' with long version
2016-12-22 11:44:08 -06:00
60054da582
Add lighttpd user (OS dependent) to sudoers file
2016-12-22 13:26:11 +01:00
cbf84c1840
replace subshell with command chain
2016-12-22 04:32:42 -06:00
c9c28cb59a
replace 'git -C' with long version
...
The -C argument was introduced in git 1.8.4. CentOS 7.3 at the time of this commit provides v1.8.3.1.
see: https://git.kaarsemaker.net/git/commit/44e1e4d67d5148c245db362cc48c3cc6c2ec82ca/
Fixes #1004
2016-12-22 03:37:34 -06:00
4244f716e0
Create /opt/pihole before trying to install into it.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-21 23:04:57 -08:00
c48e6c91f5
Merge pull request #999 from pi-hole/fix/install_deps_exit
...
Fix/install deps exit
2016-12-21 16:00:48 +01:00
8841bdd252
Reset the if's
2016-12-21 12:57:02 +01:00
58261098fb
We should not call a function that Dan deleted
2016-12-21 12:07:44 +01:00
9432d3035a
Merge branch 'development' into cleanup/remove_legacy_detect
...
Conflicts:
automated install/basic-install.sh
2016-12-21 12:01:58 +01:00
9907fc2770
Merge branch 'development' into fix/install_deps_exit
...
Conflicts:
automated install/basic-install.sh
2016-12-21 11:54:52 +01:00
8117ec8e20
Remove v1 legacy detection code.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-20 17:50:44 -08:00
ff2783f9fc
Tabs to spaces and formatting.
...
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
2016-12-20 17:22:57 -08:00
156a51c945
Remove extra display only variable.
...
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
2016-12-20 17:04:46 -08:00
c72ffae4a2
Don't install extra packages (openresolv was installed over resolvconf). No longer need --fix-missing.
...
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
2016-12-20 17:02:51 -08:00
7f3b0030ea
LF
...
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
2016-12-20 16:47:43 -08:00
9a626948f8
Use debconf for Deb/Ubu package installations.
...
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
Alphabetic sort of dependency names
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
2016-12-20 16:22:31 -08:00
5c43df66a8
Remove spinner function, masked return values.
...
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
2016-12-20 16:22:08 -08:00
d0e3c546f8
CRLF to CR (Win to Unix line endings)
...
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
2016-12-20 15:00:37 -08:00
8cb01cdd29
One step to rename variables.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-16 15:08:30 -08:00
10982a0f45
Merge pull request #990 from pi-hole/dontkillsetupVars.conf
...
Don't kill setupVars.conf on update/fresh install
2016-12-16 13:55:33 +00:00
d4c378ed5d
Remove PIHOLE_INTERFACE if already set (not PIHOLE_DOMAIN)
2016-12-16 13:20:25 +01:00
7872f68a45
Only try to remove parts inthe file if the file already exists
2016-12-16 13:13:35 +01:00
ec8c848106
Don't kill already existing setupVars.conf on update (and fresh install)
2016-12-16 12:53:00 +01:00
3b50ce8c54
Merge pull request #977 from pi-hole/activatewebUIpw
...
Add password to webUI after update if there is none
2016-12-15 14:05:11 -05:00
1eeaa01234
Always put the information that we added a password if we did (not only on update but also on fresh install)
2016-12-15 15:22:44 +01:00
e2898217d2
Made message shorter
2016-12-15 15:20:41 +01:00
f81dadc5d0
Fix final message
2016-12-15 14:10:55 +01:00
c10ec5548f
remove code that replaces tokens in 01-pihole.conf
2016-12-14 19:29:44 +00:00
92f4824884
Automatically enable IPv6
2016-12-14 13:52:14 -05:00
a00034a6a7
Add password to webUI after update if there is none
2016-12-12 17:03:53 +01:00
0a423ffd40
Fix check for lighttpd install before configuration directory removal
2016-12-07 20:31:34 -07:00
5374f652dd
No need to modify lighttpd config file, since we overwrite it anyways
2016-12-06 08:43:24 +01:00
a866c4e388
Place blockingpage.css (former index.css) unter admin/ so we can load it also from some blocked sub-directories
2016-12-05 10:50:19 +01:00
e7241a989c
Include CSS file
2016-12-04 22:20:51 +01:00
b246dba7e7
Rename index.html to index.php
2016-12-04 21:41:26 +01:00
870454330d
Add check for lighty.conf before trying to move it
2016-12-02 13:54:11 -07:00
d53a3af191
Merge pull request #899 from diginc/configureFirewall_unittest
...
Configure firewall unittest
2016-11-19 11:07:38 -08:00
bd61f38169
Merge pull request #926 from zbholman/patch-2
...
Added removal of pihole user to the uninstall.sh
2016-11-16 17:31:56 -05:00
cac9c63325
Added removal of pihole user to the uninstall.sh
...
Not sure if I should have created a variable for the username or if the echo is necessary. And this is my first time doing a pull request, hopefully it works out lol.
2016-11-16 17:06:30 -05:00
86d3ca48ae
moved newline to correct place
2016-11-15 22:40:57 +13:00
e9475a9739
Merge pull request #887 from brontide/dependancy_cleanup
...
Dependancy cleanup
2016-11-07 21:45:23 -08:00
0caa44e979
write ifcfg instead of appending
2016-11-07 12:54:31 -06:00
b9f3493dbc
move PH_TRUE to Dockerfiles to DRY
2016-11-03 22:34:04 -05:00
633095aee1
switch to consistent style
2016-11-02 22:13:05 -05:00
71005e1db3
Merge with change of spacing in development
2016-11-02 19:01:34 -04:00
c452a4569e
.js
2016-11-02 21:17:00 +00:00
a182a208dc
Tidy up output
2016-11-02 21:06:12 +00:00
d273b4b48b
Check for missing index.html, replace if missing.
2016-11-02 20:57:56 +00:00
b429e890ad
move web interface message inside "if not update" block. Check for pi-hole deps AFTER whiptails
2016-11-02 20:16:36 +00:00
6d415a7384
Merge pull request #894 from diginc/InstallFixes_UnitTests
...
Unit tests framework and some basic tests
2016-11-02 09:42:20 -07:00
8b9f0487c0
Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
...
# Conflicts:
# advanced/Scripts/update.sh
# automated install/basic-install.sh
2016-11-02 06:57:33 -07:00
50bd8b4a09
Further tweaks to local repo handling
2016-11-02 13:34:57 +00:00
7740e4268c
Consistency and standards basic-install start.
2016-11-02 05:17:28 -07:00
3df2ef8587
Cherry picking f6f6f6d, conflict fix
2016-11-02 04:31:28 -07:00
354309fcad
set QUERY_LOGGING default to true
2016-11-02 04:28:58 -07:00
edd00e8e70
consistency
2016-11-02 04:12:37 -07:00
82e7de2aaa
Account for variable name changes
2016-11-02 04:12:21 -07:00
b723714c0c
Convention : https://google.github.io/styleguide/shell.xml?showone=Constants_and_Environment_Variable_Names#Constants_and_Environment_Variable_Names
2016-11-02 04:12:06 -07:00
a2903b6e63
Consistency
2016-11-02 04:11:54 -07:00
9a1876571b
Prototype `whiptails` so they don't fall to shell. Need to do this to all functions.
2016-11-02 04:11:41 -07:00
c07d7165ab
Global variables CAP'ed
2016-11-02 04:11:27 -07:00
d695c5972f
`local` variables just to be safe and make sure they stay in this function.
2016-11-02 04:11:09 -07:00
bbc09ed313
Swap variable names.
2016-11-02 04:10:57 -07:00
617a147706
Wording adjustment
2016-11-02 04:10:29 -07:00
d4dccfdb2d
Cherry pick 229439c
2016-11-02 04:08:53 -07:00
d9528dfd09
Bash is funny with returns.
2016-11-02 00:51:38 -07:00
12f5f8ba00
Begin to bring code up to Pi-hole conventions. Block installScripts and begin factoring out redundant code.
2016-11-02 00:14:25 -07:00
db0f3307e0
Only take out scripts in the directory, don't remove the directory as a whole. Need this for the future installs.
2016-11-01 22:48:30 -07:00
7a22471787
New naming convention, and reorder functions as bash would prefer them to be.
2016-11-01 22:19:40 -07:00
b4524839bb
Merge branch 'development' of https://github.com/pi-hole/pi-hole into InstallFixes_UnitTests
2016-11-01 23:52:20 -05:00
fb5ac6d6d7
We should prefer the php metapackage if it's there, falling back on php5 if it's not
2016-10-31 21:31:13 -04:00
4e7ca51beb
Added dependancy for ping and lsof used in debug scripts
2016-10-31 21:24:57 -04:00
65e0fcbf10
Merge branch 'development' of https://github.com/pi-hole/pi-hole into wheezy_fix2
2016-10-28 13:14:00 -04:00
e22aca49c8
Merge pull request #813 from das7pad/development
...
Create missing directory for lighttpd
2016-10-28 10:05:08 -07:00
21fc6344bf
Merge pull request #849 from pi-hole/aManHasNoNameResolution
...
[BugFix] A man has no name resolution
2016-10-27 19:41:07 +01:00
794fa21137
install uninstall.sh...
2016-10-27 12:44:21 +01:00
977d1d1998
Merge branch 'development' of https://github.com/pi-hole/pi-hole into wheezy_fix2
2016-10-27 07:37:40 -04:00
cde003bc98
\ all the /s!
2016-10-27 11:13:00 +01:00
3996e11425
Merge pull request #859 from pi-hole/ImproveWhitelistBlacklist
...
Improvements to White and Blacklists
2016-10-26 19:52:16 +01:00
3a4fe3e391
Wheezy install fix by selecting appropriate deps, made the php check the same
2016-10-26 14:47:29 -04:00
4ed6e4d016
Tiny screens get sane minimums
2016-10-26 11:15:02 -04:00
ac8d24a1ce
Even with no detected screen size, it should presume 80x24
2016-10-26 11:14:54 -04:00
fc776921d5
stty is more compatible and does not require any additional dependancies for busybox
2016-10-26 11:14:46 -04:00
55a653aca4
clear out /opt/pihole folder before installing scripts
2016-10-26 10:00:00 +01:00
bd0db56ba0
actually fix up logic
2016-10-25 15:29:02 +01:00
95f0b3710d
fix up logic
2016-10-25 15:27:13 +01:00
86349527e7
replace HOSTNAME tokens in 01-pihole.conf
2016-10-25 15:06:37 +01:00
911053f63f
Replace IPv4 and IPv6 tokens in 01-pihole.conf for pi.hole resolution.
2016-10-25 15:00:18 +01:00
519d731ddd
Fix missing newline
...
My mistake
2016-10-23 16:45:51 -07:00
ec4f5007e7
remove bad {
2016-10-21 23:59:31 -07:00
21b906e0e0
Consistency
...
More of the same
2016-10-21 23:57:47 -07:00
7ebaf8e843
Consistency
...
Now with block indents!
2016-10-21 23:23:31 -07:00
28eeaf201b
Standardize function declaration
...
There were no fewer than three styles of function declaration going
on in these files, so I attempted to standardize them to the typical
myfucn() {
}
style.
2016-10-19 19:47:45 -07:00
8872594ab9
create upload dir for lighttpd
...
directory is missing in the installation process but is used in the
lighttpd.conf
2016-10-19 14:27:17 +02:00
ff5d5b97c3
stash any changes in local repo
2016-10-18 13:54:09 +01:00
ef3c13fe2b
Refire with curl
2016-10-17 19:22:56 -07:00
fb9664b636
fix typo
2016-10-16 15:11:47 -06:00
ee114b3075
use an excluded extension for ifcfg backup
2016-10-16 13:28:14 -06:00
5792fc0bef
change wording depending on choice
2016-10-16 17:23:26 +01:00
42c93917ef
bug I forgot to fix before piholeUpdate was merged to development
2016-10-16 17:19:44 +01:00
df30a4c0d1
Merge pull request #779 from bcambl/fedora_fixes
...
Fedora fixes
2016-10-16 15:46:50 +01:00
9ce13f0035
Merge pull request #790 from pi-hole/piholeUpdate
...
Various refactoring.
2016-10-15 23:51:07 +01:00
3884b01503
Forgot a ` `
2016-10-15 23:21:13 +01:00
a84c3adeab
if uniformity then dan = happy
2016-10-15 23:19:26 +01:00
a65b784907
repeat after me: repetition is a bit repetitive.
2016-10-15 21:26:41 +01:00
05dadad2e1
repair sounds better than refresh
2016-10-15 21:22:46 +01:00
3a9b39b842
adjust text in update_dialogs() whiptail
2016-10-15 21:12:13 +01:00
e612003293
handle arguments better, convert to flags, echo when they're set to true.
2016-10-15 20:52:20 +01:00
a43577fa26
add reconfigure flag to -r command
2016-10-15 20:43:03 +01:00
a6fa60868b
spacing
2016-10-15 15:41:48 +01:00
99878ae7d6
reflect name change of some of the variables in setupVars
2016-10-15 15:40:12 +01:00
26202014a2
stdout formatting
2016-10-12 20:35:08 -06:00
f4f8b96788
remove systemd selinux rules on init systems
...
fixes the failing SELinux policy compile on init based systems
2016-10-12 20:35:08 -06:00
e5ede16749
update yum/dnf package count grepfu
...
see pull #774
2016-10-12 20:33:13 -06:00
fbe3547129
EPEL is not required on Fedora
...
epel-release installs the EPEL package repository (Extra Packages for Enterprise Linux)
Dependencies from this repository should available by default on Fedora
2016-10-12 20:26:48 -06:00
a03caea549
setupVar tests passing for debian & centos
2016-10-10 23:14:39 -05:00
aa23fb1d56
choose*
2016-10-10 22:34:12 +01:00
570611fc09
CentOS Firewall fix
2016-10-10 11:30:15 -07:00
94dd5b1ebe
More CentOS fixes.
2016-10-10 11:05:29 -07:00
74524e024d
Always check PIHOLE_dependencies.
2016-10-10 10:36:19 -07:00
e42b6dcc8e
create_pihole_user update @diginc.
2016-10-10 09:21:28 -07:00
d71b799e75
More cleanups, localize variables, clean formatting.
2016-10-10 08:23:14 -07:00
87e7121332
Gravity.sh checks for null value for variables, obliging that expectation.
2016-10-10 07:32:16 -07:00
94f6354c94
Spinner blocks `set -e` trying to get it in functions that won't crash out...
2016-10-10 07:25:43 -07:00
b79059ebdb
Start to add the spinner back in!
2016-10-10 06:46:30 -07:00
4f98c1bebb
Boolean operators inside quotes don't work well...
2016-10-10 06:16:00 -07:00
2feec01e10
Add `start_service` and `enable_service` functions to handle restating services and setting services to start on reboot.
2016-10-10 06:06:34 -07:00
72b95e192e
Fix logic bug in `setup_user`, update how setupVars are sourced so they will only be used if the user selects `update` and not if they select `install`.
2016-10-10 05:45:37 -07:00
47aad254d8
localized some more variables
2016-10-10 03:56:03 -07:00
bc14074d2a
Tighten up Update Whiptail appearance.
2016-10-10 03:39:32 -07:00
5ab5b1a190
Overhaul dnsmasq version 3 way handshake configuration files.
2016-10-10 03:23:52 -07:00
b055f190f5
Factor out interfaces detection.
2016-10-10 03:16:22 -07:00
84b8953352
Remove quiet flags from package managment variables. Set quiets in functions by redirecting output.
2016-10-10 02:58:38 -07:00
93a591d487
Linting from ShellCheck
2016-10-10 02:57:04 -07:00
e6c0f38a7c
Monolithic changes in one commit again.
2016-10-10 02:24:03 -07:00
f107ae4f9b
Merge conflict resolution
2016-10-10 09:08:25 +00:00
bad7a08804
Refactor and rename `create_pihole_user`. Now to actually use the user created...
2016-10-10 01:51:19 -07:00
25cbf4cb35
Factor out legacy location script removal.
2016-10-10 01:43:10 -07:00
7f179f9a58
Remove sourcing bash completion, would fall off as soon as the subshell terminated.
2016-10-10 01:40:56 -07:00
5287ea8537
Refactor `stopServices` into `stop_service` and accept arguments for service to stop. Quiet output from a few other functions.
2016-10-10 01:25:11 -07:00
43e2aaebf0
rename `updateDialogs` to `update_dialogs`
2016-10-10 01:04:59 -07:00
e60eb66283
UpdateDialogs are now a Whiptail Menu, self-explanatory.
2016-10-10 01:04:03 -07:00
ca59b808d8
Git clone/update now occurs right after installer dependency checks. Allows for inclusion of installer source files in the repo. Passes `set -e`
2016-10-10 00:02:50 -07:00
8a15fd44d5
Update `is_repo()` to use `git status` for validity checks.
2016-10-09 23:53:18 -07:00
dac2b8942e
Typo fix to generate commit.
2016-10-09 22:38:00 -07:00
54a1c5b63a
Revert inadvertent commits
...
IDLE keeps committing direct to development.
2016-10-09 22:35:14 -07:00
61b02bf6d3
Add OR TRUE to PKG_COUNT so that a 0 package to update doesn't grep -c to an exit value of 1.
2016-10-09 22:27:37 -07:00
9d048b2fdf
Move Pi-hole dependency checks to `main()` and out of duplicated `install` and `update` functions. Bring them up a level in the subshells.
2016-10-09 22:24:13 -07:00
d9e28a7422
factor out `installer_dependencies`
2016-10-09 22:05:06 -07:00
1fecdf42ca
Move `git` to installer deps, refactor some functions.
2016-10-09 22:00:23 -07:00
d4bf85b67c
Self contain `package_check` into `package_check_install`. Passes `set -e` test.
2016-10-09 21:44:45 -07:00
7131ff27c3
Attempt to `set -e`
2016-10-09 21:32:25 -07:00
a30f78c1c8
Oneliner php version check, passes `set -e` check.
2016-10-09 21:31:36 -07:00
7e0afffca8
Revert inadvertent commits
2016-10-09 19:41:32 -07:00
293c60fb9c
Exit script on failure to install dependent package.
2016-10-09 13:52:36 -07:00
f5be8b2a5e
Single dependency package check function, will exit if any errors with message to update cache.
2016-10-09 13:43:01 -07:00
6772603c15
Relocate cache check to its own function
2016-10-09 12:34:53 -07:00
a22904f99b
Merge pull request #769 from pi-hole/Fix/PackageCacheFresh
...
Fix/package cache fresh
2016-10-09 09:00:52 -05:00
b157bc5cd7
Fixes #768 Check the staleness of the package index instead of the package cache.
2016-10-08 13:47:35 -07:00
10e1a03c76
`runGravity` is called after `finalExports` in the Debian install side.
2016-10-08 12:58:42 -07:00
d20df92e9f
Script will now run as root, removed `sudo` from function calls.
2016-10-08 12:56:26 -07:00
44170207ac
Add `main` function and fire script from `main` call. Prevents script from running before it is entirely downloaded.
2016-10-08 12:17:04 -07:00
33745be745
Merge pull request #753 from pi-hole/feature/RemoveBarePHP
...
Remove bare php package from dependencies
2016-10-07 21:32:07 -07:00
Mark Drobnak
Adam Warner
justinamcafee
Dan Schaper
DL6ER
DL6ER
Florian Freund
Sebastian Pucilowski
Elias Ojala
bcambl
Dan Schaper
Loganaden Velvindron
Terror
Jacob Salmela
mettacrawler
Mausy5043
WaLLy3K
Eric Wolf
Adam Warner
Jacob Salmela
Adam Warner
Flo
Patrick O'Brien
georou
John Taylor
Technicalpyro
Technicalpyro
Dan Schaper
Skittels
Dominik G
DL6ER
trinapicot
zbholman
Hayden Knowles
diginc
Eric Warnke
Adam Warner
Marcus Hildum
Jakob Ackermann
Jacob Salmela