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
1995 commits 10 branches 109 tags 28 MiB
Commit graph

565 commits

Author SHA1 Message Date
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