Adam Warner
|
ff3c36a7a2
|
Merge pull request #1018 from pi-hole/diginc-patch-1
pihole.cron reduce duplication
|
2016-12-23 09:41:48 +00:00 |
|
Adam Hill
|
5e53f484be
|
Update pihole.cron
Stop repeating the path.
|
2016-12-22 22:00:17 -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
|
a74e48a138
|
Merge pull request #1014 from pi-hole/fix/Gravity_in_shell
Execute gravity in same shell as installer, don't subshell it.
|
2016-12-22 12:07:12 -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 |
|
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 |
|
DL6ER
|
4626b8ced5
|
Removed fixed username from sudoers file
|
2016-12-22 13:18:38 +01:00 |
|
bcambl
|
cbf84c1840
|
replace subshell with command chain
|
2016-12-22 04:32:42 -06:00 |
|
Dan Schaper
|
420fb69166
|
Merge pull request #1005 from pi-hole/fix/create_install_directories
Create /opt/pihole before trying to install into it.
|
2016-12-22 01:47:07 -08: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 |
|
Adam Warner
|
bef0a2fef0
|
Merge pull request #987 from pi-hole/development
Pi-Hole Core release v2.10
|
2016-12-21 18:21:59 +00: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
|
f082b5ba54
|
Merge pull request #1001 from pi-hole/cleanup/remove_legacy_detect
Remove v1 legacy detection code.
|
2016-12-21 13:49:34 +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 |
|
DL6ER
|
d42caa8672
|
Merge pull request #1000 from pi-hole/fix/tab_space
Tabs to spaces and formatting.
|
2016-12-21 11:41:30 +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 |
|
DL6ER
|
a9cb93d801
|
Merge pull request #998 from pi-hole/LordKelvin
Lord Kelvin
|
2016-12-20 17:54:52 +01:00 |
|
DL6ER
|
ee8f29d178
|
Fixed typo, extended help text
|
2016-12-20 16:28:28 +01:00 |
|
DL6ER
|
da363070c7
|
Added Kelvin
|
2016-12-20 12:21:08 +01:00 |
|
DL6ER
|
50cf891e01
|
Merge pull request #996 from pi-hole/allowemptysecondDNSserver
Allow disabling second DNS server
|
2016-12-19 19:30:27 +01:00 |
|
DL6ER
|
715838cf89
|
Allow disabling second DNS server
|
2016-12-19 13:42:42 +01:00 |
|
DL6ER
|
372c699cc6
|
Merge pull request #993 from pi-hole/fix/one_step_refactor
Rename variables in one step
|
2016-12-17 00:15:20 +01: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 |
|
Mcat12
|
a0019d86c5
|
Merge pull request #983 from pi-hole/cronpath
Fix missing path information for cron
|
2016-12-15 07:01:20 -05:00 |
|
Adam Warner
|
4348653431
|
Merge pull request #985 from pi-hole/pi.hole
A man has no name. Even though his name is Jaqen H'ghar
|
2016-12-15 08:49:22 +00:00 |
|
Dan Schaper
|
09cfa9bb20
|
Merge pull request #986 from pi-hole/autoCompletes
add missing pihole autocomplete commands
|
2016-12-14 12:58:50 -08:00 |
|
Promofaux
|
e7713a9028
|
add missing pihole autocomplete commands
|
2016-12-14 19:53:40 +00:00 |
|
Promofaux
|
906a1753be
|
specifically comment out gravity.list addn-host
|
2016-12-14 19:42:20 +00:00 |
|
Promofaux
|
a3d519b671
|
no need to remove list, because of echo >
|
2016-12-14 19:33:15 +00:00 |
|
Promofaux
|
8591f9d576
|
check for list before removing it
|
2016-12-14 19:31:57 +00:00 |
|