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
trinapicot
0a423ffd40
Fix check for lighttpd install before configuration directory removal
2016-12-07 20:31:34 -07: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
Mcat12
bd61f38169
Merge pull request #926 from zbholman/patch-2
...
Added removal of pihole user to the uninstall.sh
2016-11-16 17:31:56 -05:00
zbholman
cac9c63325
Added removal of pihole user to the uninstall.sh
...
Not sure if I should have created a variable for the username or if the echo is necessary. And this is my first time doing a pull request, hopefully it works out lol.
2016-11-16 17:06:30 -05:00
Hayden Knowles
86d3ca48ae
moved newline to correct place
2016-11-15 22:40:57 +13: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
