Jacob Salmela
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
mettacrawler
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
Mausy5043
ec4e4d3b72
fix indentation
2017-11-05 11:02:04 +01:00
Mausy5043
63312ac4b8
removed duplicate word
2017-11-05 10:18:39 +01:00
Mausy5043
d158a7d51e
spelling corrected
2017-11-05 10:16:56 +01:00
Mausy5043
209a2ab3ec
grammar corrected (double negative)
2017-11-05 10:05:25 +01:00
DL6ER
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
DL6ER
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
DL6ER
c34c3eb016
Shift randomized time interval from 00:00-01:59 to 02:00-03:59
2017-10-21 15:58:37 +02:00
DL6ER
85d159bdd1
Randomize gravity update time
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-10-21 15:52:53 +02:00
WaLLy3K
a9ad8d67aa
Remove superseded index.js
...
Signed off by WaLLy3K <wally3k@pi-hole.net>
2017-10-04 01:13:02 +11:00
Mcat12
7884423e05
Merge pull request #1719 from 19wolf/patch-1
...
Update basic-install.sh
2017-10-01 12:51:20 -04:00
Eric Wolf
1615fa63e3
Update basic-install.sh
...
Fixed comment line 40
2017-09-30 16:34:38 -04:00
WaLLy3K
feb2150d9b
Fix LIGHTTPD_ENABLED dupes in setupVars.conf
...
* Fix issue merged [here](fdf2649f2f (diff-689793e68cde6270d074695b71c969afL1488)
2017-09-22 19:14:11 +10:00
Adam Warner
a0bd517380
Merge pull request #1694 from pi-hole/fix/qf-opt
...
Slow query fix & queryFunc optimisation
2017-09-21 20:05:42 +01:00
WaLLy3K
911596daf8
Start and enable FTL prior to running Gravity
2017-09-20 17:29:11 +10:00
WaLLy3K
d56beedd7a
Add idn2 dependency
2017-09-18 00:41:53 +10:00
Adam Warner
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
Adam Warner
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
Adam Warner
6b6d105c2f
Merge branch 'development' into sqlite-dependency
2017-08-28 10:17:33 +01:00
WaLLy3K
2f36acae49
Remove errornous space
2017-08-23 11:51:16 +10:00
Adam Warner
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
Adam Warner
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
Adam Warner
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
Adam Warner
56f2ea3ec2
Add Fedora/Centos dependency
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-16 15:56:39 +01:00
WaLLy3K
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
Mcat12
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
Adam Warner
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
Mcat12
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
Adam Warner
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
Adam Warner
1c93868ae1
Adjust wording of echos
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-24 23:22:04 +01:00
WaLLy3K
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
Adam Warner
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
Adam Warner
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
Adam Warner
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
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
WaLLy3K
c6ba03802f
Add "php5-sqlite" to dependencies
2017-07-05 17:18:21 +10: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
Adam Warner
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
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
John Taylor
76bd53ef1f
replace instances of "/etc/.pihole" with ${PI_HOLE_LOCAL_REPO}
2017-03-13 20:24:04 -04:00
georou
e45559da20
Use Firewalld services instead of ports
2017-03-14 01:13:23 +11:00
Jacob Salmela
5e16487ef6
add ascii berry to beginning of installer
2017-03-08 21:14:21 -06:00
DL6ER
f2fe84c9d3
Merge pull request #1292 from pi-hole/master
...
Merge patches back into devel
2017-03-03 23:45:29 +01:00
DL6ER
f626406685
Revert #1273
2017-03-03 23:14:12 +01:00
Dan Schaper
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
DL6ER
fc76b1a6a3
Merge pull request #1244 from pi-hole/new/FTL-binary
...
FTL
2017-03-03 13:41:27 +01:00
DL6ER
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
DL6ER
a535ca9db4
Some tweaks to the new dpkg lock detector
2017-03-03 11:55:13 +01:00
DL6ER
2c762899de
Add loop to wait if package manager is blocked externally
2017-03-03 11:55:10 +01:00
Dan Schaper
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
DL6ER
66b7d04b82
Merge branch 'development' into new/FTL-binary
2017-03-01 12:42:48 +01:00
Technicalpyro
93dea7b942
Moved to installers dependencies
2017-02-27 15:21:59 -05:00
Dan Schaper
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
Technicalpyro
697b0295f3
fixes missing dialog package from some ditros
2017-02-26 14:24:08 -06:00
DL6ER
ae24f1255f
Bugfix: Delete INSTALL_WEB line before adding new one
2017-02-25 11:29:12 +01:00
DL6ER
ec7e75a6e3
Don't save interface= line to dnsmasqs config file
2017-02-24 16:02:24 +01:00
Jacob Salmela
7a1a2dec67
update license to EUPL on core files
2017-02-22 11:55:20 -06:00
DL6ER
af2893d2ce
Updater implementation for FTL
2017-02-22 10:43:13 +01: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
1645677c3a
Cosmetics
2017-02-21 16:42:52 +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
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
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
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
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
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
DL6ER
378338c684
Install pihole-FTL to /usr/bin instead of /usr/local/bin
2017-02-20 10:42:07 +01:00
Adam Warner
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
Skittels
4e7a485e23
Update basic-install.sh
2017-02-18 13:42:13 +01:00
Skittels
9e5795bf55
Added DNS.WATCH to default dns servers
2017-02-18 13:03:40 +01:00
DL6ER
4035c933df
Moved echo to else block
2017-02-13 16:50:48 +01:00
DL6ER
abd44dd284
Add 32bit message
2017-02-13 16:33:22 +01:00
DL6ER
95d7fe76b5
Make comments more pretty
2017-02-13 14:50:25 +01:00
DL6ER
a052f397fe
Be more verbose during install
2017-02-13 14:47:06 +01:00
DL6ER
09d6e73b0a
Don't print error message on 32bit platforms
2017-02-13 14:42:11 +01:00
DL6ER
7fb6b71d52
Fix install path
2017-02-13 14:40:31 +01:00
DL6ER
07e37d7fc3
Proper error handling
2017-02-13 11:33:09 +01:00
DL6ER
fbe3dc0dcd
Have to get latest tag via GitHub API for downloading the binaries
2017-02-13 11:27:52 +01:00
DL6ER
6018c0c2fc
Add FTLinstall()
2017-02-13 11:07:29 +01:00
DL6ER
52a2f166fd
Add FTLdownload() subroutine
2017-02-13 10:29:27 +01:00
Mcat12
ba67144e34
Merge branch 'development' into adminPageAsOption
2017-02-09 16:27:07 -05:00
Dan Schaper
34f326c559
Update basic-install.sh
2017-02-08 14:13:49 -08:00
DL6ER
8fb6ba19a1
Remove double echos
2017-02-06 12:06:38 +01:00
Dan Schaper
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
Promofaux
4fcf8fd23f
Merge in development branch - resolve conflict in update.sh
2017-02-05 19:39:02 +00:00
Promofaux
1206dda347
testing putting runGravity at a different part of the script
2017-02-05 19:23:04 +00:00
Promofaux
e57425df5f
0.0.0.0 instead of pi-holes IP address for redirect purposes
2017-02-04 15:25:11 +00:00
Dan Schaper
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
Dan Schaper
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
Mcat12
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
DL6ER
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
Dan Schaper
3861b57dc6
Start moving reused utility functions to one script.
2017-01-28 17:32:42 -08:00
Dan Schaper
7291aa07ca
Silenc cache updater.
2017-01-28 16:46:37 -08:00
Dan Schaper
409f76aa34
Error check.
2017-01-28 16:37:31 -08:00
Dan Schaper
a281d87315
Eval variable. (Not a fan.)
2017-01-28 16:37:26 -08:00
Dan Schaper
2d18b2d784
Start test templates.
2017-01-28 16:37:04 -08:00
Promofaux
c31b4383e6
add back in code to stop dnsmasq and lighttpd during install.
2017-01-28 21:37:21 +00:00
Promofaux
35828f9cea
Source setupvars earlier in update/repair process
2017-01-28 19:05:55 +00:00
Promofaux
90af12fdb8
Remember the [@]
2017-01-28 18:41:37 +00:00
Promofaux
5fede23cf7
trying another tactic
2017-01-28 18:39:15 +00:00
Promofaux
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
Promofaux
01429d59bd
more web checks
2017-01-28 15:45:14 +00:00
Promofaux
731d15f9b5
don't display web admin info in final dialog if it's not selected
2017-01-28 15:43:33 +00:00
Promofaux
f0bd7fae5c
) not }
2017-01-28 15:32:07 +00:00
Promofaux
f8322cc2d4
use the web install flag. Could be optimised
2017-01-28 15:25:02 +00:00
Promofaux
dfdb9e393b
move repo clone to function
2017-01-28 15:15:42 +00:00
Promofaux
bd07d7f32e
Only install web dependenices if flag is true
2017-01-28 15:11:39 +00:00
Promofaux
f588c6f93c
introduce web toggle flag
2017-01-28 14:40:47 +00:00
Promofaux
d9ec3d2c22
spelling
2017-01-28 14:28:18 +00:00
Promofaux
e2b87759d8
split out web dependencies
2017-01-28 14:27:08 +00:00
Dan Schaper
52e0aa11af
Have install create directory
2017-01-27 22:06:48 -08:00
Dan Schaper
1421c31179
install index and blockingpage assets.
2017-01-27 21:41:17 -08:00
Dan Schaper
91bcc18e6a
Make full path to directory for pihole web page.
2017-01-27 21:40:52 -08:00
Dan Schaper
5b43f13935
Fresh install web page directory tests
2017-01-27 20:24:20 -08:00
DL6ER
2c16a75ef1
Use stat to get owner of /var/log
2017-01-27 14:28:59 +01:00
DL6ER
6fd7e0311c
Install customized version of logrotate script
2017-01-27 14:16:24 +01:00
Dan Schaper
cec214f900
User decline to install shouldn't be an error return.
2017-01-26 14:38:02 -08:00
Dan Schaper
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
Dan Schaper
8bba3a257c
Merge branch 'tweak/firewall_tests' into tweak/firewall_warning
2017-01-24 11:51:41 -08:00
Dan Schaper
31aa42c35e
Transparency in sudo refire.
2017-01-23 14:28:56 -08:00
Dan Schaper
f7a17248b7
Warn with whiptail if firewall-cmd is running.
2017-01-23 14:19:51 -08:00
Adam Warner
77554fbd13
Merge pull request #1145 from pi-hole/cleanup/more_shellcheck
...
Cleanup/more shellcheck
2017-01-22 13:31:09 +00:00
Dan Schaper
eaf6938c35
DNS whiptail from radio to menu
2017-01-21 16:14:05 -08:00
Dan Schaper
0635309f23
Move distribution check to function.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-21 12:34:47 -08:00
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
Dan Schaper
00b28f0aed
IPTables Whiptal option to install.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-17 14:19:19 -08:00
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
DL6ER
0b72c639fb
Check for existance of iptables command. Fixes #1125
2017-01-13 18:13:10 +01:00
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
Dan Schaper
0e4d5e9103
Bash splitting and globin
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-08 14:49:08 -08:00
Mcat12
76531da340
Merge pull request #1067 from pi-hole/fix/firewall_redux
...
Fix/firewall redux
2017-01-02 11:36:38 -05:00
Adam Warner
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
DL6ER
85f0241c0d
Reprocess DHCP settings after update
2017-01-02 10:50:59 +01:00
Dan Schaper
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
Dan Schaper
de6ce276d0
Merge branch 'development' of github.com:pi-hole/pi-hole into fix/firewall_redux
2017-01-01 14:13:32 -08:00
Dan Schaper
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
Dan Schaper
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
Adam Warner
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
Dan Schaper
7750e1344c
DRY displayFinalMessage
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-01 07:10:14 -08:00
Dan Schaper
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
Dan Schaper
fa055481a7
Shellcheck screen size
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-01 06:32:49 -08:00
Dan Schaper
ad07655630
Defensive git cloning
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-01 00:14:12 -08:00
Dan Schaper
7cceb8615a
make_repo more defensive.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-01-01 00:13:51 -08:00
Dan Schaper
45587194e5
Regex fun
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-31 21:33:05 -08:00
Dan Schaper
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
DL6ER
02d4b6794c
Merge pull request #1066 from dgnthr/patch-1
...
Fixed a typo in the installation script
2016-12-31 17:30:56 +01:00
Dominik G
836b717346
Fixed a typo in the installation script
2016-12-31 17:25:48 +01:00
DL6ER
1a3bdbaabf
Merge pull request #1057 from pi-hole/new/whitelistonblockingpage
...
Allow whitelisting from blocking page
2016-12-30 21:07:34 +01:00
Mcat12
5e35fdbc52
Save blocking page CSS to pihole directory instead of admin
2016-12-30 14:42:15 -05:00
Dan Schaper
a4a9879643
Restructure firewall detection and application.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-29 15:57:29 -08:00
Dan Schaper
ea9ec384c6
Disambiguate nested ifs.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-29 01:35:52 -08:00
Dan Schaper
bbb958b7ed
Detect RPF breaking kernel updates.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-29 01:34:49 -08:00
DL6ER
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
DL6ER
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
Dan Schaper
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
Dan Schaper
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
Dan Schaper
c3b51b4ceb
Merge branch 'development' into feature/track_pre-installed_packages
2016-12-27 12:37:19 -08:00
Dan Schaper
bc6a985f7c
Merge branch 'development' of github.com:pi-hole/pi-hole into tweak/subshells
2016-12-27 11:53:46 -08:00
Dan Schaper
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
Dan Schaper
a328326e39
Formatting
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-27 11:41:07 -08:00
Dan Schaper
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
Dan Schaper
c5f5252145
Merge pull request #961 from pi-hole/customblockpage
...
Custom Pi-Hole block page
2016-12-27 10:25:03 -08:00
Mcat12
7fadd469c9
Merge pull request #1038 from pi-hole/fix/IPV6_detection
...
Check IPv6 routing
2016-12-27 11:42:23 -05:00
Dan Schaper
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
Dan Schaper
f458780ba7
Rebase onto development
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 16:56:31 -08:00
Dan Schaper
8ad52806de
Quiet DNF
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 16:54:23 -08:00
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
Dan Schaper
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
Adam Warner
d12efccd0b
Merge pull request #1028 from pi-hole/bcambl-selinux_notification
...
Bcambl selinux notification
2016-12-23 17:36:33 +00:00
Mcat12
54afffed19
Remove newline
...
Issue was already fixed
2016-12-23 12:30:33 -05:00
Mcat12
fc8fcdbece
Add newline
2016-12-23 12:28:18 -05:00
Promofaux
abd1fedc9d
.
2016-12-23 17:25:55 +00:00
Promofaux
9725985037
printf to echo. idgaf
2016-12-23 17:24:33 +00:00
Promofaux
754f3359ec
too many echos spoil the branch
2016-12-23 17:22:31 +00:00
Promofaux
4c131b8c28
newlines
2016-12-23 17:21:23 +00:00
Promofaux
15c674ba29
verbosity
2016-12-23 17:20:33 +00:00
Promofaux
00aff6a906
maybe
2016-12-23 17:16:03 +00:00
Promofaux
c45c3a72b5
words words words
2016-12-23 17:06:33 +00:00
Promofaux
662d450651
adjust size of whiptail dialog
2016-12-23 16:58:58 +00:00
Promofaux
a8897becd2
Make sure whiptail is installed...
2016-12-23 16:55:56 +00:00
Promofaux
fdb64a5702
untested convert user prompt to whiptail
2016-12-23 16:53:42 +00:00
Mcat12
73a80ff7dc
Align installer output for updating repo
2016-12-23 11:51:34 -05:00
Promofaux
a795fd698d
Merge branch 'selinux_notification' of https://github.com/bcambl/pi-hole into bcambl-selinux_notification
2016-12-23 16:48:16 +00:00
bcambl
2fb0dc0a4a
add warning if SELinux is Enforcing
2016-12-23 10:27:52 -06:00
DL6ER
aa8e1497a3
Fixed error
2016-12-23 17:12:38 +01:00
DL6ER
afabf30ec6
Fix Fedora web UI support
2016-12-23 16:57:51 +01:00
DL6ER
420158494d
Merge pull request #1022 from pi-hole/fix/adlists.default
...
Internal (/etc/pihole/adlists.default)
2016-12-23 16:08:06 +01:00
DL6ER
6b7b0e0eb3
Test if /etc/pihole/adlists.default exists
2016-12-23 16:00:48 +01:00
Adam Warner
ad70db7e0e
Merge pull request #1020 from bcambl/setDNS_before_ifcfg
...
Set dns before ifcfg (Fixes #1019 )
2016-12-23 12:12:05 +00:00
bcambl
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
bcambl
513bc32d87
is_repo: ensure directory exists
2016-12-22 20:00:45 -06:00
Dan Schaper
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
Dan Schaper
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
DL6ER
bc8cf1b2d8
Fixed wrong indentation
2016-12-22 19:23:06 +01:00
DL6ER
bb28d94884
Merge branch 'development' into customblockpage
...
Conflicts:
automated install/basic-install.sh
2016-12-22 19:22:09 +01:00
Blayne Campbell
8f402f5c77
Merge pull request #1009 from bcambl/fix_1004
...
replace 'git -C' with long version
2016-12-22 11:44:08 -06:00
DL6ER
60054da582
Add lighttpd user (OS dependent) to sudoers file
2016-12-22 13:26:11 +01:00
bcambl
cbf84c1840
replace subshell with command chain
2016-12-22 04:32:42 -06:00
bcambl
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
Dan Schaper
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
DL6ER
c48e6c91f5
Merge pull request #999 from pi-hole/fix/install_deps_exit
...
Fix/install deps exit
2016-12-21 16:00:48 +01:00
DL6ER
8841bdd252
Reset the if's
2016-12-21 12:57:02 +01:00
DL6ER
58261098fb
We should not call a function that Dan deleted
2016-12-21 12:07:44 +01:00
DL6ER
9432d3035a
Merge branch 'development' into cleanup/remove_legacy_detect
...
Conflicts:
automated install/basic-install.sh
2016-12-21 12:01:58 +01:00
DL6ER
9907fc2770
Merge branch 'development' into fix/install_deps_exit
...
Conflicts:
automated install/basic-install.sh
2016-12-21 11:54:52 +01:00
Dan Schaper
8117ec8e20
Remove v1 legacy detection code.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-20 17:50:44 -08:00
Dan Schaper
ff2783f9fc
Tabs to spaces and formatting.
...
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
2016-12-20 17:22:57 -08:00
Dan Schaper
156a51c945
Remove extra display only variable.
...
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
2016-12-20 17:04:46 -08:00
Dan Schaper
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
Dan Schaper
7f3b0030ea
LF
...
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
2016-12-20 16:47:43 -08:00
Dan Schaper
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
Dan Schaper
5c43df66a8
Remove spinner function, masked return values.
...
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
2016-12-20 16:22:08 -08:00
Dan Schaper
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
Dan Schaper
8cb01cdd29
One step to rename variables.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-16 15:08:30 -08:00
Adam Warner
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
DL6ER
d4c378ed5d
Remove PIHOLE_INTERFACE if already set (not PIHOLE_DOMAIN)
2016-12-16 13:20:25 +01:00
DL6ER
7872f68a45
Only try to remove parts inthe file if the file already exists
2016-12-16 13:13:35 +01:00
DL6ER
ec8c848106
Don't kill already existing setupVars.conf on update (and fresh install)
2016-12-16 12:53:00 +01:00
Mcat12
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
DL6ER
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
DL6ER
e2898217d2
Made message shorter
2016-12-15 15:20:41 +01:00
DL6ER
f81dadc5d0
Fix final message
2016-12-15 14:10:55 +01:00
Promofaux
c10ec5548f
remove code that replaces tokens in 01-pihole.conf
2016-12-14 19:29:44 +00:00
Mcat12
92f4824884
Automatically enable IPv6
2016-12-14 13:52:14 -05:00
DL6ER
a00034a6a7
Add password to webUI after update if there is none
2016-12-12 17:03:53 +01:00
DL6ER
5374f652dd
No need to modify lighttpd config file, since we overwrite it anyways
2016-12-06 08:43:24 +01:00
DL6ER
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
DL6ER
e7241a989c
Include CSS file
2016-12-04 22:20:51 +01:00
DL6ER
b246dba7e7
Rename index.html to index.php
2016-12-04 21:41:26 +01:00
trinapicot
870454330d
Add check for lighty.conf before trying to move it
2016-12-02 13:54:11 -07:00
Dan Schaper
d53a3af191
Merge pull request #899 from diginc/configureFirewall_unittest
...
Configure firewall unittest
2016-11-19 11:07:38 -08:00
Dan Schaper
e9475a9739
Merge pull request #887 from brontide/dependancy_cleanup
...
Dependancy cleanup
2016-11-07 21:45:23 -08:00
bcambl
0caa44e979
write ifcfg instead of appending
2016-11-07 12:54:31 -06:00
diginc
b9f3493dbc
move PH_TRUE to Dockerfiles to DRY
2016-11-03 22:34:04 -05:00
diginc
633095aee1
switch to consistent style
2016-11-02 22:13:05 -05:00
Eric Warnke
71005e1db3
Merge with change of spacing in development
2016-11-02 19:01:34 -04:00
Promofaux
c452a4569e
.js
2016-11-02 21:17:00 +00:00
Promofaux
a182a208dc
Tidy up output
2016-11-02 21:06:12 +00:00
Promofaux
d273b4b48b
Check for missing index.html, replace if missing.
2016-11-02 20:57:56 +00:00
Promofaux
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
Dan Schaper
6d415a7384
Merge pull request #894 from diginc/InstallFixes_UnitTests
...
Unit tests framework and some basic tests
2016-11-02 09:42:20 -07:00
Dan Schaper
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
Adam Warner
50bd8b4a09
Further tweaks to local repo handling
2016-11-02 13:34:57 +00:00
Dan Schaper
7740e4268c
Consistency and standards basic-install start.
2016-11-02 05:17:28 -07:00
Adam Warner
3df2ef8587
Cherry picking f6f6f6d, conflict fix
2016-11-02 04:31:28 -07:00
Adam Warner
354309fcad
set QUERY_LOGGING default to true
2016-11-02 04:28:58 -07:00
Adam Warner
edd00e8e70
consistency
2016-11-02 04:12:37 -07:00
Adam Warner
82e7de2aaa
Account for variable name changes
2016-11-02 04:12:21 -07:00
Adam Warner
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
Adam Warner
a2903b6e63
Consistency
2016-11-02 04:11:54 -07:00
Dan Schaper
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
Dan Schaper
c07d7165ab
Global variables CAP'ed
2016-11-02 04:11:27 -07:00
Dan Schaper
d695c5972f
local variables just to be safe and make sure they stay in this function.
2016-11-02 04:11:09 -07:00
Dan Schaper
bbc09ed313
Swap variable names.
2016-11-02 04:10:57 -07:00
Promofaux
617a147706
Wording adjustment
2016-11-02 04:10:29 -07:00
Promofaux
d4dccfdb2d
Cherry pick 229439c
2016-11-02 04:08:53 -07:00
Dan Schaper
d9528dfd09
Bash is funny with returns.
2016-11-02 00:51:38 -07:00
Dan Schaper
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
Dan Schaper
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
Dan Schaper
7a22471787
New naming convention, and reorder functions as bash would prefer them to be.
2016-11-01 22:19:40 -07:00
diginc
b4524839bb
Merge branch 'development' of https://github.com/pi-hole/pi-hole into InstallFixes_UnitTests
2016-11-01 23:52:20 -05:00
Eric Warnke
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
Eric Warnke
4e7ca51beb
Added dependancy for ping and lsof used in debug scripts
2016-10-31 21:24:57 -04:00
Eric Warnke
65e0fcbf10
Merge branch 'development' of https://github.com/pi-hole/pi-hole into wheezy_fix2
2016-10-28 13:14:00 -04:00
Dan Schaper
e22aca49c8
Merge pull request #813 from das7pad/development
...
Create missing directory for lighttpd
2016-10-28 10:05:08 -07:00
Adam Warner
21fc6344bf
Merge pull request #849 from pi-hole/aManHasNoNameResolution
...
[BugFix] A man has no name resolution
2016-10-27 19:41:07 +01:00
Promofaux
794fa21137
install uninstall.sh...
2016-10-27 12:44:21 +01:00
Eric Warnke
977d1d1998
Merge branch 'development' of https://github.com/pi-hole/pi-hole into wheezy_fix2
2016-10-27 07:37:40 -04:00
Promofaux
cde003bc98
\ all the /s!
2016-10-27 11:13:00 +01:00
Adam Warner
3996e11425
Merge pull request #859 from pi-hole/ImproveWhitelistBlacklist
...
Improvements to White and Blacklists
2016-10-26 19:52:16 +01:00
Eric Warnke
3a4fe3e391
Wheezy install fix by selecting appropriate deps, made the php check the same
2016-10-26 14:47:29 -04:00
Eric Warnke
4ed6e4d016
Tiny screens get sane minimums
2016-10-26 11:15:02 -04:00
Eric Warnke
ac8d24a1ce
Even with no detected screen size, it should presume 80x24
2016-10-26 11:14:54 -04:00
Eric Warnke
fc776921d5
stty is more compatible and does not require any additional dependancies for busybox
2016-10-26 11:14:46 -04:00
Adam Warner
55a653aca4
clear out /opt/pihole folder before installing scripts
2016-10-26 10:00:00 +01:00
Adam Warner
bd0db56ba0
actually fix up logic
2016-10-25 15:29:02 +01:00
Adam Warner
95f0b3710d
fix up logic
2016-10-25 15:27:13 +01:00
Adam Warner
86349527e7
replace HOSTNAME tokens in 01-pihole.conf
2016-10-25 15:06:37 +01:00
Adam Warner
911053f63f
Replace IPv4 and IPv6 tokens in 01-pihole.conf for pi.hole resolution.
2016-10-25 15:00:18 +01:00
Marcus Hildum
519d731ddd
Fix missing newline
...
My mistake
2016-10-23 16:45:51 -07:00
Marcus Hildum
21b906e0e0
Consistency
...
More of the same
2016-10-21 23:57:47 -07:00
Marcus Hildum
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
Jakob Ackermann
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
Adam Warner
ff5d5b97c3
stash any changes in local repo
2016-10-18 13:54:09 +01:00
Dan Schaper
ef3c13fe2b
Refire with curl
2016-10-17 19:22:56 -07:00
bcambl
fb9664b636
fix typo
2016-10-16 15:11:47 -06:00
bcambl
ee114b3075
use an excluded extension for ifcfg backup
2016-10-16 13:28:14 -06:00
Promofaux
5792fc0bef
change wording depending on choice
2016-10-16 17:23:26 +01:00
Promofaux
42c93917ef
bug I forgot to fix before piholeUpdate was merged to development
2016-10-16 17:19:44 +01:00
Adam Warner
df30a4c0d1
Merge pull request #779 from bcambl/fedora_fixes
...
Fedora fixes
2016-10-16 15:46:50 +01:00
Adam Warner
9ce13f0035
Merge pull request #790 from pi-hole/piholeUpdate
...
Various refactoring.
2016-10-15 23:51:07 +01:00
Promofaux
3884b01503
Forgot a
2016-10-15 23:21:13 +01:00
Promofaux
a84c3adeab
if uniformity then dan = happy
2016-10-15 23:19:26 +01:00
Promofaux
a65b784907
repeat after me: repetition is a bit repetitive.
2016-10-15 21:26:41 +01:00
Promofaux
05dadad2e1
repair sounds better than refresh
2016-10-15 21:22:46 +01:00
Promofaux
3a9b39b842
adjust text in update_dialogs() whiptail
2016-10-15 21:12:13 +01:00
Promofaux
e612003293
handle arguments better, convert to flags, echo when they're set to true.
2016-10-15 20:52:20 +01:00
Promofaux
a43577fa26
add reconfigure flag to -r command
2016-10-15 20:43:03 +01:00
Promofaux
a6fa60868b
spacing
2016-10-15 15:41:48 +01:00
Promofaux
99878ae7d6
reflect name change of some of the variables in setupVars
2016-10-15 15:40:12 +01:00
bcambl
26202014a2
stdout formatting
2016-10-12 20:35:08 -06:00
bcambl
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
bcambl
e5ede16749
update yum/dnf package count grepfu
...
see pull #774
2016-10-12 20:33:13 -06:00
bcambl
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
diginc
a03caea549
setupVar tests passing for debian & centos
2016-10-10 23:14:39 -05:00
Promofaux
aa23fb1d56
choose*
2016-10-10 22:34:12 +01:00
Dan Schaper
570611fc09
CentOS Firewall fix
2016-10-10 11:30:15 -07:00
Dan Schaper
94dd5b1ebe
More CentOS fixes.
2016-10-10 11:05:29 -07:00
Dan Schaper
74524e024d
Always check PIHOLE_dependencies.
2016-10-10 10:36:19 -07:00
Dan Schaper
e42b6dcc8e
create_pihole_user update @diginc.
2016-10-10 09:21:28 -07:00
Dan Schaper
d71b799e75
More cleanups, localize variables, clean formatting.
2016-10-10 08:23:14 -07:00
Dan Schaper
87e7121332
Gravity.sh checks for null value for variables, obliging that expectation.
2016-10-10 07:32:16 -07:00
Dan Schaper
94f6354c94
Spinner blocks set -e trying to get it in functions that won't crash out...
2016-10-10 07:25:43 -07:00
Dan Schaper
b79059ebdb
Start to add the spinner back in!
2016-10-10 06:46:30 -07:00
Dan Schaper
4f98c1bebb
Boolean operators inside quotes don't work well...
2016-10-10 06:16:00 -07:00
Dan Schaper
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
Dan Schaper
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
Dan Schaper
47aad254d8
localized some more variables
2016-10-10 03:56:03 -07:00
Dan Schaper
bc14074d2a
Tighten up Update Whiptail appearance.
2016-10-10 03:39:32 -07:00
Dan Schaper
5ab5b1a190
Overhaul dnsmasq version 3 way handshake configuration files.
2016-10-10 03:23:52 -07:00
Dan Schaper
b055f190f5
Factor out interfaces detection.
2016-10-10 03:16:22 -07:00
Dan Schaper
84b8953352
Remove quiet flags from package managment variables. Set quiets in functions by redirecting output.
2016-10-10 02:58:38 -07:00
Dan Schaper
93a591d487
Linting from ShellCheck
2016-10-10 02:57:04 -07:00
Dan Schaper
e6c0f38a7c
Monolithic changes in one commit again.
2016-10-10 02:24:03 -07:00
Dan Schaper
f107ae4f9b
Merge conflict resolution
2016-10-10 09:08:25 +00:00
Dan Schaper
bad7a08804
Refactor and rename create_pihole_user. Now to actually use the user created...
2016-10-10 01:51:19 -07:00
Dan Schaper
25cbf4cb35
Factor out legacy location script removal.
2016-10-10 01:43:10 -07:00
Dan Schaper
7f179f9a58
Remove sourcing bash completion, would fall off as soon as the subshell terminated.
2016-10-10 01:40:56 -07:00
Dan Schaper
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
Dan Schaper
43e2aaebf0
rename updateDialogs to update_dialogs
2016-10-10 01:04:59 -07:00
Dan Schaper
e60eb66283
UpdateDialogs are now a Whiptail Menu, self-explanatory.
2016-10-10 01:04:03 -07:00
Dan Schaper
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
Dan Schaper
8a15fd44d5
Update is_repo() to use git status for validity checks.
2016-10-09 23:53:18 -07:00
Dan Schaper
dac2b8942e
Typo fix to generate commit.
2016-10-09 22:38:00 -07:00
Dan Schaper
54a1c5b63a
Revert inadvertent commits
...
IDLE keeps committing direct to development.
2016-10-09 22:35:14 -07:00
Dan Schaper
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
Dan Schaper
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
Dan Schaper
d9e28a7422
factor out installer_dependencies
2016-10-09 22:05:06 -07:00
Dan Schaper
1fecdf42ca
Move git to installer deps, refactor some functions.
2016-10-09 22:00:23 -07:00
Dan Schaper
d4bf85b67c
Self contain package_check into package_check_install. Passes set -e test.
2016-10-09 21:44:45 -07:00
Dan Schaper
7131ff27c3
Attempt to set -e
2016-10-09 21:32:25 -07:00
Dan Schaper
a30f78c1c8
Oneliner php version check, passes set -e check.
2016-10-09 21:31:36 -07:00
Dan Schaper
7e0afffca8
Revert inadvertent commits
2016-10-09 19:41:32 -07:00
Dan Schaper
293c60fb9c
Exit script on failure to install dependent package.
2016-10-09 13:52:36 -07:00
Dan Schaper
f5be8b2a5e
Single dependency package check function, will exit if any errors with message to update cache.
2016-10-09 13:43:01 -07:00
Dan Schaper
6772603c15
Relocate cache check to its own function
2016-10-09 12:34:53 -07:00
Jacob Salmela
a22904f99b
Merge pull request #769 from pi-hole/Fix/PackageCacheFresh
...
Fix/package cache fresh
2016-10-09 09:00:52 -05:00
Dan Schaper
b157bc5cd7
Fixes #768 Check the staleness of the package index instead of the package cache.
2016-10-08 13:47:35 -07:00
Dan Schaper
10e1a03c76
runGravity is called after finalExports in the Debian install side.
2016-10-08 12:58:42 -07:00
Dan Schaper
d20df92e9f
Script will now run as root, removed sudo from function calls.
2016-10-08 12:56:26 -07:00
Dan Schaper
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
Dan Schaper
33745be745
Merge pull request #753 from pi-hole/feature/RemoveBarePHP
...
Remove bare php package from dependencies
2016-10-07 21:32:07 -07:00
Adam Warner
6a28070017
Too many -s
2016-10-07 13:09:27 +01:00
Dan Schaper
91b948332e
Merge pull request #754 from pi-hole/fix/bashConditional
...
fix/bashConditional
2016-10-07 03:42:22 -07:00
Dan Schaper
d1a7fe2d44
fix/bashConditional
2016-10-07 03:36:34 -07:00
Dan Schaper
c39324d11f
Remove bare php package from dependencies
...
`php5` package can trigger install of Apache2. Without this package in deps, PHP is still installed and operational.
2016-10-07 00:24:25 -07:00
Dan Schaper
8c151c62ce
echo's don't need sudo
2016-10-05 10:46:10 -07:00
Dan Schaper
50d16d8215
Finish install conversion for installScripts()
2016-10-05 10:45:17 -07:00
Dan Schaper
3bbac9a5f2
install pihole
2016-10-05 10:19:47 -07:00
Dan Schaper
3600fd277e
Don't need sudo to echo to term.
2016-10-05 10:16:56 -07:00
Dan Schaper
e8bb4a7e36
Continue migration to install
2016-10-05 10:14:36 -07:00
Dan Schaper
36987cb1cc
Continue migration to install
2016-10-05 09:57:48 -07:00
Dan Schaper
5382b4fa37
Change installScripts to use install
...
Use the install program instead of copying files and directories in installScripts function.
2016-10-05 09:42:15 -07:00
Promofaux
c281b47905
Mover {SUDO} mkdir -p /etc/pihole/ back to the beginning.
2016-10-02 12:44:33 +01:00
Promofaux
aca5064743
--force seems to light. lets try --i_do_not_follow_recommendations
2016-10-02 11:16:48 +01:00
Promofaux
6f780316c4
remove whiptail dependency from verifyFreeDiskSpace.
...
Add argument detection to skip disk space. This is because curling to bash does not support waiting for user input.
2016-10-02 11:09:14 +01:00
Promofaux
4e262d81f0
wrap these vars in {} to matcht he rest of the script
2016-10-02 10:39:09 +01:00
Promofaux
6c2ff950ee
remote duplicate ${SUDO} mkdir /etc/pihole
2016-10-02 10:33:59 +01:00
Promofaux
7684069d0b
verifyFreeDiskSpace BEFORE installing any dependencies
2016-10-02 10:33:04 +01:00
Promofaux
73c85ae68a
remove duplicate calls to installConfigs
2016-10-02 10:30:55 +01:00
Promofaux
6a8bef83b3
Fix the php version check command (Thanks @diginc!)
2016-09-30 22:40:43 +01:00
Adam Warner
3fc3c5cae4
Add iproute2 to fix #653
2016-09-27 11:15:46 +01:00
Adam Warner
daa5366b57
Check if php5 is available in apt-cache, if so install it, else just install php
2016-09-27 11:11:47 +01:00
Dan Schaper
ac8d295bb9
Merge pull request #668 from bcambl/dns-hostname-fixes
...
Dns hostname fixes
2016-09-20 10:16:15 -07:00
bcambl
21d4199a38
Merge branch 'development' into dns-hostname-fixes
2016-09-19 17:33:32 -06:00
Adam Warner
655c422c3c
Add additional instruction.
...
Include "(Press space to select)" on ChooseInterface
2016-09-19 22:17:58 +01:00
Dan Schaper
5ca6599ca9
Merge branch 'development' into gravTweak
2016-09-19 12:54:58 -07:00
Promofaux
f16574085f
remove code made redundant by the existence of /etc/pihole/setupVars.conf
2016-09-16 23:09:14 +01:00
Promofaux
a0977af081
remove references to UpdateDashboard.sh
2016-09-12 19:10:12 +01:00
Adam Warner
c2cb92a0b0
Add cron to apt-get dependencies
2016-09-08 23:42:05 +01:00
bcambl
6c0c6182e9
fix newline in configureSelinux stdout
2016-09-07 21:16:52 -06:00
bcambl
05ad4445b5
add dns to sysconfig interface configuration
2016-09-07 21:16:51 -06:00
bcambl
1dd9f0747e
add gateway to interface configuration
...
pi-hole@9cb4e8b broke #593
original commit 8550b76
2016-09-07 21:16:36 -06:00
Promofaux
04c60e8a1c
Switch fedora and debian install check order
2016-09-05 15:52:09 +01:00
Promofaux
01a9534729
Merge branch 'development' into UpdateMethod
...
# Conflicts:
# automated install/basic-install.sh
2016-08-30 19:32:40 +01:00
Promofaux
344e63c2dc
Add undocumented argument to install script ("pihole") which allows the pihole command to run the update script without prompting the user. Useful for update automation
2016-08-26 23:06:35 +01:00
Promofaux
e4295f5d3c
Move exporting the setupConf files to a function to be run at the end of the script only. If script is cancelled, then they are not written. Simples.
...
Also I'm surprised nobody noticed the duplicate installPihole() function :S
2016-08-26 22:45:38 +01:00
Daniel (Fourdee)
49ded54306
Minor - Update descriptions
...
Apply to whiptail descriptions also.
2016-08-25 12:17:36 +01:00
Daniel (Fourdee)
6c0a8a4337
Minor - Corrected var names
...
Kilobyte values are used, not Bytes.
2016-08-25 12:11:54 +01:00
Promofaux
d217626318
If an existing install is detected, offer the user a choice of Updating or Installing with a radio list whiptail.
2016-08-24 22:52:11 +01:00
Promofaux
ed94f4b1df
Create directory before trying to create a blank file in it....
2016-08-22 22:06:33 +01:00
Promofaux
a57b097afc
Change echos at the end of install depending on install or update
2016-08-21 18:00:41 +01:00
Promofaux
eb42b894c4
Delete setupVars.conf if user cancels out of install process.
2016-08-21 17:57:11 +01:00
Promofaux
7eb43a0b47
Expand update dialog text
2016-08-19 23:25:04 +01:00
Promofaux
fdb104348c
Add updatePihole method
2016-08-19 22:45:24 +01:00
Promofaux
f54828352d
remove spaces from update bool set
2016-08-19 22:42:04 +01:00
Promofaux
cc157def63
remove --defaultyes from update whiptail
2016-08-19 22:40:27 +01:00
Promofaux
8fc83655ab
correct filename spelling mistake
2016-08-19 22:38:16 +01:00
Promofaux
9fb549293a
APPEND
2016-08-19 22:34:50 +01:00
Promofaux
e4cc5b5b70
testing a new update method by detecting the existence of vars saved from install
2016-08-19 22:31:11 +01:00
Daniel (Fourdee)
037318e2ff
Provide non-zero exit code, as per existing sourcecode.
2016-08-12 13:20:30 +01:00
Daniel (Fourdee)
a9a499939e
Fourdee - See notes:
...
https://github.com/pi-hole/pi-hole/issues/602
+ Improve available free disk space check.
+ Option to override if the free disk space check is not a valid
integer.
2016-08-12 12:44:45 +01:00
Promofaux
9cb4e8bde8
Merge remote-tracking branch 'origin/Debug_Options' into Debug_Options
...
# Conflicts:
# automated install/basic-install.sh
2016-08-05 12:53:08 +01:00
bcambl
fe8d0f8ea8
Merge branch 'development' into sysconfig_gateway
2016-08-03 19:26:53 -06:00
Promofaux
2bc364023a
Remove erroneous space in chmod command
...
Fix spacing in help function
2016-08-02 23:51:53 +01:00
Promofaux
57df56dc62
Add version.sh to the install script
2016-08-02 20:08:21 +01:00
Promofaux
66ff9a24c6
Add piholeDebug to the chmod 755 command in install script. Not sure how that went missing...
2016-08-01 21:54:42 +01:00
bcambl
8550b76e23
add gateway to interface configuration
2016-07-24 22:42:06 -06:00
Blayne Campbell
c647e27e15
Merge branch 'development' into centos-nc
2016-07-19 08:48:54 -06:00
Adam Warner
73645f299a
Merge branch 'development' into bugfix/dhcpcd_comments
2016-07-18 14:37:38 +01:00
bcambl
a32ad0dbf2
fix centos nc dependency
2016-07-15 21:43:23 -06:00
Promofaux
e106ff0fef
Add netcat to dependencies for termbin.com. Should be installed by default, but JUST IN CASE.
2016-07-15 19:58:26 +01:00
Dan Schaper
f0a2248c81
Change comment to hash
...
Change format of comment to hash/octothorpe to clearly delineate that it's a comment. Looks better than `:::` which causes confusion.
2016-07-15 10:27:40 -07:00
Daniel
2b0ba281a4
Repairs apt-get incorrect options
2016-07-04 15:35:46 -04:00
Dan Schaper
024b741552
Merge pull request #490 from bcambl/fedora-armhf7
...
Fedora Support
2016-06-29 14:25:23 -07:00
Mcat12
1f130b6550
Fix missing permissions on piholeIP
...
Without sudo/root privileges, the echo command is unable to write
to the file.
2016-06-21 19:16:11 -04:00
bcambl
fa89bd830a
re-order when SELinux gets configured
...
configure SELinux *after* git clone/pull & file setup and *before* service configuration
2016-06-11 22:33:44 -06:00
bcambl
3ba05d0274
configure static IP on Fedora via sysconfig script
2016-06-11 22:10:12 -06:00
bcambl
0d9a8d70bf
configureSelinux prior to installPihole
2016-06-11 17:28:57 -06:00
bcambl
5c79184d3b
add ifconfig dependency for Fedora install
2016-06-11 17:17:12 -06:00
bcambl
3d619d9ccc
fix iptables udp rule
...
fixes dmesg: ip_tables: udp match: only valid for protocol 17
2016-06-11 17:04:45 -06:00
bcambl
afdf3ae7a1
add sudo package to PIHOLE_DEPS
2016-06-11 16:10:31 -06:00
bcambl
d0b6ff2d08
add udp port 53 to iptables/firewalld configuration
2016-06-11 15:58:49 -06:00
bcambl
97737ee9e3
move SELinux config to installPihole() for logging
2016-06-11 15:58:49 -06:00
bcambl
5e27ccc37c
firewalld: specify ports and use default zone
2016-06-11 15:58:49 -06:00
bcambl
682113892a
enable SELinux boolean for httpd server side includes (SSI)
2016-06-11 15:58:49 -06:00
bcambl
376eb81181
SELinux Support
2016-06-11 15:58:49 -06:00
bcambl
4fc40d96d9
ensure firewalld is running before configuration
2016-06-11 15:58:49 -06:00
bcambl
e6634531c7
basic firewalld/iptables configuration
2016-06-11 15:58:49 -06:00
bcambl
04e375a523
enable lighttpd and dnsmasq via systemd
2016-06-11 15:58:49 -06:00
bcambl
65638973ea
correct dhcpcd package name to dhcpcd5
...
move dhcpcd5 to installer dependencies
2016-06-11 15:58:49 -06:00
bcambl
9c26bdd676
ensure fastcgi socket directory and permissions
2016-06-11 15:58:49 -06:00
bcambl
b31931c907
add epel-release for CentOS support
2016-06-11 15:58:49 -06:00
bcambl
c74af2c21f
warn if lighty-enable-mod utility is not available
...
Fastcgi can be enabled via lighttpd configuration.
This step may not be required for all distributions.
2016-06-11 15:58:49 -06:00
bcambl
c160b2e54b
fix lighttpd user/group variables
2016-06-11 15:58:48 -06:00
bcambl
c4234f4542
ensure ownership/existence of /var/cache/lighttpd/compress
2016-06-11 15:58:48 -06:00
bcambl
62fa9c0f6e
fixing whitespace
2016-06-11 15:58:48 -06:00
bcambl
8198f06073
ensure dnsmasq conf-dir is configured for /etc/dnsmasq.d
2016-06-11 15:58:48 -06:00
bcambl
6f2117d786
append '.debian' to lighttpd.conf for compatability
2016-06-11 15:58:48 -06:00
bcambl
b3ec3b487c
add Fedora dependency: lighttpd-fastcgi
2016-06-11 15:58:48 -06:00
bcambl
94f131a0b7
update deps and package manager variables
2016-06-11 15:58:48 -06:00
bcambl
7af0029175
check for systemctl for systemd service management
2016-06-11 15:58:48 -06:00
bcambl
f4228b04f8
additional fedora dependancies
...
based on current fedora (23 at this moment) docker image
2016-06-11 15:58:48 -06:00
bcambl
ffaf243160
split dependency installations into two separate functions
...
- installerDependencies:
- updates the package manager list/cache
- installs dependencies for install script
- checkForDependencies:
- install dependencies for Pi-Hole
2016-06-11 15:58:48 -06:00
bcambl
29d48bbd9a
move IP/route discovery to a function
...
Defer use of 'ip' utility until after install script dependencies have been satisfied.
2016-06-11 15:58:48 -06:00
bcambl
37dda79db2
install dependencies for install script
2016-06-11 15:58:48 -06:00
bcambl
063e3e85e1
Fedora compatibility variables and dependencies
2016-06-11 15:58:41 -06:00
bcambl
42afaa9f66
remove dpkg-query dependency from sudo check
2016-06-11 15:53:46 -06:00
Jacob Salmela
13a479a9f6
tell user to run as root
...
since you can't install sudo as a non-root user, the script needs to be
run as root in order to install it.
2016-06-11 13:21:08 -05:00
Jacob Salmela
1194e48bd8
install sudo
...
sudo is needed for the sudoers file to work, which is how the Web
interface executes the pihole commands.
2016-06-11 13:08:43 -05:00
Jacob Salmela
1e0666d1ef
make folder so file can be deployed
2016-06-10 18:51:38 -05:00
Jacob Salmela
1c53ad6876
mcat is smarter than me
...
He already added this.
2016-06-10 18:20:53 -05:00
Jacob Salmela
dc2a537f6b
copy sudoers file
...
necessary for Web interface white/black list functionality.
2016-06-10 17:47:27 -05:00
Mcat12
a16cd9aef7
Merge pull request #469 from pi-hole/web-sudo
...
Give WebUI permissions to run pihole commands
2016-05-26 18:45:04 -04:00
Mcat12
6cf446032f
Show web interface URL after install
2016-05-25 18:55:36 -04:00
Mcat12
d52a8f08ed
Merge pull request #501 from davidtorcivia/development
...
Fix basic install for Proxmox LXC
2016-05-11 19:12:37 -04:00
David Torcivia
b7e27bf6b4
Fix basic install for Proxmox LXC
...
Fixed basic installer to properly bind to eth0 when install to a Proxmox LXC.
2016-05-11 18:24:43 -04:00
Carter Maxwell
c0e1772e21
Replace toilet with echo
2016-05-07 11:44:18 -07:00
Jim Liu
00cc480bc1
Update basic-install.sh
2016-04-26 16:10:51 +08:00
Jim Liu
221b72439b
Update basic-install.sh
2016-04-22 01:46:27 +08:00
Mcat12
09cdf5081c
Install sudoer file
2016-04-17 23:03:12 -04:00
nate
22ea384ac8
Fix whiptail spacing
2016-04-03 18:05:11 -05:00
nate
69e8c014c3
Indentation fix
2016-04-03 17:25:48 -05:00
Promofaux
2d08217173
Tidy up For loops, clean up whitespace
2016-04-03 21:43:36 +01:00
Promofaux
36645d9335
Add check for existing files in /usr/local/bin left over from previous version, as those scripts are replaced with pihole <command> script.
2016-04-03 18:39:22 +01:00
Promofaux
ad8573c739
Pedantic change, stops my editor from treating all of the code as one long sting in ' ' (as the ' was escaped with \)
2016-04-03 18:10:50 +01:00
nate
71133f6b59
Spelling error fix...
2016-04-02 19:42:33 -05:00
nate
5d5d6c2c70
handle case where parent directories do not exist
2016-04-02 19:31:26 -05:00
nate
37fa462db5
Erraneous call to SUDO removed
2016-04-02 19:24:19 -05:00
nate
1a2046a7eb
Added uninstall option to pihole command. Minor fixes
2016-04-02 19:20:54 -05:00
nate
3dff7e80fc
Fixed path to /etc/bash_completion.d/
2016-04-02 18:52:03 -05:00
nate
6eea9239a7
Merged branch development into PiHoleController
2016-04-02 18:41:36 -05:00
nate
75f1969bd2
Set executable permissions of pihole and changed installer to invoke sudo for gravity.sh.
...
Note: We invoke gravity.sh with sudo in other places, so ignore the removed comment.
2016-04-02 18:39:09 -05:00
nate
447af208b3
Fixed missing cp of piholeDebug.sh to /opt/pihole
2016-04-02 17:59:59 -05:00
nate
d47fbbbe96
Mcat12 requests. Added bash-completion support
2016-04-02 17:58:10 -05:00
nate
28f2a1309e
Merge branch 'development'
...
Conflicts:
automated install/uninstall.sh
2016-03-31 20:25:54 -05:00
nate
f8427ab789
Merge remote-tracking branch 'refs/remotes/pi-hole/development'
...
Conflicts:
README.md
advanced/Scripts/blacklist.sh
advanced/Scripts/whitelist.sh
automated install/basic-install.sh
gravity.sh
2016-03-29 12:57:22 -05:00
Nate
fb5bc16c83
Call gravity.sh in it's new location
2016-03-29 00:14:56 -05:00
nate
456eee05f2
Added pihole.sh to /usr/local/bin
...
Uninstall.sh will handle removing the file
2016-03-28 18:55:37 -05:00
nate
00b65abd09
Minor changes to reflect new tool usage
...
Removed symlink of scripts to u/l/b
Added copy for setupLCD to /opt/pihole/
New spinner added to gravity.sh to reflect new spinner in basic-install.sh and uninstall.sh
2016-03-28 18:44:54 -05:00
nate
80f4bf9475
Bug fixes
...
Fixed DONE! to done!
Fixed symlinking user scripts
Fixed /n to \n
2016-03-28 16:20:23 -05:00
nate
f444c7d4a5
Merge resolution
2016-03-28 12:21:49 -05:00
nate
8ef4c12f97
Merge branch 'ScriptCleanup'
...
Conflicts:
README.md
advanced/Scripts/blacklist.sh
advanced/Scripts/whitelist.sh
automated install/basic-install.sh
gravity.sh
2016-03-28 12:21:18 -05:00
nate
c520c55ff4
Addressed UAT issues and moved scripts to /opt/pihole
...
Symlinks now include the /etc/pihole scripts in the user's PATH.
2016-03-28 10:24:13 -05:00
Nate
8c45bd32b7
Loop through dependencies for future expansion.
...
Syntax of uninstall script now matches basic-install.sh.
More error handling of missing default files.
Force user prompt for removing packages when uninstalling.
2016-03-27 12:31:05 -05:00
Nate
2b5cee05e6
Check for existing directory before trying to perform operations on it.
2016-03-27 10:59:09 -05:00
Nate
5442954db6
Prompt user to remove each dependent package if they do choose to remove packages at all.
2016-03-27 10:58:48 -05:00
nate
5ee382c8eb
Roll back addition of piholeDebug.sh (production master base)
2016-03-26 17:00:52 -05:00
Nate
901cb44f5e
Added /etc/.pihole/ and /var/log/*pihole* to uninstall as well as fixed missing call to removeNoPurge.
2016-03-26 16:57:34 -05:00
nate
0b9e78df2c
Cleaned code and added prompt for purge on uninstall
2016-03-26 16:57:01 -05:00
Promofaux
bc09760c84
Grab changes by @rosskevin. ( #386 - lighttpd changes to handle JS files)
2016-03-24 23:19:44 +00:00
Promofaux
1e6ac33ef1
Fix merge conflicts
2016-03-24 23:18:14 +00:00
Adam Warner
02bb5b6742
Revert previous change
...
Reopens #384
2016-03-20 20:50:31 +00:00
Adam Warner
fad5fafa32
Increase disk space to verify...
...
.. was missing a couple of zeros, and not verifying enough space!
Fixes #384
2016-03-20 13:26:02 +00:00
nate
0b5f005a5d
Added piholeDebug.sh script for advanced debugging
...
Script piholeDebug.sh added to /usr/local/bin to generate a detailed log file for debugging/troubleshooting.
2016-03-19 20:32:11 -05:00
Kevin Ross
404ea0ce6d
copy both the html and js stubs during install
2016-03-14 22:54:45 -05:00
Carter Maxwell
4452f784a8
remove trailing whitespace basic-install.sh
2016-03-05 21:16:23 -08:00
Mcat12
adcd7f10ee
Fixed password input
2016-02-28 15:24:38 -05:00
Mcat12
af83936047
Added password to install
...
Saves in password.txt
2016-02-28 15:18:48 -05:00
Adam Warner
a0673c7028
Update basic-install.sh
...
Increase required free bytes.
2016-02-21 20:38:05 +00:00
Promofaux
ca2d3a192c
add double bracket notation to lines 396, 399, 403 . Fixes error raised by @jacobsalmela
2016-02-21 18:38:34 +00:00
Promofaux
0ebb7eecdb
Verify Custom DNS IP is a valid IP address
2016-02-20 17:33:20 +00:00
Promofaux
800d2f0859
Add back in whiptail dialog to verifyFreeDiskSpace()
2016-02-20 16:17:29 +00:00
Promofaux
f397844603
Remove conflicted merge markup. Not sure how that got through.
2016-02-20 16:08:02 +00:00
Promofaux
2d895f328c
Fix merge conflicts
2016-02-20 15:38:39 +00:00
Promofaux
b14b182084
change regex to test for one or more numbers, not 0 or more numbers.
2016-02-20 15:17:57 +00:00
Promofaux
8687d25d88
make prepopulation of freetext on custom DNS provider a bit more intelligent
2016-02-20 15:12:13 +00:00
Promofaux
7001edcd1d
Change 'Other' to 'Custom', add explanation to whiptail. Convert spaces to tabs.
2016-02-20 15:00:03 +00:00
Mcat12
4a1e88f4bf
Fixed Pi-hole user not being created
2016-02-20 09:48:06 -05:00
Promofaux
b41608d40b
Include fix for regex in verifyFreeDiskSpace()
2016-02-20 14:44:56 +00:00
Adam Warner
3e7ecda80f
Merge pull request #242 from ChadBHowell/CBH---pihole-system-user-v2
...
Add user pihole if user does not exsist
2016-02-19 09:31:41 +00:00
Daniel Fayette
8e289215b4
Account for CHIP pc not having root on '/'
2016-02-17 10:00:36 -06:00
Adam Warner
c3c051385c
Update basic-install.sh
...
Corrected mistake in previous commit
2016-02-17 12:42:31 +00:00
Promofaux
c396aeed52
Correct miss-spelled variables on lines 398 and 403
2016-02-17 00:07:14 +00:00
Adam Warner
40f541bc31
update verifyFreeDiskSpace()...
...
addresses #322 . Will now check free space on the first file system output by 'df- lkP`, as opposed to `/` to make pi-hole more compatible with other distros.
2016-02-16 23:00:48 +00:00
Daniel Fayette
432e6d5395
Cleaned up output, Fixed Cancel button
2016-02-16 16:47:36 -06:00
Daniel Fayette
fdf805bc7b
Merged with @slamanna212 code to add 3 new DNS providers.
2016-02-16 16:38:06 -06:00
slamanna212
da959e1296
Increased Size Of Whiptail Dialog
...
Increased Size of Whiptail Dialog to 5 to show all 5 DNS choices
2016-02-15 17:55:14 -05:00
slamanna212
94600c54cb
Added Default State for New DNS Options
...
Added default state of off for 3 new DNS options to better match existing code
2016-02-15 17:54:17 -05:00
slamanna212
06444c1c27
Add 3 More DNS Server Choices Durring Install
...
Added Level 3 , Norton, and Comodo DNS Choices
2016-02-15 17:31:31 -05:00
Adam Warner
4d0b4cfb36
Update basic-install.sh
...
Do not stop dnsmasq when installing. Instead run `service dnsmasq restart` once installation is complete.
This may have been the cause of issues outlined in #218
2016-02-14 23:44:23 +00:00
Adam Warner
3c801e5b91
Merge pull request #301 from fayetted/Issue_163-2
...
Check for 25mb of free disk space before install
2016-02-14 13:29:07 +00:00
Daniel Fayette
ecd46f8560
Allow installer to specify own DNS servers
...
Offers "other" option.
Gives Installer chance to review settings before continuing.
2016-02-13 22:36:24 -06:00
Mcat12
b5406240c6
Fixes IPv6 surviving a reinstall
2016-02-10 19:07:48 -05:00
Daniel Fayette
46d7bfecdb
Check for 25mb of free disk space before install
...
Function will check the free space of / (root)
If the free space is less than 25MB it will give directions
on how to expand the disk.
Fixes #163
2016-02-10 09:34:06 -06:00
Promofaux
255706e173
Bring dev branch up to date with master bug fixes
2016-02-09 20:44:49 +00:00
Sergio G
beb6b950f7
Replaced 'sudo' with
2016-02-08 22:26:41 +01:00
Promofaux
2d1c0be24e
fix reference to install log location. #282
2016-02-06 13:04:54 +00:00
Promofaux
9941651b3c
Addresses changes as requested by @jacobsalmela in #282
2016-02-06 13:02:21 +00:00
Adam Warner
c93c4cc5e6
Update basic-install.sh
...
ahem
2016-02-01 22:28:35 +00:00
Promofaux
06cba7defd
Fix script output around new changes
2016-02-01 22:25:28 +00:00
Promofaux
8b76bbe51d
Merge github.com:pi-hole/pi-hole
2016-02-01 22:19:37 +00:00
Promofaux
aa1d3a4c2e
Fix logic in versionCheckDNSmasq, as dnsmasq.conf was being overwritten every time install was run. Fixes @kmr2319 's concern in #98
2016-02-01 22:19:17 +00:00
Dan Schaper
38e73a188a
Fix array selection
2016-02-01 02:11:55 +00:00
Dan Schaper
3fdf588cc9
Costmetic fixes, change DynDNS to OpenDNS
2016-02-01 02:09:11 +00:00
Promofaux
70e4104c17
Merge remote-tracking branch 'origin/development'
2016-01-31 20:47:10 +00:00
Promofaux
29e0e1760b
Fixes #154 #269 . No need for PR #214 any more.
2016-01-31 20:39:12 +00:00
Chad Howell
5060ed8970
Add error checking for grep and correct typos
2016-01-30 20:51:28 -05:00
Dan Schaper
d18e064d21
Remove no longer needed change to config file
...
Config file moved, no longer needed command removed.
2016-01-30 16:30:38 -08:00
Mcat12
0cfb3c7ab4
Fixed config issue
2016-01-30 19:21:31 -05:00
Mcat12
48f9a61ff0
Updated License
2016-01-30 15:12:40 -05:00
Mcat12
0042e3ae02
Merge branch 'development' into CBH/UpstreamDNS
...
Conflicts:
automated install/basic-install.sh
2016-01-30 13:28:01 -05:00
Adam Warner
b93e46de14
Update basic-install.sh
2016-01-30 14:55:02 +00:00
Promofaux
9e0c7ed29a
Merging from CBH bugfix
2016-01-30 14:34:12 +00:00
Adam Warner
21a07e7419
Merge pull request #263 from pi-hole/newVersioning
...
New versioning system
2016-01-29 20:47:10 +00:00
Adam Warner
6b50ea6504
Merge pull request #249 from pi-hole/OperationBlockListFromGravity
...
Seperate blocklist sources from gravity.sh to allow users to manage their own list of blocklists that persists through installs/upgrades
2016-01-29 19:39:11 +00:00
Mcat12
895647b908
Don't copy version to install dir
2016-01-29 12:32:58 -05:00
Mcat12
0ece58b9cb
Add version
2016-01-29 12:23:03 -05:00
Mcat12
49a56cf131
Start on new versioning
2016-01-29 08:25:35 -05:00
Dan Schaper
cadc506aa5
Remove extraneous whitespace from basic-install.sh
2016-01-28 09:25:00 +00:00
Chad Howell
eee0ccef8c
Merge remote-tracking branch 'refs/remotes/pi-hole/master' into CBH---pihole-system-user-v2
2016-01-27 22:44:14 -05:00
Chad Howell
088bd632ab
Merge remote-tracking branch 'refs/remotes/pi-hole/master' into CBH---Descrition-for-pi-hole-v1-back-function
...
# Conflicts:
# automated install/basic-install.sh
2016-01-27 22:43:43 -05:00
PromoFaux
60bf14d4dd
Merge pull request #255 from pi-hole/Bugfix/InstallScriptFix
...
Force apt-get update if it has not been run today. This will stop dependency errors on a fresh install.
2016-01-27 23:43:38 +00:00
Promofaux
c00fb44cee
Do not force apt-get upgrade on the user. Instead, advise them. We only need to make sure apt-get update has been run
2016-01-27 23:28:36 +00:00
Promofaux
3d78b44a8e
Changes as in #253 , but with less commits to keep the repo tidy
2016-01-27 22:32:08 +00:00
Promofaux
701ae06e4a
Move copying of adlists.default to gravity.sh
2016-01-27 21:14:06 +00:00
PromoFaux
98a0d17431
Update basic-install.sh
...
Emergency Bug fix. I take the blame for this one, it got lost in a merge!
2016-01-27 15:28:40 +00:00
Chad Howell
ae336da7a1
Fix formatting, use consistent style, add comments
...
Fix formatting, use consistent style, add comments
2016-01-27 01:11:38 -05:00
Promofaux
ef99fe2d18
Add line to copy default ad list into /etc/pihole
2016-01-26 20:33:49 +00:00
Adam Warner
2b99fa81f3
Tidy up output lines around new code
2016-01-25 16:08:48 +00:00
Adam Warner
354a42dd00
close quotes on line 318!!!
2016-01-25 12:49:04 +00:00
Adam Warner
4cedca3427
add in a prompt to give users the option to quit installation or continue
2016-01-25 12:47:03 +00:00
Dan Schaper
e99be28a73
Variable missing $
2016-01-25 02:31:03 -08:00
Dan Schaper
32389e4ab8
Terminate string with missing quote
2016-01-25 02:27:44 -08:00
Adam Warner
01d7fc0ac9
Removed apt-get update/upgrade, instead checking for updates availible and advising user to update/upgrade after installation of pi-hole. Addresses issue #218
2016-01-25 10:07:12 +00:00
Chad Howell
d74c8261aa
dnsFile2="/etc/dnsmasq.conf.orig"
...
added .orig
2016-01-25 01:38:41 -05:00
Chad Howell
ac373545d0
versionCheckDNSmasq() fixups
...
versionCheckDNSmasq() fixups per dschaper's suggestions.
2016-01-25 01:27:10 -05:00
Chad Howell
a21948d2c6
Typo fix
...
Typo fix
2016-01-25 01:09:45 -05:00
Chad Howell
940480effe
Revert "Fix backup to use new 01-pihole.conf location"
...
This reverts commit 0c444e6f2b
2016-01-25 00:57:36 -05:00
Chad Howell
29c593b8b0
Add user pihole if user does not exsist
...
Check if user pihole exist and add if not. This will give pihole its
own system user without a login or home directory that is not system
dependent.
2016-01-25 00:28:53 -05:00
Chad Howell
0c444e6f2b
Fix backup to use new 01-pihole.conf location
...
Fix backup to use new 01-pihole.conf location
2016-01-25 00:12:51 -05:00
Chad Howell
6cf6e16d22
Add ability to choose upstream DNS servers
...
Give the user the ability to choose between Google and DynDNS upstream
servers. Then insert the chosen DNS servers in to
/etc/dnsmasq.d/01-pihole.conf. Todo: extend choices to include manually
entered DNS servers.
2016-01-25 00:11:00 -05:00
Chad Howell
e5f9663a0e
Move dnsmasq.conf to dnsmasq.d/01-pihole.conf
...
Check if /etc/dnsmasq.conf is from pihole. If so, replace with an
original and install new in .d directory. Add and unmolested version of
dnsmasq.conf to the ./advanced directory.
2016-01-25 00:04:02 -05:00
Promofaux
eec14be10d
add $SUDO into spinner control.
2016-01-24 21:19:23 +00:00
Promofaux
c179936b54
add $SUDO
2016-01-24 20:49:37 +00:00
Promofaux
649a565801
run apt-get install as sudo when resolving dependencies
2016-01-24 20:35:24 +00:00
Promofaux
2d4ebf5eb5
FIX CONFLICTS
2016-01-24 20:29:22 +00:00
Promofaux
754beed3a1
Bring up to date with master
2016-01-24 20:22:41 +00:00
Promofaux
9f0927351d
Merge from #236
2016-01-24 18:49:25 +00:00
Promofaux
736edf44e4
Added date check before running apt-get update/upgrade. Wont run apt-get update/upgrade if it has already been run today
2016-01-24 17:53:27 +00:00
Promofaux
8a74942da7
Cleaned up output before running gravity.sh
2016-01-24 16:41:11 +00:00
Promofaux
2fe42138c7
removed a space
2016-01-24 16:37:15 +00:00
Promofaux
1563146918
improvements to git functions (passing parameters). Added >/dev/null to attempt to supress output from apt-get upgrade
2016-01-24 16:33:53 +00:00
Promofaux
cf3aea8075
uncomment the apt-get update/upgrade!
2016-01-24 15:27:40 +00:00
Promofaux
6cea480210
Huge update! Base files now cloned from github (or updated if already existing) and copied out to the correct directories. Web admin interface is now cloned from hithub (or updated if already existing). Packages are checked before we go ahead and try to install them anyway.
2016-01-24 03:31:12 +00:00
Promofaux
206717828b
Improve spinner function.
2016-01-23 22:25:30 +00:00
Chad Howell
316d26ede2
Add unzip to the dependencies
...
unzip is required for the install script to complete. Some distros do
not have it installed by default.
2016-01-23 16:29:52 -05:00
Promofaux
e8b8fb0835
s
2016-01-23 00:23:32 +00:00
Promofaux
6663ced38d
Initial commit
2016-01-23 00:13:16 +00:00
Dan Schaper
ea0fb15ff2
Move creation of pihole directory out of IPv6 function
2016-01-22 19:48:55 +00:00
Adam Warner
05a59b17be
Changed URLs in installScripts() to match new organisation links
2016-01-22 16:50:01 +00:00
Kenneth Koski
ce578534fe
Fixing minor typos in basic-install.sh
2016-01-21 11:33:49 -06:00
Promofaux
3f40a95929
Whoops, should probably commit more often. Massive overhaul. Cleaned up output, less verbose (will still output errors, but gets rid of anything not needed) Added a spinner so users don't think it has stalled
2016-01-20 23:34:18 +00:00
Promofaux
5c25c42da8
Make installPiholeWeb() more inteliigent. Checks for existence of /var/www/html/pihole, and only downloads from repo if it does not exist. Will stop install script from overwriting any tweaks users have made to index.html
2016-01-20 22:14:17 +00:00
Promofaux
96011bc2ae
make InstallWebAdmin() a bit more intelligent, and less verbose. Checks if installing over an existing installation, and if so, will remove existing webadmin folder.
2016-01-20 22:02:54 +00:00
Promofaux
4f59577fd1
Remove SUDO from line that runs gravity.sh to stop files in /etc/pihole being owned by root
2016-01-20 21:20:52 +00:00
Promofaux
bc51f88805
Check if any list.* files exist from previous installation, if they do delete them.
2016-01-19 22:52:29 +00:00
jacobsalmela
0a0f00da3b
fixes #169
...
exits if sudo is not installed when run as a regular user
2016-01-16 14:10:03 -06:00
jacobsalmela
5d608a2db5
leave system cron alone
...
Taking JoshKastang’s idea from #153 , the system cron file will be left
alone and the pihole.cron gets its own.
2016-01-16 13:48:29 -06:00
jacobsalmela
7c6ef0cfd0
privileged install
...
This puts sudo in a variable if run as a regular user. If already
running as root, the script proceeds as normal. Not a perfect fix, but
should help for install on other systems.
2016-01-16 13:40:09 -06:00
Jacob Salmela
0cf859344a
Merge pull request #176 from xd1936/patch-1
...
Install Figlet Fonts with Toilet
2016-01-16 13:19:15 -06:00
jacobsalmela
6125b2520b
install git for updateDashboard.sh
...
I also download and chmod the script
2016-01-16 13:15:44 -06:00
Leo
665dfdfe8e
Install Figlet Fonts with Toilet
...
Some OS' don't have Figlet Fonts, which causes `chronometer.sh` to have `error: font small not found` instead of the pretty "Pi-hole" display
2016-01-15 18:50:32 -05:00
Adam Warner
6b1f14647c
add reference to blacklist.sh
2016-01-15 15:52:27 +00:00
Jacob Salmela
6f9d2d0567
fixes #145
...
A much more elegant way to get the screen size.
2016-01-02 17:20:33 -06:00
Clinton
bc3224e0b9
installer - only select first (probably default) interface in list instead of all
2016-01-02 22:10:26 +00:00
Salmela
d37db4304c
A few small display changes
...
IPv6 box was missing the title.
Added some IPv6 echoes.
2016-01-01 10:59:30 -06:00
Salmela
d646612a25
Block ads over IPv6
...
I’m pretty sure this works well. Maybe someone else can try it out.
2015-12-31 20:26:05 -06:00
Clinton Montague
b757e7a769
Fix typo in installer
...
IPv4 was mentioned in an IPv6 setting - changed to correctly reference IPv6.
2015-12-28 12:29:54 +00:00
Jacob Salmela
184d1bd046
fixes #126
...
These commands were left out, resulting in the Web interface not showing ads blocked despite the Pi-hole working. It is just a permissions error.
2015-12-16 11:23:44 -06:00
Dan Schaper
4027139d9c
More merge conflict resolution
2015-12-06 20:24:58 -08:00
Dan Schaper
d215fa9ade
Resolve merge confict
2015-12-06 20:22:34 -08:00
Dan Schaper
dcccb2ee2b
Merge branch 'bug/multipleIP' into development
2015-12-06 11:58:02 -08:00
Dan Schaper
412a190b42
Basic-install.sh should only show one ip address in whiptail screen.
2015-12-06 11:05:09 -08:00
Dan Schaper
d2b260fc1e
Log file is automatically generated by dnsmasq, no need to create.
2015-12-06 10:29:59 -08:00
Dan Schaper
22d0e82d92
Add GPL V2+ header
2015-12-06 06:31:49 -08:00
Dan Schaper
7cf5320f50
Only write to dhcpcd.conf if address isn't set
2015-12-06 02:40:30 -08:00
Dan Schaper
9421366e4f
Breakout basic-install.sh to functions
2015-12-03 09:25:13 -08:00
Jacob Salmela
bc0a8e7733
final dialog verbiage
...
Updating dialog to reflect changes in #90
2015-11-25 18:08:17 -06:00
Dan Schaper
b011fe28d9
No longer need a reboot
2015-11-25 14:34:06 -08:00
Dan Schaper
6e13134328
Revert FHS change until merged
2015-11-25 13:55:32 -08:00
Dan Schaper
29ae66c6db
Check IP info for outgoing interface
2015-11-25 13:43:59 -08:00
Jacob Salmela
d0d165ad16
chmod the log flusher
2015-11-15 13:14:56 +00:00
Jacob Salmela
0cb20fc080
typo
2015-11-15 13:14:46 +00:00
Jacob Salmela
dee3df4e11
download master gravity
2015-11-15 13:14:33 +00:00
