Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-26 14:50:17 +00:00
Code Issues Projects Releases Packages Wiki Activity
2818 commits 10 branches 109 tags 28 MiB
Commit graph

725 commits

Author SHA1 Message Date
DL6ER
02d4b6794c Merge pull request #1066 from dgnthr/patch-1 
Fixed a typo in the installation script
 2016-12-31 17:30:56 +01:00
Dominik G
836b717346 Fixed a typo in the installation script 2016-12-31 17:25:48 +01:00
DL6ER
1a3bdbaabf Merge pull request #1057 from pi-hole/new/whitelistonblockingpage 
Allow whitelisting from blocking page
 2016-12-30 21:07:34 +01:00
Mcat12
5e35fdbc52 Save blocking page CSS to pihole directory instead of admin 2016-12-30 14:42:15 -05:00
Dan Schaper
a4a9879643
Restructure firewall detection and application. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-29 15:57:29 -08:00
Dan Schaper
ea9ec384c6
Disambiguate nested ifs. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-29 01:35:52 -08:00
Dan Schaper
bbb958b7ed
Detect RPF breaking kernel updates. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-29 01:34:49 -08:00
DL6ER
03d4fcd17d Don't actually have to reapply DHCP settings since we are going to save it in a different file we don't replace by a template 2016-12-28 16:32:24 +00:00
DL6ER
02d658be65 Look for DHCP / DNS server settings which would have to be reapplied after updating (since we overwrite 01-pihole.conf) 2016-12-28 16:31:55 +00:00
Dan Schaper
b02730a5ad
Merge branches 'development' and 'feature/track_pre-installed_packages' of github.com:pi-hole/pi-hole into feature/track_pre-installed_packages 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

# Conflicts:
#	automated install/basic-install.sh
 2016-12-27 22:50:00 -08:00
Dan Schaper
9a9cb61345
Shift epel-release to installer dependencies for CentOS 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-27 12:59:53 -08:00
Dan Schaper
c3b51b4ceb Merge branch 'development' into feature/track_pre-installed_packages 2016-12-27 12:37:19 -08:00
Dan Schaper
bc6a985f7c
Merge branch 'development' of github.com:pi-hole/pi-hole into tweak/subshells 2016-12-27 11:53:46 -08:00
Dan Schaper
7320fc11d2
Check command -v directly, instead of subshelling out. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-27 11:53:23 -08:00
Dan Schaper
a328326e39
Formatting 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-27 11:41:07 -08:00
Dan Schaper
4eedf8a746
Always update package cache where we can. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-27 10:59:24 -08:00
Dan Schaper
c5f5252145 Merge pull request #961 from pi-hole/customblockpage 
Custom Pi-Hole block page
 2016-12-27 10:25:03 -08:00
Mcat12
7fadd469c9 Merge pull request #1038 from pi-hole/fix/IPV6_detection 
Check IPv6 routing
 2016-12-27 11:42:23 -05:00
Dan Schaper
7eb6124721
Don't call for package installs if there are no packages to install. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-24 16:57:07 -08:00
Dan Schaper
f458780ba7
Rebase onto development 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-24 16:56:31 -08:00
Dan Schaper
8ad52806de
Quiet DNF 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-24 16:54:23 -08:00
Dan Schaper
dc22a50dcc
Fedora dependency installer overhaul 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

Modify Fedora dependency installer

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>

Fedora now installs and arrays only non-installed packages. Fedora also noops the cache update, since it updates at every dnf call anyays.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-24 16:54:20 -08:00
Dan Schaper
852341c601
Check for installation status within the parent function. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-24 16:54:16 -08:00
Dan Schaper
d5ed6c1901
Find which packages already exist and only install new packages. Set up for unintall to know what packages we installed for later removal. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-24 16:54:13 -08:00
Dan Schaper
da41383476
Check IPv6 to see if the route is reachable, if not, don't use. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-24 15:26:05 -08:00
Dan Schaper
6ff79835da
If only one interface available, don't show whiptail, just use that interface. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-24 15:08:39 -08:00
Dan Schaper
1d608b204a
Only allow UP interfaces to be selected. (DOWN interfaces would have not given IP addresses anyways.) 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-24 14:50:50 -08:00
Dan Schaper
c2b8bed3a8
Get the IP address that is the source for the default route out. Fixes interfaces with multiple IP's assigned getting the wrong IPv4 chosen. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-24 14:43:57 -08:00
Adam Warner
d12efccd0b Merge pull request #1028 from pi-hole/bcambl-selinux_notification 
Bcambl selinux notification
 2016-12-23 17:36:33 +00:00
