1
0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-23 15:28:07 +00:00
Commit Graph

731 Commits

Author SHA1 Message Date
Dan Schaper
2778d88e8a Fix missing then clause 2017-07-12 00:12:54 -07:00
Jacob Salmela
e7ad972783
fix thre spelling errors 2017-07-10 14:12:30 -05:00
Jacob Salmela
2f939d8c56
fix two spelling errors 2017-07-07 09:05:19 -05:00
Jacob Salmela
aad39c5ffc
add comments for nearly every line of code. 2017-07-06 19:25:56 -05:00
Adam Warner
b3eb5c4f0e Colour Tweaks (#1549) 2017-07-01 22:08:17 +10:00
Adam Warner
ab1a6d8829 Fix install script using IPv6 CIDR notation (#1570) 2017-06-29 11:18:52 +10:00
Mcat12
0de15f7a97 Merge branch 'development' into patch-1 2017-06-25 18:15:33 -04:00
Adam Warner
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
Terror
5b472ff67c Add support for PowerPC architecture
Related to https://github.com/pi-hole/FTL/pull/88
2017-06-20 08:28:04 +12:00
DL6ER
3d7582faec
Delete temporary files after installing the FTL binary. Fixes #1525 2017-06-17 08:54:26 +02:00
DL6ER
8ef64dbe74 Add weekly logrotation of FTL's log (#1509) 2017-06-03 14:51:35 +02:00
DL6ER
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
WaLLy3K
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
DL6ER
3035c9a366 Refine output of password status in basic-install.sh:displayFinalMessage(). Fixes #1488 (#1490) 2017-05-23 10:44:11 +02:00
Dan Schaper
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
DL6ER
74eb8c8622
Change directory before trying to reset repository. Fixes #1489 2017-05-22 23:43:52 +02:00
WaLLy3K
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
DL6ER
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
Dan Schaper
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
Dan Schaper
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
Adam Warner
89fd962615 Revert "Ensure any changes to blocking page are updated." 2017-05-06 11:45:31 +01:00
Adam Warner
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
Adam Warner
525a1228c3
clarify 2017-05-05 22:43:37 +01:00
Adam Warner
19fd25c7cd
revert line, looks tidyer 2017-05-05 22:40:10 +01:00
Adam Warner
5b0927ca4b
tidy up output 2017-05-05 22:32:27 +01:00
Adam Warner
324d4433c3
even further simplify 2017-05-05 22:31:31 +01:00
Adam Warner
615ca56ea3
fix inteliJ IDEA complaints 2017-05-05 22:27:58 +01:00
Adam Warner
41dd163453
further simplify 2017-05-05 22:27:33 +01:00
Adam Warner
5cd2c77d98
simplify 2017-05-05 22:24:40 +01:00
Adam Warner
f270f7430c
Update block page. Allow for setupVars setting of CUSTOMBLOCKPAGE (bool) to prevent it being overwritten 2017-05-05 22:10:24 +01:00
Dan Schaper
99b23627d0 Update basic-install.sh 2017-05-05 12:03:51 -07:00
Adam Warner
b13171cc45
$1 is not $pw. Seriously, who let me onto this project 2017-05-02 22:37:38 +01:00
Adam Warner
9c645e2010
Seriously. 2017-05-02 22:30:02 +01:00
Adam Warner
bb6f409e89
dropped a " 2017-05-02 22:28:32 +01:00
Adam Warner
61ec7723f6
use function in install script 2017-05-02 22:25:47 +01:00
Adam Warner
9c136a5579
functionise Hashing 2017-05-02 22:24:37 +01:00
Adam Warner
a5733508ae
Double hash the password directly in the install script 2017-05-02 21:36:08 +01:00
Dan Schaper
8c657910ae Merge pull request #1280 from technicalpyro/development
fixes missing dialog package from some distros
2017-05-01 16:07:32 -07:00
Mcat12
57e8b7f924 Merge pull request #1355 from pmo3/development
Mask password input when changing password
2017-04-03 20:23:19 -04:00
DL6ER
474881e4c7 Merge pull request #1346 from pi-hole/varChanges
Clean up previous PR
2017-04-03 17:32:02 +02:00
Flo
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
Patrick O'Brien
94f15f1b3c Merge remote-tracking branch 'upstream/development' into development 2017-03-23 18:47:50 -04:00
Patrick O'Brien
ee296f36c1 mask password input on command line 2017-03-23 18:47:30 -04:00
Dan Schaper
af1d1bd9c2
One more change
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-21 05:04:58 -07:00
Dan Schaper
f32ad7699d Merge pull request #1320 from georou/development
Use Firewalld --add-service instead of port
2017-03-21 04:49:59 -07:00
Dan Schaper
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
Dan Schaper
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
georou
0d794226ab Removed unsupported POSIX brace expansion 2017-03-16 09:29:33 +11:00
Adam Warner
83662c9e50
additional requested changes 2017-03-15 19:50:22 +00:00
Adam Warner
6c1d52199f
Merge branch 'master' of https://github.com/jftuga/pi-hole into jftuga-master 2017-03-15 19:47:31 +00:00