arno
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole
1
0
Fork 0
Code Issues Releases Wiki Activity
3336 Commits
15 Branches
108 Tags
34 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'a323b126e5'
${ noResults }
Commit Graph

858 Commits (a323b126e5ea89d4f54f6dfffdbb52a126a19449)

Author SHA1 Message Date
Dan Schaper 79294bb6ca Merge pull request #1332 from pi-hole/varChanges
7 years ago
Dan Schaper 2834f2ccc2
Let `ip` determine which links are candidates.
7 years ago
georou 0d794226ab Removed unsupported POSIX brace expansion
7 years ago
Adam Warner 83662c9e50
additional requested changes
7 years ago
Adam Warner 6c1d52199f
Merge branch 'master' of https://github.com/jftuga/pi-hole into jftuga-master
7 years ago
John Taylor 76bd53ef1f replace instances of "/etc/.pihole" with ${PI_HOLE_LOCAL_REPO}
7 years ago
georou e45559da20 Use Firewalld services instead of ports
7 years ago
Jacob Salmela 5e16487ef6
add ascii berry to beginning of installer
7 years ago
DL6ER f2fe84c9d3 Merge pull request #1292 from pi-hole/master
7 years ago
DL6ER f626406685
Revert #1273
7 years ago
Dan Schaper 8776b822db Merge pull request #1287 from pi-hole/fix/update_fail
7 years ago
DL6ER fc76b1a6a3 Merge pull request #1244 from pi-hole/new/FTL-binary
7 years ago
DL6ER 9502356980
Move test_dpkg_lock to initial UPDATE_PKG_CACHE. There was unpredictable interference with debconf-apt-progress
7 years ago
DL6ER a535ca9db4
Some tweaks to the new dpkg lock detector
7 years ago
DL6ER 2c762899de
Add loop to wait if package manager is blocked externally
7 years ago
Dan Schaper 24fd23493d
Exit script immediately if we can't update package cache.
7 years ago
DL6ER 66b7d04b82
Merge branch 'development' into new/FTL-binary
7 years ago
Technicalpyro 93dea7b942 Moved to installers dependencies
7 years ago
Dan Schaper ca24f7c143 Merge pull request #1273 from pi-hole/new/no_fixed_interface
7 years ago
Technicalpyro 697b0295f3 fixes missing dialog package from some ditros
7 years ago
DL6ER ae24f1255f
Bugfix: Delete INSTALL_WEB line before adding new one
7 years ago
DL6ER ec7e75a6e3
Don't save `interface=` line to `dnsmasq`s config file
7 years ago
Jacob Salmela 7a1a2dec67
update license to EUPL on core files
7 years ago
DL6ER af2893d2ce
Updater implementation for FTL
7 years ago
Dan Schaper 4dcee5cd84
`arch` is not portable.
7 years ago
DL6ER 1645677c3a
Cosmetics
7 years ago
DL6ER 77b3764481
Remove resundant code (FTL will later be enabled by enable_service)
7 years ago
DL6ER 90ccbef431
pihole-FTL init.d script
7 years ago
Dan Schaper 4cd598ae10
Check support files installed and permissions.
7 years ago
Dan Schaper 2ffb103acb
Move binary to final home.
7 years ago
Dan Schaper a0c17368ed
`cd` to directory to sha1sum
7 years ago
Dan Schaper 6023984703
Silence sha check
7 years ago
Dan Schaper cde7b53de3
Check sha1 of transferred file.
7 years ago
Dan Schaper e087797edc
Test for format of tag version.
7 years ago
Dan Schaper 5e6f8489a9
Find 404 errors and relay message.
7 years ago
Dan Schaper 48351fed79
Remove trailing newline from curl'd variable.
7 years ago
Dan Schaper 875a5d309d
Check downloaded file for binary or text.
7 years ago
Dan Schaper 70e876ee13
Download tests.
7 years ago
Dan Schaper 7a269e757e
Debian buildpack image for docker (Need `curl` for testing, using scm version to add `curl` and `git`.)
7 years ago
Dan Schaper 87edbeaf58
Factor out downloader from detector function.
7 years ago
Dan Schaper 339f95b00c
Change from `uname -m` to straight `arch`
7 years ago
DL6ER 70a6a79b8c
Detect library differently
7 years ago
DL6ER f24f77c5bd
Detect if architecture is *aarch* + use hf binary only if ARMv7+ is detected
7 years ago
DL6ER 378338c684
Install pihole-FTL to /usr/bin instead of /usr/local/bin
7 years ago
Adam Warner 36166c129a Merge pull request #1253 from Skittels0/even_more_dns
7 years ago
Skittels 4e7a485e23 Update basic-install.sh
7 years ago
Skittels 9e5795bf55 Added DNS.WATCH to default dns servers
7 years ago
DL6ER 4035c933df
Moved echo to else block
7 years ago
DL6ER abd44dd284
Add 32bit message
7 years ago
DL6ER 95d7fe76b5
Make comments more pretty
7 years ago
DL6ER a052f397fe
Be more verbose during install
7 years ago
DL6ER 09d6e73b0a
Don't print error message on 32bit platforms
7 years ago
DL6ER 7fb6b71d52
Fix install path
7 years ago
DL6ER 07e37d7fc3
Proper error handling
7 years ago
DL6ER fbe3dc0dcd
Have to get latest tag via GitHub API for downloading the binaries
7 years ago
DL6ER 6018c0c2fc
Add FTLinstall()
7 years ago
DL6ER 52a2f166fd
Add FTLdownload() subroutine
7 years ago
Mcat12 ba67144e34 Merge branch 'development' into adminPageAsOption
7 years ago
Dan Schaper 34f326c559 Update basic-install.sh
7 years ago
DL6ER 8fb6ba19a1
Remove double echos
7 years ago
Dan Schaper 314f7e7889 Merge pull request #1183 from pi-hole/tweak/update_cache_trap
7 years ago
Promofaux 4fcf8fd23f Merge in `development` branch - resolve conflict in update.sh
7 years ago
Promofaux 1206dda347 testing putting `runGravity` at a different part of the script
7 years ago
Promofaux e57425df5f 0.0.0.0 instead of pi-holes IP address for redirect purposes
7 years ago
Dan Schaper b8d0e5e5a1 Merge pull request #1210 from pi-hole/fix/dhcpcd_int
7 years ago
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.
8 years ago
Dan Schaper 80a3bce6d5
PI_HOLE_INSTALL_DIR global variable
8 years ago
Dan Schaper 6f0289de49
Vestigial variable that was never populated.
8 years ago
Dan Schaper 0966d7660e
Take out some whiptail subshells that aren't needed.
8 years ago
Dan Schaper 27e90cc4e6
Repetitive `ip route get` was resetting counts.
8 years ago
Dan Schaper b785213c3a
Shellcheck for Test for $? -eq 0
8 years ago
Dan Schaper 0e4d5e9103
Bash splitting and globin
8 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
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
8 years ago
Dan Schaper e9475a9739 Merge pull request #887 from brontide/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
8 years ago
Dan Schaper 8b9f0487c0 Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
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