Mcat12
54afffed19 Remove newline 
Issue was already fixed
 2016-12-23 12:30:33 -05:00
Mcat12
fc8fcdbece Add newline 2016-12-23 12:28:18 -05:00
Promofaux
abd1fedc9d . 2016-12-23 17:25:55 +00:00
Promofaux
9725985037 printf to echo. idgaf 2016-12-23 17:24:33 +00:00
Promofaux
754f3359ec too many echos spoil the branch 2016-12-23 17:22:31 +00:00
Promofaux
4c131b8c28 newlines 2016-12-23 17:21:23 +00:00
Promofaux
15c674ba29 verbosity 2016-12-23 17:20:33 +00:00
Promofaux
00aff6a906 maybe 2016-12-23 17:16:03 +00:00
Promofaux
c45c3a72b5 words words words 2016-12-23 17:06:33 +00:00
Promofaux
662d450651 adjust size of whiptail dialog 2016-12-23 16:58:58 +00:00
Promofaux
a8897becd2 Make sure whiptail is installed... 2016-12-23 16:55:56 +00:00
Promofaux
fdb64a5702 untested convert user prompt to whiptail 2016-12-23 16:53:42 +00:00
Mcat12
73a80ff7dc Align installer output for updating repo 2016-12-23 11:51:34 -05:00
Promofaux
a795fd698d Merge branch 'selinux_notification' of https://github.com/bcambl/pi-hole into bcambl-selinux_notification 2016-12-23 16:48:16 +00:00
bcambl
2fb0dc0a4a add warning if SELinux is Enforcing 2016-12-23 10:27:52 -06:00
DL6ER
aa8e1497a3
Fixed error 2016-12-23 17:12:38 +01:00
DL6ER
afabf30ec6
Fix Fedora web UI support 2016-12-23 16:57:51 +01:00
DL6ER
420158494d Merge pull request #1022 from pi-hole/fix/adlists.default 
Internal (/etc/pihole/adlists.default)
 2016-12-23 16:08:06 +01:00
