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
Adam Warner
b6f8bd408f
Merge pull request #702 from pi-hole/PromoFaux-patch-1
...
Change reset_on_push to false
2016-09-19 21:12:33 +01:00
Adam Warner
a3edd0b976
Change reset_on_push to false
...
So we don't have to reapprove every time the branch is updated.
2016-09-19 21:06:28 +01:00
Adam Warner
8e8efa5caf
Merge pull request #695 from pi-hole/gravTweak
...
Enable support for /etc/pihole/setupVars.conf in gravity
2016-09-19 20:57:51 +01:00
Adam Warner
a41b8f62a2
Merge branch 'development' into gravTweak
2016-09-19 20:55:58 +01:00
Dan Schaper
452ee8c2df
Merge pull request #692 from pi-hole/PromoFaux-patch-1
...
Update piholeDebug.sh
2016-09-19 12:55:26 -07:00
Dan Schaper
5ca6599ca9
Merge branch 'development' into gravTweak
2016-09-19 12:54:58 -07:00
Adam Warner
dcedf6bfd0
Merge branch 'development' into PromoFaux-patch-1
2016-09-19 20:54:04 +01:00
Adam Warner
1f4b43645b
Merge pull request #679 from pi-hole/updateTweaks
...
Make `pihole -up` a bit more intelligent
2016-09-19 20:46:22 +01:00
Promofaux
3d5140458b
Change cron job
2016-09-19 20:43:04 +01:00
Promofaux
f16574085f
remove code made redundant by the existence of /etc/pihole/setupVars.conf
2016-09-16 23:09:14 +01:00
Promofaux
3ed62d45f5
Source IP addresses from /etc/pihole/setupVars.conf
2016-09-16 23:05:08 +01:00
Adam Warner
b1a7b0a186
Update piholeDebug.sh
...
I can spell, honest.
2016-09-15 15:16:06 +01:00
Promofaux
ec0c68621c
add blank line after Current version display
2016-09-12 19:40:34 +01:00
Promofaux
a0977af081
remove references to UpdateDashboard.sh
2016-09-12 19:10:12 +01:00
Promofaux
a3ef9efd2f
remove updateDashboard script
2016-09-12 19:09:19 +01:00
Promofaux
d58f7c6ec9
Remove references to dashboard update Script
2016-09-12 19:08:33 +01:00
Promofaux
d124c2c12e
Expand to check web admin versions
2016-09-12 18:57:19 +01:00
Promofaux
0229f70761
Make updatePiholeFunc a bit smarter. Only run update if version is not the latest.
2016-09-12 18:29:04 +01:00
Promofaux
dde9281139
Only pull master branch, the rest aren't needed!
2016-09-12 18:12:31 +01:00
Adam Warner
6eedfb572e
Merge pull request #676 from pi-hole/development
...
2.9.1
2016-09-12 14:56:25 +01:00
Adam Warner
edf81a232d
Merge pull request #671 from pi-hole/PromoFaux-patch-1
...
Add cron to apt-get dependencies
2016-09-09 20:23:34 +01:00
Adam Warner
c2cb92a0b0
Add cron to apt-get dependencies
2016-09-08 23:42:05 +01:00
bcambl
640af300cb
additional hostname checks in gravity.sh
...
- Test if /etc/hostname exists before attempting to cat the file.
- Add alternative hostname discovery via hostname command
- Add an error message to stdout if unable to determine host fqdn
2016-09-07 21:16:52 -06: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
Dan Schaper
150e01be8b
Merge pull request #667 from pi-hole/piholeBashCompletionUpdate
...
Add the newer pihole command tags to the bash auto complete!
2016-09-06 15:02:13 -07:00
Promofaux
95ee3216c4
Add the newer pihole command tags to the bash auto complete!
2016-09-06 21:57:17 +01:00
Adam Warner
3b5e409b38
Merge pull request #666 from pi-hole/PromoFaux-patch-1
...
Change log flush time to 00:00
2016-09-06 19:30:36 +01:00
Adam Warner
eb201b614a
Change log flush time to 00:00
2016-09-06 19:29:30 +01:00
Adam Warner
162a6b8b5c
Merge pull request #665 from pi-hole/FleshOutPiholeQ
...
Make the output of pihole -q a bit clearer. Bye Bye nifty one-liner!
2016-09-06 19:25:03 +01:00
Promofaux
4ec01769cb
Appease Jacob.
2016-09-06 19:21:56 +01:00
Promofaux
19b656132d
Make the output of pihole -q a bit clearer. Bye Bye nifty one-liner!
2016-09-06 19:16:04 +01:00
Adam Warner
6305c7e2ab
Merge pull request #663 from pi-hole/Bugfix660
...
Switch fedora and debian install check order
2016-09-05 18:32:55 +01:00
Promofaux
04c60e8a1c
Switch fedora and debian install check order
2016-09-05 15:52:09 +01:00
Adam Warner
b6ceb06a32
Merge pull request #655 from pi-hole/PromoFaux-patch-1
...
Replace `truncate` command with `echo " " >`
2016-09-02 19:34:50 +01:00
Adam Warner
8cb2f85a08
Replace truncate command with echo " " >
2016-09-02 16:39:34 +01:00
Adam Warner
7ccfb6ea88
Merge pull request #651 from pi-hole/PromoFaux-patch-1
...
Remove defunct list from adlists.default
2016-09-02 14:12:32 +01:00
Adam Warner
531398b532
Remove defunct list from adlists.default
...
See issue #650
2016-09-02 11:27:13 +01:00
Adam Warner
ec6ecf0d60
Merge pull request #639 from pi-hole/development
...
2.9
2016-08-30 21:46:04 +01:00
Dan Schaper
fdb0e31a78
Merge pull request #625 from pi-hole/UpdateMethod
...
Forget all existing attempts at an update method... this is the one.
2016-08-30 11:47:36 -07:00
Promofaux
01a9534729
Merge branch 'development' into UpdateMethod
...
# Conflicts:
# automated install/basic-install.sh
2016-08-30 19:32:40 +01:00
Adam Warner
921278c5ea
Merge pull request #636 from pi-hole/QueryCommand
...
Query command
2016-08-30 19:17:50 +01:00
Promofaux
d938f73207
Fix line endings
2016-08-26 23:10:22 +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
681144b2a3
Change the switched for updateDashboard and updatePihole(was updateMain)
2016-08-26 22:52:44 +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
Adam Warner
77135ca3c7
Actually pass through the argument to the function
2016-08-26 10:09:39 +01:00
