Dan Schaper
bc6a985f7c
Merge branch 'development' of github.com:pi-hole/pi-hole into tweak/subshells
8 years ago
Dan Schaper
7320fc11d2
Check command -v directly, instead of subshelling out.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
a328326e39
Formatting
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
4eedf8a746
Always update package cache where we can.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
c5f5252145
Merge pull request #961 from pi-hole/customblockpage
...
Custom Pi-Hole block page
8 years ago
Mcat12
7fadd469c9
Merge pull request #1038 from pi-hole/fix/IPV6_detection
...
Check IPv6 routing
8 years ago
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>
8 years ago
Dan Schaper
f458780ba7
Rebase onto development
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
8ad52806de
Quiet DNF
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
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>
8 years ago
Dan Schaper
852341c601
Check for installation status within the parent function.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
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>
8 years ago
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>
8 years ago
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>
8 years ago
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>
8 years ago
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>
8 years ago
Adam Warner
d12efccd0b
Merge pull request #1028 from pi-hole/bcambl-selinux_notification
...
Bcambl selinux notification
8 years ago
Mcat12
54afffed19
Remove newline
...
Issue was already fixed
8 years ago
Mcat12
fc8fcdbece
Add newline
8 years ago
Promofaux
abd1fedc9d
.
8 years ago
Promofaux
9725985037
printf to echo. idgaf
8 years ago
Promofaux
754f3359ec
too many echos spoil the branch
8 years ago
Promofaux
4c131b8c28
newlines
8 years ago
Promofaux
15c674ba29
verbosity
8 years ago
Promofaux
00aff6a906
maybe
8 years ago
Promofaux
c45c3a72b5
words words words
8 years ago
Promofaux
662d450651
adjust size of whiptail dialog
8 years ago
Promofaux
a8897becd2
Make sure whiptail is installed...
8 years ago
Promofaux
fdb64a5702
untested convert user prompt to whiptail
8 years ago
Mcat12
73a80ff7dc
Align installer output for updating repo
8 years ago
Promofaux
a795fd698d
Merge branch 'selinux_notification' of https://github.com/bcambl/pi-hole into bcambl-selinux_notification
8 years ago
bcambl
2fb0dc0a4a
add warning if SELinux is Enforcing
8 years ago
DL6ER
aa8e1497a3
Fixed error
8 years ago
DL6ER
afabf30ec6
Fix Fedora web UI support
8 years ago
DL6ER
420158494d
Merge pull request #1022 from pi-hole/fix/adlists.default
...
Internal (/etc/pihole/adlists.default)
8 years ago
DL6ER
6b7b0e0eb3
Test if /etc/pihole/adlists.default exists
8 years ago
Adam Warner
ad70db7e0e
Merge pull request #1020 from bcambl/setDNS_before_ifcfg
...
Set dns before ifcfg (Fixes #1019 )
8 years ago
bcambl
1e7e3259b5
choose dns servers prior to interface configuration
...
upstream DNS servers must be chosen prior interface configuration.
Fixes #1019
8 years ago
bcambl
513bc32d87
is_repo: ensure directory exists
8 years ago
Dan Schaper
9355a8ad0e
Merge pull request #1011 from pi-hole/fix/sudoers
...
Fix: Dynamic instead of static sudoers file
8 years ago
Dan Schaper
ea5ee7b0f9
Execute gravity in same shell as installer, don't subshell it.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
DL6ER
bc8cf1b2d8
Fixed wrong indentation
8 years ago
DL6ER
bb28d94884
Merge branch 'development' into customblockpage
...
Conflicts:
automated install/basic-install.sh
8 years ago
Blayne Campbell
8f402f5c77
Merge pull request #1009 from bcambl/fix_1004
...
replace 'git -C' with long version
8 years ago
DL6ER
60054da582
Add lighttpd user (OS dependent) to sudoers file
8 years ago
bcambl
cbf84c1840
replace subshell with command chain
8 years ago
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
8 years ago
Dan Schaper
4244f716e0
Create /opt/pihole before trying to install into it.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
DL6ER
c48e6c91f5
Merge pull request #999 from pi-hole/fix/install_deps_exit
...
Fix/install deps exit
8 years ago
DL6ER
8841bdd252
Reset the if's
8 years ago
DL6ER
58261098fb
We should not call a function that Dan deleted
8 years ago
DL6ER
9432d3035a
Merge branch 'development' into cleanup/remove_legacy_detect
...
Conflicts:
automated install/basic-install.sh
8 years ago
DL6ER
9907fc2770
Merge branch 'development' into fix/install_deps_exit
...
Conflicts:
automated install/basic-install.sh
8 years ago
Dan Schaper
8117ec8e20
Remove v1 legacy detection code.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Dan Schaper
ff2783f9fc
Tabs to spaces and formatting.
...
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
8 years ago
Dan Schaper
156a51c945
Remove extra display only variable.
...
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
8 years ago
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>
8 years ago
Dan Schaper
7f3b0030ea
LF
...
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
8 years ago
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>
8 years ago
Dan Schaper
5c43df66a8
Remove spinner function, masked return values.
...
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
8 years ago
Dan Schaper
d0e3c546f8
CRLF to CR (Win to Unix line endings)
...
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
8 years ago
Dan Schaper
8cb01cdd29
One step to rename variables.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
8 years ago
Adam Warner
10982a0f45
Merge pull request #990 from pi-hole/dontkillsetupVars.conf
...
Don't kill setupVars.conf on update/fresh install
8 years ago
DL6ER
d4c378ed5d
Remove PIHOLE_INTERFACE if already set (not PIHOLE_DOMAIN)
8 years ago
DL6ER
7872f68a45
Only try to remove parts inthe file if the file already exists
8 years ago
DL6ER
ec8c848106
Don't kill already existing setupVars.conf on update (and fresh install)
8 years ago
Mcat12
3b50ce8c54
Merge pull request #977 from pi-hole/activatewebUIpw
...
Add password to webUI after update if there is none
8 years ago
DL6ER
1eeaa01234
Always put the information that we added a password if we did (not only on update but also on fresh install)
8 years ago
DL6ER
e2898217d2
Made message shorter
8 years ago
DL6ER
f81dadc5d0
Fix final message
8 years ago
Promofaux
c10ec5548f
remove code that replaces tokens in 01-pihole.conf
8 years ago
Mcat12
92f4824884
Automatically enable IPv6
8 years ago
DL6ER
a00034a6a7
Add password to webUI after update if there is none
8 years ago
DL6ER
5374f652dd
No need to modify lighttpd config file, since we overwrite it anyways
8 years ago
DL6ER
a866c4e388
Place blockingpage.css (former index.css) unter admin/ so we can load it also from some blocked sub-directories
8 years ago
DL6ER
e7241a989c
Include CSS file
8 years ago
DL6ER
b246dba7e7
Rename index.html to index.php
8 years ago
trinapicot
870454330d
Add check for lighty.conf before trying to move it
8 years ago
Dan Schaper
d53a3af191
Merge pull request #899 from diginc/configureFirewall_unittest
...
Configure firewall unittest
8 years ago
Dan Schaper
e9475a9739
Merge pull request #887 from brontide/dependancy_cleanup
...
Dependancy cleanup
8 years ago
bcambl
0caa44e979
write ifcfg instead of appending
8 years ago
diginc
b9f3493dbc
move PH_TRUE to Dockerfiles to DRY
8 years ago
diginc
633095aee1
switch to consistent style
8 years ago
Eric Warnke
71005e1db3
Merge with change of spacing in development
8 years ago
Promofaux
c452a4569e
.js
8 years ago
Promofaux
a182a208dc
Tidy up output
8 years ago
Promofaux
d273b4b48b
Check for missing index.html, replace if missing.
8 years ago
Promofaux
b429e890ad
move web interface message inside "if not update" block. Check for pi-hole deps AFTER whiptails
8 years ago
Dan Schaper
6d415a7384
Merge pull request #894 from diginc/InstallFixes_UnitTests
...
Unit tests framework and some basic tests
8 years ago
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
8 years ago
Adam Warner
50bd8b4a09
Further tweaks to local repo handling
8 years ago
Dan Schaper
7740e4268c
Consistency and standards basic-install start.
8 years ago
Adam Warner
3df2ef8587
Cherry picking f6f6f6d
, conflict fix
8 years ago
Adam Warner
354309fcad
set QUERY_LOGGING default to true
8 years ago
Adam Warner
edd00e8e70
consistency
8 years ago
Adam Warner
82e7de2aaa
Account for variable name changes
8 years ago
Adam Warner
b723714c0c
Convention : https://google.github.io/styleguide/shell.xml?showone=Constants_and_Environment_Variable_Names#Constants_and_Environment_Variable_Names
8 years ago
Adam Warner
a2903b6e63
Consistency
8 years ago
Dan Schaper
9a1876571b
Prototype `whiptails` so they don't fall to shell. Need to do this to all functions.
8 years ago
Dan Schaper
c07d7165ab
Global variables CAP'ed
8 years ago
Dan Schaper
d695c5972f
`local` variables just to be safe and make sure they stay in this function.
8 years ago
Dan Schaper
bbc09ed313
Swap variable names.
8 years ago
Promofaux
617a147706
Wording adjustment
8 years ago
Promofaux
d4dccfdb2d
Cherry pick 229439c
8 years ago
Dan Schaper
d9528dfd09
Bash is funny with returns.
8 years ago
Dan Schaper
12f5f8ba00
Begin to bring code up to Pi-hole conventions. Block installScripts and begin factoring out redundant code.
8 years ago
Dan Schaper
db0f3307e0
Only take out scripts in the directory, don't remove the directory as a whole. Need this for the future installs.
8 years ago
Dan Schaper
7a22471787
New naming convention, and reorder functions as bash would prefer them to be.
8 years ago
diginc
b4524839bb
Merge branch 'development' of https://github.com/pi-hole/pi-hole into InstallFixes_UnitTests
8 years ago
Eric Warnke
fb5ac6d6d7
We should prefer the php metapackage if it's there, falling back on php5 if it's not
8 years ago
Eric Warnke
4e7ca51beb
Added dependancy for ping and lsof used in debug scripts
8 years ago
Eric Warnke
65e0fcbf10
Merge branch 'development' of https://github.com/pi-hole/pi-hole into wheezy_fix2
8 years ago
Dan Schaper
e22aca49c8
Merge pull request #813 from das7pad/development
...
Create missing directory for lighttpd
8 years ago
Adam Warner
21fc6344bf
Merge pull request #849 from pi-hole/aManHasNoNameResolution
...
[BugFix] A man has no name resolution
8 years ago
Promofaux
794fa21137
install uninstall.sh...
8 years ago
Eric Warnke
977d1d1998
Merge branch 'development' of https://github.com/pi-hole/pi-hole into wheezy_fix2
8 years ago
Promofaux
cde003bc98
\ all the /s!
8 years ago
Adam Warner
3996e11425
Merge pull request #859 from pi-hole/ImproveWhitelistBlacklist
...
Improvements to White and Blacklists
8 years ago
Eric Warnke
3a4fe3e391
Wheezy install fix by selecting appropriate deps, made the php check the same
8 years ago
Eric Warnke
4ed6e4d016
Tiny screens get sane minimums
8 years ago
Eric Warnke
ac8d24a1ce
Even with no detected screen size, it should presume 80x24
8 years ago
Eric Warnke
fc776921d5
stty is more compatible and does not require any additional dependancies for busybox
8 years ago
Adam Warner
55a653aca4
clear out /opt/pihole folder before installing scripts
8 years ago
Adam Warner
bd0db56ba0
actually fix up logic
8 years ago
Adam Warner
95f0b3710d
fix up logic
8 years ago
Adam Warner
86349527e7
replace HOSTNAME tokens in 01-pihole.conf
8 years ago
Adam Warner
911053f63f
Replace IPv4 and IPv6 tokens in 01-pihole.conf for pi.hole resolution.
8 years ago
Marcus Hildum
519d731ddd
Fix missing newline
...
My mistake
8 years ago
Marcus Hildum
21b906e0e0
Consistency
...
More of the same
8 years ago
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.
8 years ago
Jakob Ackermann
8872594ab9
create upload dir for lighttpd
...
directory is missing in the installation process but is used in the
lighttpd.conf
8 years ago
Adam Warner
ff5d5b97c3
stash any changes in local repo
8 years ago
Dan Schaper
ef3c13fe2b
Refire with curl
8 years ago
bcambl
fb9664b636
fix typo
8 years ago
bcambl
ee114b3075
use an excluded extension for ifcfg backup
8 years ago
Promofaux
5792fc0bef
change wording depending on choice
8 years ago
Promofaux
42c93917ef
bug I forgot to fix before piholeUpdate was merged to development
8 years ago
Adam Warner
df30a4c0d1
Merge pull request #779 from bcambl/fedora_fixes
...
Fedora fixes
8 years ago
Adam Warner
9ce13f0035
Merge pull request #790 from pi-hole/piholeUpdate
...
Various refactoring.
8 years ago
Promofaux
3884b01503
Forgot a ` `
8 years ago
Promofaux
a84c3adeab
if uniformity then dan = happy
8 years ago
Promofaux
a65b784907
repeat after me: repetition is a bit repetitive.
8 years ago
Promofaux
05dadad2e1
repair sounds better than refresh
8 years ago
Promofaux
3a9b39b842
adjust text in update_dialogs() whiptail
8 years ago
Promofaux
e612003293
handle arguments better, convert to flags, echo when they're set to true.
8 years ago
Promofaux
a43577fa26
add reconfigure flag to -r command
8 years ago
Promofaux
a6fa60868b
spacing
8 years ago
Promofaux
99878ae7d6
reflect name change of some of the variables in setupVars
8 years ago
bcambl
26202014a2
stdout formatting
8 years ago
bcambl
f4f8b96788
remove systemd selinux rules on init systems
...
fixes the failing SELinux policy compile on init based systems
8 years ago