DL6ER
6b7b0e0eb3
Test if /etc/pihole/adlists.default exists 2016-12-23 16:00:48 +01:00
Adam Warner
ad70db7e0e Merge pull request #1020 from bcambl/setDNS_before_ifcfg 
Set dns before ifcfg (Fixes #1019)
 2016-12-23 12:12:05 +00:00
bcambl
1e7e3259b5 choose dns servers prior to interface configuration 
upstream DNS servers must be chosen prior interface configuration.
Fixes #1019
 2016-12-22 22:42:32 -06:00
bcambl
513bc32d87 is_repo: ensure directory exists 2016-12-22 20:00:45 -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
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
DL6ER
bc8cf1b2d8
Fixed wrong indentation 2016-12-22 19:23:06 +01:00
DL6ER
bb28d94884
Merge branch 'development' into customblockpage 
Conflicts:
	automated install/basic-install.sh
 2016-12-22 19:22:09 +01: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
bcambl
cbf84c1840 replace subshell with command chain 2016-12-22 04:32:42 -06: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
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
DL6ER
5374f652dd No need to modify lighttpd config file, since we overwrite it anyways 2016-12-06 08:43:24 +01:00
DL6ER
a866c4e388 Place blockingpage.css (former index.css) unter admin/ so we can load it also from some blocked sub-directories 2016-12-05 10:50:19 +01:00
DL6ER
e7241a989c Include CSS file 2016-12-04 22:20:51 +01:00
DL6ER
b246dba7e7 Rename index.html to index.php 2016-12-04 21:41:26 +01: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
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
Adam Warner
a2903b6e63 Consistency 2016-11-02 04:11:54 -07:00
Dan Schaper
9a1876571b Prototype whiptails so they don't fall to shell. Need to do this to all functions. 2016-11-02 04:11:41 -07:00
Dan Schaper
c07d7165ab Global variables CAP'ed 2016-11-02 04:11:27 -07:00
Dan Schaper
d695c5972f local variables just to be safe and make sure they stay in this function. 2016-11-02 04:11:09 -07:00
Dan Schaper
bbc09ed313 Swap variable names. 2016-11-02 04:10:57 -07:00
Promofaux
617a147706 Wording adjustment 2016-11-02 04:10:29 -07:00
Promofaux
d4dccfdb2d Cherry pick 229439c 2016-11-02 04:08:53 -07:00
Dan Schaper
d9528dfd09 Bash is funny with returns. 2016-11-02 00:51:38 -07:00
Dan Schaper
12f5f8ba00 Begin to bring code up to Pi-hole conventions. Block installScripts and begin factoring out redundant code. 2016-11-02 00:14:25 -07:00
Dan Schaper
db0f3307e0 Only take out scripts in the directory, don't remove the directory as a whole. Need this for the future installs. 2016-11-01 22:48:30 -07:00
Dan Schaper
7a22471787 New naming convention, and reorder functions as bash would prefer them to be. 2016-11-01 22:19:40 -07:00
diginc
b4524839bb Merge branch 'development' of https://github.com/pi-hole/pi-hole into InstallFixes_UnitTests 2016-11-01 23:52:20 -05:00
Eric Warnke
fb5ac6d6d7 We should prefer the php metapackage if it's there, falling back on php5 if it's not 2016-10-31 21:31:13 -04:00
Eric Warnke
4e7ca51beb Added dependancy for ping and lsof used in debug scripts 2016-10-31 21:24:57 -04:00
Eric Warnke
65e0fcbf10 Merge branch 'development' of https://github.com/pi-hole/pi-hole into wheezy_fix2 2016-10-28 13:14:00 -04:00
Dan Schaper
e22aca49c8 Merge pull request #813 from das7pad/development 
Create missing directory for lighttpd
 2016-10-28 10:05:08 -07:00
Adam Warner
21fc6344bf Merge pull request #849 from pi-hole/aManHasNoNameResolution 
[BugFix] A man has no name resolution
 2016-10-27 19:41:07 +01:00
Promofaux
794fa21137 install uninstall.sh... 2016-10-27 12:44:21 +01:00
Eric Warnke
977d1d1998 Merge branch 'development' of https://github.com/pi-hole/pi-hole into wheezy_fix2 2016-10-27 07:37:40 -04:00
Promofaux
cde003bc98 \ all the /s! 2016-10-27 11:13:00 +01:00
Adam Warner
3996e11425 Merge pull request #859 from pi-hole/ImproveWhitelistBlacklist 
Improvements to White and Blacklists
 2016-10-26 19:52:16 +01:00
Eric Warnke
3a4fe3e391 Wheezy install fix by selecting appropriate deps, made the php check the same 2016-10-26 14:47:29 -04:00
Eric Warnke
4ed6e4d016 Tiny screens get sane minimums 2016-10-26 11:15:02 -04:00
Eric Warnke
ac8d24a1ce Even with no detected screen size, it should presume 80x24 2016-10-26 11:14:54 -04:00
Eric Warnke
fc776921d5 stty is more compatible and does not require any additional dependancies for busybox 2016-10-26 11:14:46 -04:00
Adam Warner
55a653aca4 clear out /opt/pihole folder before installing scripts 2016-10-26 10:00:00 +01:00
Adam Warner
bd0db56ba0 actually fix up logic 2016-10-25 15:29:02 +01:00
Adam Warner
95f0b3710d fix up logic 2016-10-25 15:27:13 +01:00
Adam Warner
86349527e7 replace HOSTNAME tokens in 01-pihole.conf 2016-10-25 15:06:37 +01:00
Adam Warner
911053f63f Replace IPv4 and IPv6 tokens in 01-pihole.conf for pi.hole resolution. 2016-10-25 15:00:18 +01:00
Marcus Hildum
519d731ddd Fix missing newline 
My mistake
 2016-10-23 16:45:51 -07:00
Marcus Hildum
21b906e0e0 Consistency 
More of the same
 2016-10-21 23:57:47 -07:00
Marcus Hildum
28eeaf201b Standardize function declaration 
There were no fewer than three styles of function declaration going
on in these files, so I attempted to standardize them to the typical

myfucn() {
}

style.
 2016-10-19 19:47:45 -07:00
Jakob Ackermann
8872594ab9 create upload dir for lighttpd 
directory is missing in the installation process but is used in the
lighttpd.conf
 2016-10-19 14:27:17 +02:00
Adam Warner
ff5d5b97c3 stash any changes in local repo 2016-10-18 13:54:09 +01:00
Dan Schaper
ef3c13fe2b Refire with curl 2016-10-17 19:22:56 -07:00
bcambl
fb9664b636 fix typo 2016-10-16 15:11:47 -06:00
bcambl
ee114b3075 use an excluded extension for ifcfg backup 2016-10-16 13:28:14 -06:00
Promofaux
5792fc0bef change wording depending on choice 2016-10-16 17:23:26 +01:00
Promofaux
42c93917ef bug I forgot to fix before piholeUpdate was merged to development 2016-10-16 17:19:44 +01:00
Adam Warner
df30a4c0d1 Merge pull request #779 from bcambl/fedora_fixes 
Fedora fixes
 2016-10-16 15:46:50 +01:00
Adam Warner
9ce13f0035 Merge pull request #790 from pi-hole/piholeUpdate 
Various refactoring.
 2016-10-15 23:51:07 +01:00
Promofaux
3884b01503 Forgot a 2016-10-15 23:21:13 +01:00
Promofaux
a84c3adeab if uniformity then dan = happy 2016-10-15 23:19:26 +01:00
Promofaux
a65b784907 repeat after me: repetition is a bit repetitive. 2016-10-15 21:26:41 +01:00
Promofaux
05dadad2e1 repair sounds better than refresh 2016-10-15 21:22:46 +01:00
Promofaux
3a9b39b842 adjust text in update_dialogs() whiptail 2016-10-15 21:12:13 +01:00
Promofaux
e612003293 handle arguments better, convert to flags, echo when they're set to true. 2016-10-15 20:52:20 +01:00
Promofaux
a43577fa26 add reconfigure flag to -r command 2016-10-15 20:43:03 +01:00
Promofaux
a6fa60868b spacing 2016-10-15 15:41:48 +01:00
Promofaux
99878ae7d6 reflect name change of some of the variables in setupVars 2016-10-15 15:40:12 +01:00
bcambl
26202014a2 stdout formatting 2016-10-12 20:35:08 -06:00
bcambl
f4f8b96788 remove systemd selinux rules on init systems 
fixes the failing SELinux policy compile on init based systems
 2016-10-12 20:35:08 -06:00
bcambl
e5ede16749 update yum/dnf package count grepfu 
see pull #774
 2016-10-12 20:33:13 -06:00
bcambl
fbe3547129 EPEL is not required on Fedora 
epel-release installs the EPEL package repository (Extra Packages for Enterprise Linux)
Dependencies from this repository should available by default on Fedora
 2016-10-12 20:26:48 -06:00
diginc
a03caea549 setupVar tests passing for debian & centos 2016-10-10 23:14:39 -05:00
Promofaux
aa23fb1d56 choose* 2016-10-10 22:34:12 +01:00
Dan Schaper
570611fc09 CentOS Firewall fix 2016-10-10 11:30:15 -07:00
Dan Schaper
94dd5b1ebe More CentOS fixes. 2016-10-10 11:05:29 -07:00
Dan Schaper
74524e024d Always check PIHOLE_dependencies. 2016-10-10 10:36:19 -07:00
Dan Schaper
e42b6dcc8e create_pihole_user update @diginc. 2016-10-10 09:21:28 -07:00
Dan Schaper
d71b799e75 More cleanups, localize variables, clean formatting. 2016-10-10 08:23:14 -07:00
Dan Schaper
87e7121332 Gravity.sh checks for null value for variables, obliging that expectation. 2016-10-10 07:32:16 -07:00
Dan Schaper
94f6354c94 Spinner blocks set -e trying to get it in functions that won't crash out... 2016-10-10 07:25:43 -07:00
Dan Schaper
b79059ebdb Start to add the spinner back in! 2016-10-10 06:46:30 -07:00
Dan Schaper
4f98c1bebb Boolean operators inside quotes don't work well... 2016-10-10 06:16:00 -07:00
Dan Schaper
2feec01e10 Add start_service and enable_service functions to handle restating services and setting services to start on reboot. 2016-10-10 06:06:34 -07:00
Dan Schaper
72b95e192e Fix logic bug in setup_user, update how setupVars are sourced so they will only be used if the user selects update and not if they select install. 2016-10-10 05:45:37 -07:00
Dan Schaper
47aad254d8 localized some more variables 2016-10-10 03:56:03 -07:00
Dan Schaper
bc14074d2a Tighten up Update Whiptail appearance. 2016-10-10 03:39:32 -07:00
Dan Schaper
5ab5b1a190 Overhaul dnsmasq version 3 way handshake configuration files. 2016-10-10 03:23:52 -07:00
Dan Schaper
b055f190f5 Factor out interfaces detection. 2016-10-10 03:16:22 -07:00
Dan Schaper
84b8953352 Remove quiet flags from package managment variables. Set quiets in functions by redirecting output. 2016-10-10 02:58:38 -07:00
Dan Schaper
93a591d487 Linting from ShellCheck 2016-10-10 02:57:04 -07:00
Dan Schaper
e6c0f38a7c Monolithic changes in one commit again. 2016-10-10 02:24:03 -07:00
Dan Schaper
f107ae4f9b Merge conflict resolution 2016-10-10 09:08:25 +00:00
Dan Schaper
bad7a08804 Refactor and rename create_pihole_user. Now to actually use the user created... 2016-10-10 01:51:19 -07:00
Dan Schaper
25cbf4cb35 Factor out legacy location script removal. 2016-10-10 01:43:10 -07:00
Dan Schaper
7f179f9a58 Remove sourcing bash completion, would fall off as soon as the subshell terminated. 2016-10-10 01:40:56 -07:00
Dan Schaper
5287ea8537 Refactor stopServices into stop_service and accept arguments for service to stop. Quiet output from a few other functions. 2016-10-10 01:25:11 -07:00
Dan Schaper
43e2aaebf0 rename updateDialogs to update_dialogs 2016-10-10 01:04:59 -07:00
Dan Schaper
e60eb66283 UpdateDialogs are now a Whiptail Menu, self-explanatory. 2016-10-10 01:04:03 -07:00
Dan Schaper
ca59b808d8 Git clone/update now occurs right after installer dependency checks. Allows for inclusion of installer source files in the repo. Passes set -e 2016-10-10 00:02:50 -07:00
Dan Schaper
8a15fd44d5 Update is_repo() to use git status for validity checks. 2016-10-09 23:53:18 -07:00
Dan Schaper
dac2b8942e Typo fix to generate commit. 2016-10-09 22:38:00 -07:00
Dan Schaper
54a1c5b63a Revert inadvertent commits 
IDLE keeps committing direct to development.
 2016-10-09 22:35:14 -07:00
Dan Schaper
61b02bf6d3 Add OR TRUE to PKG_COUNT so that a 0 package to update doesn't grep -c to an exit value of 1. 2016-10-09 22:27:37 -07:00
Dan Schaper
9d048b2fdf Move Pi-hole dependency checks to main() and out of duplicated install and update functions. Bring them up a level in the subshells. 2016-10-09 22:24:13 -07:00
Dan Schaper
d9e28a7422 factor out installer_dependencies 2016-10-09 22:05:06 -07:00
Dan Schaper
1fecdf42ca Move git to installer deps, refactor some functions. 2016-10-09 22:00:23 -07:00
Dan Schaper
d4bf85b67c Self contain package_check into package_check_install. Passes set -e test. 2016-10-09 21:44:45 -07:00
Dan Schaper
7131ff27c3 Attempt to set -e 2016-10-09 21:32:25 -07:00
Dan Schaper
a30f78c1c8 Oneliner php version check, passes set -e check. 2016-10-09 21:31:36 -07:00
Dan Schaper
7e0afffca8 Revert inadvertent commits 2016-10-09 19:41:32 -07:00
Dan Schaper
293c60fb9c Exit script on failure to install dependent package. 2016-10-09 13:52:36 -07:00
Dan Schaper
f5be8b2a5e Single dependency package check function, will exit if any errors with message to update cache. 2016-10-09 13:43:01 -07:00
Dan Schaper
6772603c15 Relocate cache check to its own function 2016-10-09 12:34:53 -07:00
Jacob Salmela
a22904f99b Merge pull request #769 from pi-hole/Fix/PackageCacheFresh 
Fix/package cache fresh
 2016-10-09 09:00:52 -05:00
Dan Schaper
b157bc5cd7 Fixes #768 Check the staleness of the package index instead of the package cache. 2016-10-08 13:47:35 -07:00
Dan Schaper
10e1a03c76 runGravity is called after finalExports in the Debian install side. 2016-10-08 12:58:42 -07:00
Dan Schaper
d20df92e9f Script will now run as root, removed sudo from function calls. 2016-10-08 12:56:26 -07:00
Dan Schaper
44170207ac Add main function and fire script from main call. Prevents script from running before it is entirely downloaded. 2016-10-08 12:17:04 -07:00
Dan Schaper
33745be745 Merge pull request #753 from pi-hole/feature/RemoveBarePHP 
Remove bare php package from dependencies
 2016-10-07 21:32:07 -07:00
Adam Warner
6a28070017 Too many -s 2016-10-07 13:09:27 +01:00
Dan Schaper
91b948332e Merge pull request #754 from pi-hole/fix/bashConditional 
fix/bashConditional
 2016-10-07 03:42:22 -07:00
Dan Schaper
d1a7fe2d44 fix/bashConditional 2016-10-07 03:36:34 -07:00
Dan Schaper
c39324d11f Remove bare php package from dependencies 
`php5` package can trigger install of Apache2. Without this package in deps, PHP is still installed and operational.
 2016-10-07 00:24:25 -07:00
Dan Schaper
8c151c62ce echo's don't need sudo 2016-10-05 10:46:10 -07:00
Dan Schaper
50d16d8215 Finish install conversion for installScripts() 2016-10-05 10:45:17 -07:00
Dan Schaper
3bbac9a5f2 install pihole 2016-10-05 10:19:47 -07:00
Dan Schaper
3600fd277e Don't need sudo to echo to term. 2016-10-05 10:16:56 -07:00
Dan Schaper
e8bb4a7e36 Continue migration to install 2016-10-05 10:14:36 -07:00
Dan Schaper
36987cb1cc Continue migration to install 2016-10-05 09:57:48 -07:00
Dan Schaper
5382b4fa37 Change installScripts to use install 
Use the install program instead of copying files and directories in installScripts function.
 2016-10-05 09:42:15 -07:00
Promofaux
c281b47905 Mover {SUDO} mkdir -p /etc/pihole/ back to the beginning. 2016-10-02 12:44:33 +01:00
Promofaux
aca5064743 --force seems to light. lets try --i_do_not_follow_recommendations 2016-10-02 11:16:48 +01:00
Promofaux
6f780316c4 remove whiptail dependency from verifyFreeDiskSpace. 
Add argument detection to skip disk space. This is because curling to bash does not support waiting for user input.
 2016-10-02 11:09:14 +01:00
Promofaux
4e262d81f0 wrap these vars in {} to matcht he rest of the script 2016-10-02 10:39:09 +01:00
Promofaux
6c2ff950ee remote duplicate ${SUDO} mkdir /etc/pihole 2016-10-02 10:33:59 +01:00
Promofaux
7684069d0b verifyFreeDiskSpace BEFORE installing any dependencies 2016-10-02 10:33:04 +01:00
Promofaux
73c85ae68a remove duplicate calls to installConfigs 2016-10-02 10:30:55 +01:00
Promofaux
6a8bef83b3 Fix the php version check command (Thanks @diginc!) 2016-09-30 22:40:43 +01:00
Adam Warner
3fc3c5cae4 Add iproute2 to fix #653 2016-09-27 11:15:46 +01:00
Adam Warner
daa5366b57 Check if php5 is available in apt-cache, if so install it, else just install php 2016-09-27 11:11:47 +01:00
Dan Schaper
ac8d295bb9 Merge pull request #668 from bcambl/dns-hostname-fixes 
Dns hostname fixes
 2016-09-20 10:16:15 -07:00
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
Dan Schaper
5ca6599ca9 Merge branch 'development' into gravTweak 2016-09-19 12:54:58 -07:00
Promofaux
f16574085f remove code made redundant by the existence of /etc/pihole/setupVars.conf 2016-09-16 23:09:14 +01:00
Promofaux
a0977af081 remove references to UpdateDashboard.sh 2016-09-12 19:10:12 +01:00
Adam Warner
c2cb92a0b0 Add cron to apt-get dependencies 2016-09-08 23:42:05 +01: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
Promofaux
04c60e8a1c Switch fedora and debian install check order 2016-09-05 15:52:09 +01:00
Promofaux
01a9534729 Merge branch 'development' into UpdateMethod 
# Conflicts:
#	automated install/basic-install.sh
 2016-08-30 19:32:40 +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
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
Daniel (Fourdee)
49ded54306 Minor - Update descriptions 
Apply to whiptail descriptions also.
 2016-08-25 12:17:36 +01:00
Daniel (Fourdee)
6c0a8a4337 Minor - Corrected var names 
Kilobyte values are used, not Bytes.
 2016-08-25 12:11:54 +01:00
Promofaux
d217626318 If an existing install is detected, offer the user a choice of Updating or Installing with a radio list whiptail. 2016-08-24 22:52:11 +01:00