WaLLy3K
ea1aad9774
Add review suggestions to template
2017-09-01 10:17:08 +10:00
WaLLy3K
817d644795
Merge branch 'development' into fix/issue-template
2017-09-01 10:16:03 +10:00
WaLLy3K
56b8c4bfdb
Merge branch 'development' into tweak/gravity
2017-09-01 10:01:41 +10:00
Adam Warner
c65c26b463
Merge branch 'development' into new/UninstallCleanup
2017-08-31 15:36:47 +01:00
WaLLy3K
bf059e5ee8
Merge pull request #1676 from pi-hole/remove-netstat
...
Replace superseded netstat command
2017-08-31 21:16:11 +10:00
WaLLy3K
15a5f425bf
Replace nc with psuedo-device
...
* Also fix minor conditional style issue
2017-08-31 20:32:02 +10:00
WaLLy3K
3125d24ded
Replace superseded netstat command
...
* Make colfile readonly, and use path of PI_HOLE_SCRIPT_DIR
* Rename piholeStatus function to statusFunc for function name consistency
* Replace superseded netstat command with nc
* Perform addn-hosts check using a single grep subshell
2017-08-31 17:39:41 +10:00
Adam Warner
6b6d105c2f
Merge branch 'development' into sqlite-dependency
2017-08-28 10:17:33 +01:00
WaLLy3K
bab44c52ae
Merge branch 'development' into blockpage2
2017-08-28 13:30:57 +10:00
WaLLy3K
2f19605750
Merge branch 'development' into fix/issue-template
2017-08-28 13:29:18 +10:00
WaLLy3K
7311db3a63
Change wording to support feature PR's
...
* Also clarify template suggestion text
* Remove stray '
2017-08-28 13:28:23 +10:00
WaLLy3K
0a00936e99
Update resolver test & added more comments
...
* Add/update code comments
* Change resolver check to test for pi.hole
* Make resolver check timeout after 10 seconds
* Use > instead of &> where appropriate
* Make resolver check sleep for 30 seconds (effectively waiting up to 50s for dnsmasq to be resolvable)
* Provide confirmation upon success of resolver check availability
* Quotes and Braced remaining variables as appropriate
* Removed duplicate local
2017-08-28 11:36:02 +10:00
WaLLy3K
7cac207c00
Merge branch 'development' into tweak/gravity
2017-08-28 03:11:38 +10:00
WaLLy3K
feb412b02a
Merge pull request #1671 from pi-hole/release/3.2
...
Update development from release/3.2
2017-08-28 03:04:46 +10:00
Adam Warner
199de9ebc0
Merge branch 'development' into new/https
2017-08-27 11:38:30 +01:00
Adam Warner
504ae0193f
Merge branch 'development' into blockpage2
2017-08-27 11:23:21 +01:00
WaLLy3K
1ae403b742
Merge pull request #1667 from pi-hole/install-space
...
Remove erroneous space
2017-08-24 14:00:20 +10:00
Adam Warner
939c99cdbf
accidentally an entire group of letters.
2017-08-23 11:48:11 +01:00
WaLLy3K
2f36acae49
Remove errornous space
2017-08-23 11:51:16 +10:00
Adam Warner
e938132c53
accidentally a space
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-17 21:02:10 +01:00
Adam Warner
1b34286264
verbiage
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-17 20:33:53 +01:00
Adam Warner
54f4f6d2d7
Add "${INSTALLER_DEPS[@]}" to package array
...
add `-f` to rm commands so that `set -e` is not kicked
Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-17 20:23:07 +01:00
Adam Warner
07e5e8e67a
need to include PH_TEST="true" so that the install script isn't run when sourcing it.. doh
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-17 20:03:19 +01:00
Adam Warner
3c25094495
No need to declare PKG_MANAGER, as it's already declared in basic-install
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-17 19:56:36 +01:00
Adam Warner
95e3a5944d
Initial overhaul of uninstall script sourcing distro_check() from basic-install.sh Totally untested as yet...
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-08-17 19:53:43 +01:00
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
Adam Warner
d45695a088
Merge pull request #1643 from pi-hole/tweak/PiholeCheckout
...
Small tweaks to output of `pihole checkout`
2017-08-04 00:19:46 +01:00
Adam Warner
2ceeac41fe
Merge pull request #1648 from pi-hole/branding/DOReadme.md
...
Branding/DO readme.md
2017-08-02 11:29:31 +01:00
WaLLy3K
cc4ada99d8
Use SIGHUP instead of force-reload
2017-08-01 20:48:43 +10:00
Adam Warner
16d67f55b3
Merge branch 'development' into fix/issue-template
2017-07-29 17:18:16 +01:00
Adam Warner
18b41adbf6
Merge branch 'development' into tweak/gravity
2017-07-29 17:14:39 +01:00
Mcat12
898fdf7a60
Merge pull request #1602 from molikuner/development
...
Fix URL extension parsing
2017-07-29 11:49:24 -04:00
Adam Warner
78143c2ff4
Merge branch 'development' into blockpage2
2017-07-29 16:44:28 +01:00
Adam Warner
7b1524ad01
Merge branch 'development' into new/https
2017-07-29 16:44:20 +01:00
Adam Warner
5799485b0f
Merge branch 'development' into development
2017-07-29 16:29:57 +01:00
Mcat12
9cddb6ca39
Merge branch 'release/3.2' into branding/DOReadme.md
2017-07-29 11:04:10 -04:00
Dan Schaper
defc17ba46
Remove DO from README.md
...
Preparation for futher infrastructure changes. Will remove the DO slug from README and adjust some wording.
2017-07-28 20:24:27 -07:00
Adam Warner
106d5afba1
Merge pull request #1646 from pi-hole/bugfix/DoubleH
...
Stop an extra `h` being added to leasetime of DHCP server.
2017-07-28 23:09:00 +01:00
Adam Warner
0a9965292c
Additional check to fix any existing cases of "24h" in setupVars.conf automatically.
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-28 19:40:13 +01:00
Adam Warner
4fb66e632f
The other h
2017-07-28 16:30:03 +01:00
Adam Warner
5787895794
stop an extra h being added to leasetime of DHCP server. We already storethe h in setupVars.conf
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-28 16:10:13 +01:00
Adam Warner
d90489b31d
Include branch we're switching from
...
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-27 22:21:25 +01:00
Adam Warner
f38912a0c9
- Correctly overwrite ${INFO} boxes with ${CROSS} etc
...
- Notify user that branch has been changed
Signed-off-by: Adam Warner <adamw@rner.email>
2017-07-27 21:33:41 +01:00
WaLLy3K
f24ab8508e
WIP cleanup
...
* Changed supernova/eventHorizon variables to match their purpose
* Add gravity_DNSLookup() function
* Ensure all comments are clear and relevant
* Use && instead of || in gravity_Collapse()
* Renamed existing functions, and placed them in order of script execution
* Use \t instead of literal tab in gravity_ParseFileIntoDomains()
* Replace instances of "truncate" with : > (e.g: gravity_Schwarzschild())
* Ensure correct variables are local'd
* Use phrase "Cleaning up stray matter" when gravity_Cleanup() is called
* Add black/white/wildcard switches for list.sh
* Ensure necessary functions are called when modifying black/white/wildcards
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
2017-07-27 12:34:35 +10:00
WaLLy3K
2d8fff099f
Pass correct options to gravity.sh
...
* Optimise $validDomain function by using bashism and `grep`
* Add black/white/wildcard variables to pass to Reload()
* Revert reload variable behaviour
* Ensure Reload() function passes correct options to gravity.sh
Signed-off-by: WaLLy3K <wally3k@pi-hole.net>
2017-07-27 12:34:26 +10:00
Adam Warner
dce36d8ded
Merge branch 'master' into release/3.2
2017-07-26 19:49:57 +01:00
Mcat12
18d0278279
Merge pull request #1638 from pi-hole/hotfix/CIDR
...
CIDR hotfix > development
2017-07-26 14:41:03 -04:00
