Commit Graph

693 Commits (8ef64dbe7491c9028a45b14d415bcf86d6743bbf)

Author SHA1 Message Date
Dan Schaper 26ad23f01e Remove comment leaders from DHCPCD interface
7 years ago
Mcat12 18eb8a2159 Merge pull request #1185 from pi-hole/cleanup/git_functions
7 years ago
DL6ER 8b22f435ad
Change how user and group are stored in the logrotate config file (necessary on Ubuntu 16.04.1)
7 years ago
Dan Schaper 3861b57dc6
Start moving reused utility functions to one script.
7 years ago
Dan Schaper 7291aa07ca
Silenc cache updater.
7 years ago
Dan Schaper 409f76aa34
Error check.
7 years ago
Dan Schaper a281d87315
Eval variable. (Not a fan.)
7 years ago
Dan Schaper 2d18b2d784
Start test templates.
7 years ago
Promofaux c31b4383e6 add back in code to stop `dnsmasq` and `lighttpd` during install.
7 years ago
Promofaux 35828f9cea Source setupvars earlier in update/repair process
7 years ago
Promofaux 90af12fdb8 Remember the [@]
7 years ago
Promofaux 5fede23cf7 trying another tactic
7 years ago
Promofaux bc4762f270 no need to stop dnsmasq/lighttpt if we're going to reload them at the end anyway.
7 years ago
Promofaux 01429d59bd more web checks
7 years ago
Promofaux 731d15f9b5 don't display web admin info in final dialog if it's not selected
7 years ago
Promofaux f0bd7fae5c ) not }
7 years ago
Promofaux f8322cc2d4 use the web install flag. Could be optimised
7 years ago
Promofaux dfdb9e393b move repo clone to function
7 years ago
Promofaux bd07d7f32e Only install web dependenices if flag is true
7 years ago
Promofaux f588c6f93c introduce web toggle flag
7 years ago
Promofaux d9ec3d2c22 spelling
7 years ago
Promofaux e2b87759d8 split out web dependencies
7 years ago
Dan Schaper 52e0aa11af
Have install create directory
7 years ago
Dan Schaper 1421c31179
`install` index and blockingpage assets.
7 years ago
Dan Schaper 91bcc18e6a
Make full path to directory for pihole web page.
7 years ago
Dan Schaper 5b43f13935
Fresh install web page directory tests
7 years ago
DL6ER 2c16a75ef1
Use stat to get owner of /var/log
7 years ago
DL6ER 6fd7e0311c
Install customized version of logrotate script
7 years ago
Dan Schaper cec214f900
User decline to install shouldn't be an error return.
7 years ago
Dan Schaper b16f797317
`firewall-cmd --state` returns 0 on 'running' non 0 on 'not running',
7 years ago
Dan Schaper 8bba3a257c
Merge branch 'tweak/firewall_tests' into tweak/firewall_warning
7 years ago
Dan Schaper 31aa42c35e
Transparency in `sudo` refire.
7 years ago
Dan Schaper f7a17248b7
Warn with whiptail if `firewall-cmd` is running.
7 years ago
Adam Warner 77554fbd13 Merge pull request #1145 from pi-hole/cleanup/more_shellcheck
7 years ago
Dan Schaper eaf6938c35
DNS whiptail from radio to menu
7 years ago
Dan Schaper 0635309f23
Move distribution check to function.
7 years ago
Dan Schaper cef0211c00 Merge pull request #1151 from pi-hole/fix/CIDR
7 years ago
Dan Schaper 86052540d9
Add back CIDR notation for non-natural blocks. Includes multi-address
7 years ago
Dan Schaper 62a5e36afd
Remove firewall configuration from update portion of script.
7 years ago
Dan Schaper 00b28f0aed
IPTables Whiptal option to install.
7 years ago
Dan Schaper ec8c40b69b
Fix array declaration for Fedora package management.
7 years ago
Dan Schaper 34df34ba27
Actually rm the Pi-hole scripts.
7 years ago
Dan Schaper 2689b37c35
Combine multiple calls to interface length code.
7 years ago
Dan Schaper 9b6427144f
|| && conversion.
7 years ago
Dan Schaper 9212eea8bd
Only ignore DOWN interfaces, `tun` interfaces are UNKNOWN.
7 years ago
DL6ER 0b72c639fb
Check for existance of iptables command. Fixes #1125
7 years ago
Dan Schaper c58a95ca2e
`setDNS` whiptail direct, not in array.
7 years ago
Dan Schaper 80a3bce6d5
PI_HOLE_INSTALL_DIR global variable
7 years ago
Dan Schaper 6f0289de49
Vestigial variable that was never populated.
7 years ago
Dan Schaper 0966d7660e
Take out some whiptail subshells that aren't needed.
7 years ago
Dan Schaper 27e90cc4e6
Repetitive `ip route get` was resetting counts.
7 years ago
Dan Schaper b785213c3a
Shellcheck for Test for $? -eq 0
7 years ago
Dan Schaper 0e4d5e9103
Bash splitting and globin
7 years ago
Mcat12 76531da340 Merge pull request #1067 from pi-hole/fix/firewall_redux
8 years ago
Adam Warner 12bec1df68 Merge pull request #1048 from pi-hole/tweak/simplify_webpage.sh
8 years ago
DL6ER 85f0241c0d
Reprocess DHCP settings after update
8 years ago
Dan Schaper 8ee2bdec4d
Plain grep, escape the special characters.
8 years ago
Dan Schaper de6ce276d0
Merge branch 'development' of github.com:pi-hole/pi-hole into fix/firewall_redux
8 years ago
Dan Schaper fbea81dcd7 Merge pull request #1068 from pi-hole/fix/anti_glob
8 years ago
Dan Schaper 502c349b8b
Merge branches 'development' and 'fix/firewall_redux' of github.com:pi-hole/pi-hole into fix/firewall_redux
8 years ago
Adam Warner 5fb0aa70de Merge pull request #1008 from pi-hole/feature/track_pre-installed_packages
8 years ago
Dan Schaper 7750e1344c
DRY `displayFinalMessage`
8 years ago
Dan Schaper 8be37130e9
Move first check to `main()`, `basic-install.sh` can now be sourced.
8 years ago
Dan Schaper fa055481a7
Shellcheck screen size
8 years ago
Dan Schaper ad07655630
Defensive git cloning
8 years ago
Dan Schaper 7cceb8615a
`make_repo` more defensive.
8 years ago
Dan Schaper 45587194e5
Regex fun
8 years ago
Dan Schaper ccbf391913
More intelligence in iptables rulesets. Account for Policy ACCEPT, with
8 years ago
DL6ER 02d4b6794c Merge pull request #1066 from dgnthr/patch-1
8 years ago
Dominik G 836b717346 Fixed a typo in the installation script
8 years ago
DL6ER 1a3bdbaabf Merge pull request #1057 from pi-hole/new/whitelistonblockingpage
8 years ago
Mcat12 5e35fdbc52 Save blocking page CSS to pihole directory instead of admin
8 years ago
Dan Schaper a4a9879643
Restructure firewall detection and application.
8 years ago
Dan Schaper ea9ec384c6
Disambiguate nested ifs.
8 years ago
Dan Schaper bbb958b7ed
Detect RPF breaking kernel updates.
8 years ago
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
8 years ago
DL6ER 02d658be65 Look for DHCP / DNS server settings which would have to be reapplied after updating (since we overwrite 01-pihole.conf)
8 years ago
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
8 years ago
Dan Schaper 9a9cb61345
Shift `epel-release` to installer dependencies for CentOS
8 years ago
Dan Schaper c3b51b4ceb Merge branch 'development' into feature/track_pre-installed_packages
8 years ago
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.
8 years ago
Dan Schaper a328326e39
Formatting
8 years ago
Dan Schaper 4eedf8a746
Always update package cache where we can.
8 years ago
Dan Schaper c5f5252145 Merge pull request #961 from pi-hole/customblockpage
8 years ago
Mcat12 7fadd469c9 Merge pull request #1038 from pi-hole/fix/IPV6_detection
8 years ago
Dan Schaper 7eb6124721
Don't call for package installs if there are no packages to install.
8 years ago
Dan Schaper f458780ba7
Rebase onto development
8 years ago
Dan Schaper 8ad52806de
Quiet DNF
8 years ago
Dan Schaper dc22a50dcc
Fedora dependency installer overhaul
8 years ago
Dan Schaper 852341c601
Check for installation status within the parent function.
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.
8 years ago
Dan Schaper da41383476
Check IPv6 to see if the route is reachable, if not, don't use.
8 years ago
Dan Schaper 6ff79835da
If only one interface available, don't show whiptail, just use that interface.
8 years ago
Dan Schaper 1d608b204a
Only allow UP interfaces to be selected. (DOWN interfaces would have not given IP addresses anyways.)
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.
8 years ago
Adam Warner d12efccd0b Merge pull request #1028 from pi-hole/bcambl-selinux_notification
8 years ago
Mcat12 54afffed19 Remove newline
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
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
8 years ago
bcambl 1e7e3259b5 choose dns servers prior to interface configuration
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
8 years ago
Dan Schaper ea5ee7b0f9
Execute gravity in same shell as installer, don't subshell it.
8 years ago
DL6ER bc8cf1b2d8
Fixed wrong indentation
8 years ago
DL6ER bb28d94884
Merge branch 'development' into customblockpage
8 years ago
Blayne Campbell 8f402f5c77 Merge pull request #1009 from bcambl/fix_1004
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
8 years ago
Dan Schaper 4244f716e0
Create /opt/pihole before trying to install into it.
8 years ago
DL6ER c48e6c91f5 Merge pull request #999 from pi-hole/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
8 years ago
DL6ER 9907fc2770
Merge branch 'development' into fix/install_deps_exit
8 years ago
Dan Schaper 8117ec8e20
Remove v1 legacy detection code.
8 years ago
Dan Schaper ff2783f9fc
Tabs to spaces and formatting.
8 years ago
Dan Schaper 156a51c945
Remove extra display only variable.
8 years ago
Dan Schaper c72ffae4a2
Don't install extra packages (openresolv was installed over resolvconf). No longer need --fix-missing.
8 years ago
Dan Schaper 7f3b0030ea
LF
8 years ago
Dan Schaper 9a626948f8
Use debconf for Deb/Ubu package installations.
8 years ago
Dan Schaper 5c43df66a8
Remove spinner function, masked return values.
8 years ago
Dan Schaper d0e3c546f8
CRLF to CR (Win to Unix line endings)
8 years ago
Dan Schaper 8cb01cdd29
One step to rename variables.
8 years ago
Adam Warner 10982a0f45 Merge pull request #990 from pi-hole/dontkillsetupVars.conf
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
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