Commit Graph

2822 Commits

Author SHA1 Message Date
Jacob Salmela 1a87d3a659
add process check function 2017-05-23 22:57:22 -05:00
Jacob Salmela 085f2c6ca0
add port check function 2017-05-23 22:32:30 -05: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
Jacob Salmela b74300f67c
add ping internet function and fix some spacing issues 2017-05-22 12:57:55 -05:00
Jacob Salmela 107babe8f4
add ping gateway function 2017-05-22 12:35:57 -05:00
Jacob Salmela 8fd9a22d18
add detect IP function 2017-05-22 12:05:42 -05:00
Jacob Salmela 8c5c1316dd
add php version and processor check functions 2017-05-22 08:48:56 -05:00
Jacob Salmela daff5d8b5a
add critical dependencies version check functions 2017-05-22 03:05:51 -05:00
Jacob Salmela 6c4a7b626e
add pihole version check functions 2017-05-22 02:39:00 -05:00
Jacob Salmela 1aa5943e67
add if directory exists function 2017-05-22 01:06:15 -05:00
Jacob Salmela 69fe889f92
comments for all lines and small formatting changes 2017-05-21 23:25:53 -05: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
Jacob Salmela 5d7ef9281f
get just the OS pretty name for Dan 2017-05-20 02:01:56 -05:00
Jacob Salmela 6fa00e7cc8
first functions with pretty colors. check OS, setupVars, and contents of .d dirs 2017-05-20 01:34:13 -05:00
WaLLy3K 2f2825f15e Tricorder: Insecure Opt-out 2017-05-20 10:45:26 +10:00
Mcat12 e377fe5503 Merge pull request #1486 from pi-hole/readme/win-dns-swapper
Add link to Windows DNS Swapper
2017-05-19 11:26:51 -04:00
Mcat12 69b41dd72e Add link to Windows DNS Swapper
See #1400
2017-05-19 11:16:34 -04:00
WaLLy3K 69fa9874dd Use HTTP_HOST instead of SERVER_NAME
* Fixes https://github.com/pi-hole/pi-hole/issues/1479
2017-05-18 18:54:26 +10:00
WaLLy3K a620a5c430 Formatting consistency 2017-05-18 12:53:32 +10:00
WaLLy3K 1f3db8b602 Confirm Tricorder is online
* Scan port 9998 to confirm the availability of "tricorder.pi-hole.net"
* Exit codes for upload process
2017-05-18 12:43:17 +10:00
WaLLy3K f6732a484e Merge pull request #1317 from r0ckarong/development
Fixed handling of `pihole -wild` help text
2017-05-18 11:16:25 +10:00
DL6ER 4015122d33 Merge pull request #1476 from pi-hole/fix/midnightflushing
Fix midnight logrotation
2017-05-18 01:23:32 +02:00
DL6ER 42eb811910
Add "quiet" mode + update comments in the cron file 2017-05-17 12:54:43 +02:00
DL6ER c9042ffedd
Print echos only when manual flushing is requested 2017-05-17 12:51:04 +02:00
DL6ER 4e2c6a7b8e
Fix logrotation: manual flushing should be done twice, but automated rotation at midnight should only be done *once*! 2017-05-17 12:44:35 +02:00
WaLLy3K 7453bf2ee6 Fix wildcard help text
* -wild is not a valid option since we're already using -wild
2017-05-16 10:23:53 +10:00
WaLLy3K 7d17c652f3 Merge branch 'development' into development 2017-05-16 10:18:32 +10:00
WaLLy3K 075f00cecd Merge branch 'development' into tc-insecure-optout 2017-05-16 09:49:42 +10:00
WaLLy3K b9f2ba0717 Wording changes and bug fix 2017-05-16 09:48:46 +10:00
Adam Warner ed04be5faa Merge pull request #1468 from pi-hole/tweak/help-output
New Help Output
2017-05-14 16:46:58 +01:00
Adam Warner 90119c75d5
more merge conflicts! 2017-05-14 16:43:20 +01:00
Dan Schaper d30056026b Merge pull request #1466 from pi-hole/doclist_remove_sed
Document `sed` substitution for user readability
2017-05-14 08:28:10 -07:00
Adam Warner bc8a5916d8
fix merge conflicts 2017-05-14 16:17:04 +01:00
Dan Schaper f202602f99 Merge pull request #1470 from pi-hole/tweak/taco
Update PullApprove rules
2017-05-14 07:41:07 -07:00
DL6ER 69f361a3a1
🌮 is the new :shipit: squirrel 2017-05-14 16:28:35 +02:00
WaLLy3K da9ff0cc66 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
2017-05-14 19:27:14 +10:00
WaLLy3K 703ff09a91 Merge pull request #1464 from pi-hole/new/tricorder_option
Tricorder debug logs are now uploaded using SSL when `openssl` is available
2017-05-14 15:37:25 +10:00
WaLLy3K 30035ce1c2 Merge branch 'development' into tweak/help-output 2017-05-14 13:03:33 +10:00
WaLLy3K 39b74ebfd4 Show help for "pihole checkout --help" 2017-05-14 12:22:19 +10:00
WaLLy3K 3bd677c102 Show help for "pihole -v -h"
* Indent output text
* Minor help text change
2017-05-14 11:57:46 +10:00
WaLLy3K 4eb7d2868c Fix "pihole disable --help" and "pihole -l --help" 2017-05-14 11:53:40 +10:00
WaLLy3K 0e4473685b Show help for "pihole -a -i --help" 2017-05-14 11:47:56 +10:00
WaLLy3K b721ed49ab 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
2017-05-14 11:11:44 +10:00
Dan Schaper 25601b9fcc Document `sed` substitution for user readability
Comment the oneliner with explanations of what each step does.
2017-05-13 17:49:58 -07:00
Dan Schaper db10c8ab46 Merge pull request #1465 from pi-hole/busybox_sed_support
Update list.sh for busybox compatibility
2017-05-13 17:40:27 -07:00
Adam Hill 55f78e3b64 Update list.sh
I believe this has feature parity with `sed /foo/ Id` but also supports busybox, and my alpine docker ;)
2017-05-13 18:44:41 -05:00