Adam Hill
3fbb0ac8dd
Adding docker+arm detection & FTL download
...
Signed-off-by: Adam Hill <adam@diginc.us>
5 years ago
Adam Warner
71903eb27f
Add in checks to reset cloned repo to the lastest available release
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
5 years ago
bcambl
612d408034
replace echo with printf in install_dependent_packages()
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
5 years ago
bcambl
a86f578139
replace echo with printf in checkSelinux()
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
5 years ago
bcambl
81ca78e7f4
exit installer if SELinux is enforcing
...
The Pi-hole project does not ship a custom SELinux policy as the required policy would lower the overall system security.
Users who require SELinux to be enforcing are encouraged to create an custom policy on a case-by-case basis.
Signed-off-by: bcambl <blayne@blaynecampbell.com>
5 years ago
bcambl
fc0899b2ad
fix fedora dependency check/install stdout
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
5 years ago
DL6ER
149fb0c216
Do not install a blank regex file.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
Adam Warner
61a40c1b43
merge devel into 4.3.2 And Resolve merge conflicts
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
5 years ago
DL6ER
f582344b9a
"No default index.lighttpd.html file found... not backing up" is not an error.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
Dan Schaper
4cfe463dfa
Add back dropped binary call.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
5 years ago
Dan Schaper
03c65dd0e9
Convert hardcoded /usr/local/bin to variable
...
Update pihole script with full path to 'pihole'
Variable for webpage.sh 'pihole' call.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
5 years ago
DL6ER
1820c2c598
Merge branch 'development' into new/whitelist-regex-support
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
Mcat12
febdbceab1
Fix error when getting latest FTL tag
...
The headers containing the latest FTL tag were not properly input to the
command (`<` vs `<<<`). This caused Bash to try and open the file named
after the header string, which does not exist.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
David Haguenauer
34727c00c6
Drop indirection from install_dependent_packages
...
Previously, install_dependent_packages would receive an array variable
name as its single parameter, and would use variable indirection to
access it; this change simplifies that function so that it instead
receives the expanded array.
Signed-off-by: David Haguenauer <ml@kurokatta.org>
5 years ago
Mcat12
b107ae2ab9
Use the filtered IPv6 OpenDNS servers
...
The ones we were using previously were not filtered. See
https://support.opendns.com/hc/en-us/articles/227986667-Does-OpenDNS-Support-IPv6-
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
Mcat12
da398c3d9c
Print an error message if the FTL release metadata download fails
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
Mcat12
4e0ad52001
Fix ShellCheck issue by refactoring a bit
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
Mcat12
c9829dd3e4
Fix pihole -up showing FTL update when network is down
...
Fixes #1877
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
B. Olausson
ab1ea5a366
This change fixes issue #145 "stty: standard input: Inappropriate ioctl for device ".It checks if a real terminal exist, if not it sets the screen size to a fixed value. This helps to avoid nasty and unnecessary logs when running "pihole -up" via e.g. cron.
...
Signed-off-by: B. Olausson <contactme@olausson.de>
5 years ago
bcambl
10de7f649b
add chkconfig to INSTALLER_DEPS (CentOS/Fedora)
...
chkconfig is a dependency of spawn-fcgi which is a dependency of lighttpd which is installed via PIHOLE_WEB_DEPS in phase 2
adding chkconfig to INSTALLER_DEPS to ensure /etc/init.d is present during the installation prompts (phase 1)
Signed-off-by: bcambl <blayne@blaynecampbell.com>
5 years ago
Mcat12
71d5b42726
Remove the ZeusTracker blocklist from the defaults
...
It is no longer served. Fixes #2843 .
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
DL6ER
4371c9ba03
Ensure proper permissions are set for gravity.db after creation.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
B. Olausson
ecd6817aaf
This change fixes issue #145 "stty: standard input: Inappropriate ioctl for device ".It checks if a real terminal exist, if not it sets the screen size to a fixed value. This helps to avoid nasty and unnecessary logs when running "pihole -up" via e.g. cron.
...
Signed-off-by: B. Olausson <contactme@olausson.de>
5 years ago
Mark Drobnak
3420439f31
Merge pull request #2820 from pi-hole/fix/ftl-update-no-network
...
Fix pihole -up showing FTL update when network is down
5 years ago
Mcat12
38ff343134
Print an error message if the FTL release metadata download fails
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
Mcat12
c3ec2e68ad
Remove the ZeusTracker blocklist from the defaults
...
It is no longer served. Fixes #2843 .
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
Mcat12
c156af020c
Use suggested array creation to fix linter error
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
Mark Drobnak
fa8751f9ad
Fix error when checking if IP address is valid
...
During install in `valid_ip`, we split up the IP address into octets to verify it is valid (each is <= 255).
This validation was broken in #2743 when a variable usage was quoted where it should have stayed unquoted:
```
./automated install/basic-install.sh: line 942: [[: 192.241.211.120: syntax error: invalid arithmetic operator (error token is ".241.211.120")
```
Due to this error, `127.0.0.1` would be used instead of the requested IP address. Also, this prevented the user from entering a custom DNS server as it would be marked as an invalid IP address.
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
5 years ago
bcambl
ec850dc820
add chkconfig to INSTALLER_DEPS (CentOS/Fedora)
...
chkconfig is a dependency of spawn-fcgi which is a dependency of lighttpd which is installed via PIHOLE_WEB_DEPS in phase 2
adding chkconfig to INSTALLER_DEPS to ensure /etc/init.d is present during the installation prompts (phase 1)
Signed-off-by: bcambl <blayne@blaynecampbell.com>
5 years ago
Mcat12
37e7cd5211
Fix ShellCheck issue by refactoring a bit
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
Mcat12
91a2d052a7
Fix pihole -up showing FTL update when network is down
...
Fixes #1877
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
Mcat12
c8987e20c2
Use the filtered IPv6 OpenDNS servers
...
The ones we were using previously were not filtered. See
https://support.opendns.com/hc/en-us/articles/227986667-Does-OpenDNS-Support-IPv6-
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
Dan Schaper
7de6bbca61
Merge branch 'development' into release/v4.3
5 years ago
David Haguenauer
be3a21ae07
Put quotes at ends of strings
...
Signed-off-by: David Haguenauer <ml@kurokatta.org>
5 years ago
David Haguenauer
69081a9175
Drop indirection from install_dependent_packages
...
Previously, install_dependent_packages would receive an array variable
name as its single parameter, and would use variable indirection to
access it; this change simplifies that function so that it instead
receives the expanded array.
Signed-off-by: David Haguenauer <ml@kurokatta.org>
5 years ago
David Haguenauer
ab2f8a0c09
Quote variables in basic-install.sh
...
This greatly reduces the number of warnings emitted by ShellCheck, and
in turn should make it more likely that errors are caught in the
future.
Signed-off-by: David Haguenauer <ml@kurokatta.org>
5 years ago
Mcat12
8e1bf6e3d4
Merge branch 'development' into new/gravitydb
...
# Conflicts:
# advanced/Scripts/list.sh
# gravity.sh
# pihole
5 years ago
pvogt09
efbd42f7b5
Moves creation of pihole user before FTL installation
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
5 years ago
pvogt09
e076db5a4e
Changes ownership of macvendor.db to pihole
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
5 years ago
pvogt09
2e6198077d
chmod 644 adlists.list
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
5 years ago
DL6ER
95150a5d85
Clone twenty instead of only one commit when installing Pi-hole. This ensures that we clone at least one tagged commit in case we need to push changes to master.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
pvogt09
4d23b3267f
Adds X to chmod for git operations
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
5 years ago
pvogt09
e19adccd9c
Moves chmod for /var/www/html into INSTALL_WEB_SERVER block
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
5 years ago
pvogt09
a25f331e83
Adds chmod 644 for /var/www and /var/www/html
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
5 years ago
pvogt09
69c06ba6fe
Sets permissions for dnsmaq.conf
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
5 years ago
pvogt09
2c3a27e9c7
Replaces cp chmod with install and add read permission to repository files after checkout and pull
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
5 years ago
pvogt09
8a92fb24c4
Incorporates changes requested by @Mcat12
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
5 years ago
pvogt09
5c575e73c7
Adds world readable attribute to files created by Pi-hole to circumvent #2724
...
Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>
5 years ago
Mcat12
466fd79c66
Fix getting IP address in the presence of similar subnets
...
Change was suggested by @computergeek125 in #2387
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
DL6ER
0efc46260f
Use both old and new strings for detecting whether this is a Pi-hole dnsmasq config file
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
ee4dabeca6
Merge branch 'development' into new/gravitydb
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
c13ebd3a9d
Replace Pi-hole ID string with another line we intend to keep
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
Jan Piskvor Martinec
037737d653
Show $UPDATE_PKG_CACHE content in error message.
...
Fixes the typo in update_package_cache(), where the error message
contained the color code twice, instead of the $UPDATE_PKG_CACHE text.
Signed-off-by: Jan Piskvor Martinec <github@piskvor.org>
5 years ago
Mcat12
78c0c58946
Add a link to the documentation on FTL privacy levels during install
...
Closes #2695
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
5 years ago
DL6ER
9867b7fccf
Don't fail when trying to detect OS architecture on RPM-based systems
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
Andreas Schneider
860ec1a7c4
basic_install: Use install for sudoers
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
5 years ago
Andreas Schneider
2f189cd076
basic_install: There is no pihole group, remove it
...
Only a user has been created beforehand. Only some distributions create
a group with the same name based on their configuration. We cannot
assume this is always the default.
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
5 years ago
Andreas Schneider
2f0e6a6dda
basic_install: Make sure the PI_HOLE_CONFIG_DIR exists
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
5 years ago
Andreas Schneider
f187b42a98
basic_install: Define webroot globally as a variable
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
5 years ago
Andreas Schneider
838e1b19ec
basic_install: Set permissons for PI_HOLE_DASHBOARD_DIR
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
5 years ago
Andreas Schneider
d5bbb2b640
basic_install: Use a varibale for the pihole dashboard dir
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
5 years ago
Andreas Schneider
dc91d4b1f9
basic_install: If a static interface is already set up we are done
...
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
5 years ago
Mcat12
680d6e2d31
Merge branch 'release/v4.2' into development
...
# Conflicts:
# automated install/basic-install.sh
5 years ago
Adam Warner
ae654730c4
Update automated install/basic-install.sh
...
Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com>
5 years ago
DL6ER
ec79e86bee
We should really use stop_service as it also includes some nice output
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
e8dabc71af
Don't try to start pihole-FTL after it has been installed. This will be done a few moments later when gravity is invoked.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
9c0de0f731
Try to stop pihole-FTL before and (re)start pihole-FTL after the install command
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
4948862dce
Fail hard if FTL binary could not be installed
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
Mark Drobnak
1e284f69ea
Merge pull request #2587 from pi-hole/new/network-table
...
Download macvendor database
5 years ago
DL6ER
516ed83638
Add "|| true" to the curl command as a failed download is no show-stopper for the overall install process.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
cc657c0c26
Rename subroutine start_service() to restart_service() because this is what it does
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
d90d7b6927
Call FTL download/installation early on in the installation process.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
de6dc90575
Don't diable pihole-FTL before calling install. root should be able to overwrite the binary in any case. The binary has already been downloaded and hash-verified here so we don't expect any errors in this binary.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
3cdd6204c5
Move dnsmasq disabling and config file rewriting into a dedicated subroutine
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
DL6ER
d996e9c9ee
Fix inconsistent handling of binary variable. get_binary_variable() stores the result into a global variable we pass later on as argument to FTLinstall() and define a local variable with the same name. This is fixed by only using the globa variable in all places not. This is still not a very elegant solution but it is also not subject of the current PR.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
Mark Drobnak
ebba32e1c4
Remove Norton DNS
...
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
5 years ago
Mark Drobnak
7d2507527a
Merge pull request #2593 from TheLastProject/feature/standardized-dns-list
...
Standardize DNS list and write to file for AdminLTE
6 years ago
Sylvia van Os
97decb3a73
Standardize DNS list and write to file for AdminLTE
...
Signed-off-by: Sylvia van Os <sylvia@hackerchick.me>
6 years ago
DL6ER
f360959efc
Download macvendor database from ftl.pi-hole.net when downloading a new FTL binary. Users who want to update the database more frequently than on each FTL release can use the python script from the FTL repository to generate the database themselves. The macvendor database is an optional component so a failing download is no reason to interrupt the installer.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
bcambl
3035fbf468
remove unused dependency (bc)
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
DL6ER
c5da1bb952
Add libcap as Fedora dependency
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
DL6ER
486c41a69a
Add Debain dependency libcap2 needed for FTL's capability check on startup
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
Florian Freund
0ef4901e48
Add a blank after printf to avoid 'Command not found' error
...
> curl -L https://install.pi-hole.net | bash /dev/stdin --i_do_not_follow_recommendations
...
/dev/stdin: Zeile 2449: printf %b Skipping free disk space verification\n: Command not found.
Signed-off-by: Florian Freund <mail@floek.net>
6 years ago
bcambl
eca975a370
add sqlite3 dependency for fedora
...
`sqlite3` is provided by the `sqlite` package on CentOS & Fedora
Signed-off-by: bcambl <blayne@blaynecampbell.com>
(cherry picked from commit 724afc000f
)
6 years ago
bcambl
724afc000f
add sqlite3 dependency for fedora
...
`sqlite3` is provided by the `sqlite` package on CentOS & Fedora
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
Mark Drobnak
d24e0a6060
Merge pull request #2540 from pi-hole/release/v4.1
...
Update development with final v4.1 changes
6 years ago
bcambl
14ebb2fb93
remove 'System' from NetworkManager connection name
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
Clayton Dobbs
3261c2e273
Added check for universe repo on ubuntu bionic with user prompts.
...
Signed-off-by: Clayton Dobbs <clayton.dobbs@gmail.com>
6 years ago
bcambl
c3804877ed
linting: Double quote to prevent globbing and word splitting.
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
c0bc93c7c4
break dhcpcd and ifcfg network configurations into separate functions
...
- move some logic from setStaticIPv4 to setDHCPCD
- breakout ifcfg configuration into separate function which takes a config path as an argument
- setStaticIPv4 now checks for configs and calls the appropriate function accordingly
- add logic to check ifcfg file by _connection name_ if file is not found by _interface name_
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
DL6ER
e1c3c53058
Merge branch 'release/v4.1' into fix/adlists.list_not_created
6 years ago
Dan Schaper
057fbfc2b9
Change field from digit to string for printf
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
DL6ER
33156071cd
Fix literal "choice" being passed to appendToListsFile()
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
Dan Schaper
e8c2e26358
Override shellcheck with explanations.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
61c67849d7
Support multiple distributions and release versions in find_IPv4_information().
...
Add basic sanity check to function, remove unused variable.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Mark Drobnak
2cdbb34763
Merge pull request #2488 from pi-hole/feature/command_function
...
Moved `command -v` calls to function in installer.
6 years ago
Mark Drobnak
1789a2db29
Merge pull request #2384 from pi-hole/feature/install-privacy-level
...
Set FTL Privacy Level During Install
6 years ago
Dan Schaper
c270b83341
Use printf instead of echo
...
Co-Authored-By: Mcat12 <mark.drobnak@gmail.com>
6 years ago
Dan Schaper
02f0788033
Moved `command -v` calls to function.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
9d2d45b473
Query php directly for major and minor version id strings.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
0c892e6b3a
Addressed Stickler ShellCheck lints
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
a0fc38d6a2
All terminal echo commands changed to printf.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
bcambl
e7e03e36de
fix pihole user creation function
...
- fix stdout newlines
- catch failed user creation
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
Adam Warner
cc2f375b13
fix for #2450
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Mark Drobnak
a89615365e
Merge pull request #2410 from stuartskelton/norton_dns_EOL_2018_11_15
...
Remove Norton Connect Safe as its EOL 2018-11-15
6 years ago
Stuart Skelton
3c36c22ca8
Remove Norton Connect Safe as its EOL 2018-11-15
...
Signed-off-by: Stuart Skelton <stuarts@broadbean.com>
6 years ago
Mark Drobnak
6f276ae4bb
Merge pull request #2299 from nullr0ute/net-tools
...
Use ip route rather than old net-tools route in chronometer.sh
6 years ago
Mark Drobnak
3cea1bd423
Fix lighttpd v1.4.50 crashing on startup
...
It has a bug/regression causing it to fail if external.conf does not exist,
so touch external.conf when installing lighttpd config
Signed-off-by: Mark Drobnak <mark.drobnak@gmail.com>
6 years ago
bcambl
c58e3acc78
add unsupported RPM distro warnings
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
6f8e8e98bb
update centos version check test
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
24b4aabae9
allow installer to continue with additional rpm based distros
...
- FedBerry (Fedora based ARM image)
- Scientific Linux (CentOS based)
- Add prompt to continue installing on unsupported RPM based distros
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
DL6ER
1813c25117
If config file was backed up: Print info message
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
Mcat12
5d0d7336ff
Echo with newline when setting privacy level
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
6a26a05dbf
Fix privacy level whiptail option format
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
4aafa8cf47
Set the FTL privacy level during install
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
DL6ER
28c6b1393f
Backup existing /etc/dnsmasq.conf if present and ensure that /etc/dnsmasq.conf contains only "conf-dir=/etc/dnsmasq.d"
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
Realtebo
0d1b3cee4f
Enable FTL service before starting it
...
Signed-off-by: Realtebo <mirkotebaldi@yahoo.it>
6 years ago
Mirko Tebaldi
476fecbcf5
Fixed typos as suggestes
...
Signed-off-by: Realtebo <mirkotebaldi@yahoo.it>
6 years ago
Mirko Tebaldi
327b58fa03
Merge pull request #1 from pi-hole/development
...
Merge with current main development branch
6 years ago
DL6ER
d3eea9404d
Merge pull request #2331 from pi-hole/tweak/improve_FTL_download_errormsg
...
Improve error message when downloading FTL failed
6 years ago
Realtbo
d9195970b7
Create adlist file while running unattended setup
...
Signed-off-by: Realtebo <mirkotebaldi@yahoo.it>
6 years ago
Mark Drobnak
ef8aaba014
Merge pull request #2320 from TronPaul/fix/no-tty
...
set noninteractive during unattended install
6 years ago
DL6ER
f5c3dc5d9d
Improve download error message that is shown when downloading or verifying the binary failed
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
Mcat12
e01eea8ba8
Remove PowerPC from FTL binaries
...
It is no longer built, and may cause 404 errors if it attempts to
download the binary.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Dan Schaper
5b628a4c77
Merge branch 'development' into release/v4.0
6 years ago
Mark McGuire
0081a7ca92
set noninteractive during unattended install
...
Signed-off-by: Mark McGuire <mark.b.mcg@gmail.com>
6 years ago
Dan Schaper
993beab3b7
Changed wording.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
06875f2cc9
Merge branch 'release/v4.0' into fix/parse_pihole-FTL.conf
6 years ago
Dan Schaper
448fc7231c
Installed to `/etc/pihole` as PI_HOLE_CONFIG_DIR variable.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
d0d030bafc
Moved file creation to proper function. Included bash variables for file
...
location. Set to pihole:pihole ownership with 644 permissions.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
833131e15f
Merge pull request #2315 from pi-hole/fix/regex-file-ownership
...
Allow PHP to edit the regex file if web is installed
6 years ago
Dan Schaper
fb2810557a
Allow web user group to access regex.list
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Mcat12
57af0ba0a4
Use `install` to make the regex file
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Dan Schaper
17c1e64f7e
Moved FTL configuration copy in to scripts copy function.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
af13ceac24
Touch file as ${USER} instead of copying template.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Mcat12
a55cc55338
Only `touch` the regex file if it doesn't already exist
...
The other permission calls will always be run so that the file is in the
expected state after install and repair.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Dan Schaper
b2fb3fd35a
Merge pull request #2310 from pi-hole/feature/pihole-FTL.conf
...
Include template pihole-FTL.conf
6 years ago
Mcat12
1a8d5fb4a9
Allow PHP to edit the regex file if installed
...
Fixes permissions error on the web interface when modifying the regex.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
c73b5456eb
Fix "which" error leaking
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mcat12
3d87398721
Fix `check_service_active` leaking error output
...
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Mark Drobnak
47b56d6123
Fix wrong git command flag
...
I could not find documentation on a `--head` flag, but there is a `--heads` flag which does the same thing.
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
6 years ago
Dan Schaper
512d2dd5f8
Source git repo and not /opt location.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
ad20d5ac1c
Remove -t SOURCE and DIRECTORY reversal flag on install.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
b79ff05e29
Move template files to own subdir. Include pihole-FTL.conf in templates.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Borats Nolan
32b50f8188
Change the word "folder" to "directory" since the pi-hole is intended to run on rpi with Linux on it.
...
Signed-off-by: Borats Nolan <borats@i.dont.use.email>
6 years ago
Dan Schaper
32cf94fc74
Merge pull request #2297 from pi-hole/bugfix/locales
...
Fixed locale issue, do not parse for string.
6 years ago
Adam Warner
9b1356ad01
Revert #2282
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Peter Robinson
45521b377a
Use ip route rather than old net-tools route in chronometer.sh
...
The only use of net-tools is the use of route in chronometer.sh so
instead use the same method as used in piholeDebug.sh to get the
default gateway so there's no need to depend on net-tools anylonger.
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
6 years ago
Dan Schaper
46a366635c
Fixed locale issue, do not parse for string.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Dan Schaper
1877128fc4
Removes empty comment lines in basic-install.sh
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Mark Drobnak
9cd674b528
Merge pull request #2282 from RamSet/tweak/Port53
...
Updated port 53 check #2
6 years ago
RamSet
5aea7eb860
corrected function indentation
...
Signed-off-by: RamSet <RamSet@gmail.com>
6 years ago
Mark Drobnak
ec30df2020
Merge pull request #2277 from bcambl/centos_fedora_fixes
...
Installer fixes for Fedora & CentOS
6 years ago
RamSet
bb33427c79
fixed parsing error
...
Signed-off-by: RamSet <RamSet@gmail.com>
6 years ago
RamSet
28a16cebda
Addressed lint errors.
...
Signed-off-by: RamSet <RamSet@gmail.com>
6 years ago
RamSet
49c79405bc
changed flag and variable name
...
Signed-off-by: RamSet <RamSet@gmail.com>
6 years ago
RamSet
3098f32a07
Fixed intentation and corrected comments.
...
Signed-off-by: RamSet <RamSet@gmail.com>
6 years ago
Dan Schaper
69e06d89ff
Added missing for sourced file.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
RamSet
56b04017e7
Port 53 check updated with 4 spaces.
...
Signed-off-by: RamSet <RamSet@gmail.com>
6 years ago
bcambl
fa9ecbdb81
add php-json to Fedora web deps
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
bcambl
2bf6b29b8f
trigger an install/upgrade of PHP after enabling the Remi repository
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
Dan Schaper
9dba9fb366
Convert multiline echos to individual echo statements so they don't lead with different amounts of space.
...
Signed-off-by: Dan Schaper <dan.schaper@pihole.net>
6 years ago
Dan Schaper
a323b126e5
Finished space conversion
...
Signed-off-by: Dan Schaper <dan.schaper@pihole.net>
6 years ago
Mark Drobnak
0651f1bcd4
Merge pull request #2220 from rrobgill/installedphpcheck
...
Bugfix - Check version of installed php
6 years ago
Rob Gill
11f0ade921
comments
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
6381bdbf33
don't use major.minor for PHP 5
...
Signed-off-by: <rrobgill@protonmail.com>
6 years ago
Mcat12
4a75566a3b
Merge remote-tracking branch 'origin/development' into tweak/32bitOS_on_64bitCPU
6 years ago
Rob Gill
52aa52c3b1
remove duplicate declaration
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Mark Drobnak
6689e00e6a
Merge pull request #2212 from rrobgill/man-pages
...
Man page for pilhole-FTL
6 years ago
Rob Gill
a3569d88c9
Version strings & bash.
...
Fixed up the version checking. Thanks for your help @dschaper.
No longer uses the version string as returned, but uses the major and minor version numbers extracted from it, against the minimum of 5.5.
Tested against real install of php 7.0, (and the version check logic separately tested against a variety of artificial version numbers, of multiple digits for both major and minor version. - Lesson learned, I'm never trusting bash again)
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Adam Warner
f2f6b6ede9
stickler complaints
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
7f81cfd45a
Stats can still be generated without logging, no need for this sentence
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Rob Gill
13b8e1a2ae
quotes.
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
36dbdf955d
Update basic-install.sh
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
714b6c98ef
codacy
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
7181d7ae6a
Left that fi
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
9422d57283
Check version of installed php
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Dan Schaper
feba4da0b8
Merge pull request #2161 from pi-hole/centos_remi-php7
...
CentOS install re-worked to provide PHP7 via Remi Repository
6 years ago
Rob Gill
ed7ebfd58d
man page for pihole-FTL
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Mark Drobnak
23fbb3cf22
Merge pull request #2205 from rrobgill/manual-page
...
Manual page
6 years ago
Rob Gill
9970f3786f
Requested change
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
ef65bac79b
change status from INFO to CROSS
...
Signed-Off-By: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
c0837c726f
blank space
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
ce5429aba7
stickler
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
aa191e9202
Update basic-install.sh
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
a8f0283e93
Update basic-install.sh
...
This hands checking of lighttpd's status over to the existing check_service_active() function.
All other checks of service status within the install script are handled by this function.
Use of existing function:
Avoids duplication of service detection logic.
Uses return code to determine status, thereby avoids parsing text to determine status, and reliance on English language locale to determine activity, (which may also be broken on some systems (# 2204)
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
a8103ca22d
Manual page install function
...
Function to install man page.
Verifies that man pages are installed, and correct directory for the pihole manpage is present.
Copies file, and runs man-db to update man page database.
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Mark Drobnak
1a30043776
Merge pull request #1768 from Al2Klimov/bugfix/install-invalid-user
...
basic-install.sh: fix "install: invalid user ''"
6 years ago
Alexander A. Klimov
3be1904653
basic-install.sh: fix "install: invalid user ''"
...
refs #1767
6 years ago
Rob Gill
20ccb7b558
move & clarify comments
6 years ago
Rob Gill
8cfe89604a
user-facing messages
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
c400b914e5
Update basic-install.sh
...
Force reloading of relsolved config where available
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
a431c829cb
Regex & case fix
...
grep & sed regexes match commented or uncommented
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
25d0e125e5
relocate as function
...
The check for systemd-resolved DNSStubListener, and disabling as necessary is a new function, called just prior to start_service pihole-FTL.
The check for ubuntu bionic 18.04 specifically is removed.
The check if resolved is enabled is made with check_service_active()
An additional check that the dnsstublistener is enabled is made.
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
Rob Gill
b89a78ce17
message text
...
Signed-off-by: Rob Gill <rrobgill@protonmail.com>>
6 years ago
Rob Gill
adf2275018
unbind resolved on ubuntu 18.04
...
Stop systemd-resolved from interfering with dnsmasq/ftl
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
6 years ago
bcambl
ec3802c180
add 'which' dependency (missing on Fedora minimal)
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
Adam Warner
76654c7856
Actually check for dnsmasq's existence before attempting to interact with it's service
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
a6e4b0fea5
- Test for existence of remote non-master branch of FTL before attemtping to check for update
...
- Move some functions from checkout to basic-install
- provide helpful error message on downlaod not existing
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
bcambl
8ad37af70e
CentOS install re-worked to include PHP7 via Remi repository
...
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
Adam Warner
a07891e3e6
0 is not 1!!
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
e946a35b18
Move dnsmasq check into FTLcheckUpdate
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
68d7337f98
switch up dnsmasq detection logic
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
8b4198fd8d
Merge pull request #1835 from Fauxsys/development
...
Fix for unattended installations #1767 #1768 #1834
6 years ago
Adam Warner
e17e69604c
Merge branch 'development' into new/RemoveDefaultBlocklists
6 years ago
Adam Warner
0c8a32b9ae
No need to stop services
...
This causes issues on a `pihole -r reconfigure`
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
d8c60aaae7
Merge pull request #2142 from bcambl/fix_fedora_ip_check
...
Fix static IP checking on Fedora
6 years ago
Adam Warner
3216d65353
Merge branch 'development' into new/RemoveDefaultBlocklists
6 years ago
bcambl
1d8ea9e869
Fix static IP checking on Fedora
...
This bug was introduced by #1758 where the CIDR was removed from the static IP check.
The CIDR was acting as a boundary so we need to test for a boundary or a slash character.
Signed-off-by: bcambl <blayne@blaynecampbell.com>
6 years ago
Adam Warner
8ead0b5483
@fourdee dropped this: `/`
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Fauxsys
72c081cfd6
Fix for unattended installations #1767 #1768 #1834
...
Removed updatePihole() function and updated if/then statements in installPihole() and main(). Corrected minor typos.
Signed-off-by: Fauxsys <fiber.cipher@gmail.com>
6 years ago
Dan
acfc49fd41
Merge branch 'development' into Install-Web-Server
6 years ago
Daniel (Fourdee)
60bcca54eb
Minor
...
+ indentation
6 years ago
Daniel (Fourdee)
eccea8a911
Minor
...
+ Fix indentation
+ Stick with case, add "On" to provide INFO print out, although its not
technically required as INSTALL_WEB_SERVER=true is default value.
6 years ago
Michele Bologna
55fce489bc
Fix: add psmisc as dependency
...
Debian 9.4 does not install `psmisc` by default and the following error will happen during installation:
```
[✗] /usr/local/bin/pihole: line 353: killall: command not found
/usr/local/bin/pihole: line 364: killall: command not found
```
This patch adds `psmisc` (that contains `killall`) as dependency
Signed-off-by: Michele Bologna <michele.bologna@gmail.com>
6 years ago
Daniel (Fourdee)
c2c1dc7469
Ensuring bot pleasure
...
https://github.com/pi-hole/pi-hole/pull/2115#pullrequestreview-113066748
6 years ago
Daniel (Fourdee)
47c1071bb8
Minor
...
+ Add info in regards to disabling web server install:
https://github.com/pi-hole/pi-hole/pull/2115
6 years ago
Daniel (Fourdee)
e401651f09
Update https://github.com/pi-hole/pi-hole/pull/2115
...
+ Patch existing systems with the new variable changes using
'accountForRefactor'
+ Prompt user to install webserver
6 years ago
Adam Warner
7455ac9bfb
Run chooseBlocklists on EVERY reconfigure, not only if the adlist file does not esist.
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
b6b1dcb275
delete adlists.list if user cancels out of this dialog
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
2e4f49a223
Default all to on, change up wording. This commit can be rolled back, it's just an option!
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
88d4108f92
- Add new whipstail to choose from example blocklists on new install
...
- remove adlists.default
- do not copy non-existent adlists.default on run of gravity
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Daniel (Fourdee)
3a483a1b20
install_web_server
...
+ Splits web interface and server into two variables.
+ Option to disable forced install of Lighttpd.
6 years ago
Adam Warner
310d33b8ee
Merge dev > FTLDNS fix merge conflicts
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Mark Drobnak
331472b592
Merge pull request #1999 from pi-hole/tweak/RedundantInstallCode
...
adlists.default no longer used. No need to reference it.
6 years ago
Adam Warner
f37b2bc7c1
move call to `get_binary_name` into `FTLcheckUpdate()` to avoid having to run that first
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
b1d6c03190
Break out binary name funtion to it's own function
...
Remove duplicate code. get_binary_name is now in the install script
Add some "version" checking to ftl download when using an alt branch, uses checksum
Greatly simplify update process. Source pihole-FTL version checker from basic-install.sh
Always run install script to finalise changes.
Install script now outputs versions after an update
(This is a Squash of previous work into one commit)
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Everett Southwick
a8b493cb7d
Add support for public Cloudflare DNS servers.
...
Signed-off-by: Everett Southwick <everett@everettsouthwick.com>
6 years ago
Mark Drobnak
a1d6ef04ec
Merge pull request #1758 from mettacrawler/fix-for-RHELish-ifcfg
...
basic-install.sh - no CIDR in ifcfg-*
6 years ago
Adam Warner
238a56cac3
Remove CreateLogFile function, as this is handled by the FTL service
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
51765b1f65
chown pihole log to pihole:pihole, rather than pihole:root
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Mark Drobnak
e131395cce
Merge pull request #2037 from justinamcafee/master
...
Adds FamilyShield DNS server address to the "Choose DNS" screen in installer.
6 years ago
Adam Warner
d26ea2b948
remove trailing whitespace
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
e2e8b733a8
tidy up function
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
f18bf35b20
use `systemctl is-enabled` to check enabled status of service
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
44d8cb77e3
Kill off `mask_service` function
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
b92ccb2de4
Additionally `mask` the dnsmasq service on systems with systemctl
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
justinamcafee
30af6e73be
added ;; to line 825
...
Misformated case. Updated correct case
6 years ago
justinamcafee
2895b9bfb7
Added support for FamilyShield from OpenDNS
...
With a very minor code change, individuals can now implement restrictions on dangers, disturbing, or otherwise adult oriented content without the need for managed restrictions.
This is a fairly non-invasive change and will benefit users who intend to use VPN for home or small business uses where access to such material may be undesirable.
6 years ago
Adam Warner
84bd86f1ee
- Test to see if dnsmasq service is enabled before stopping and disabling it.
...
- Some formatting tweaks to the `start_service` `stop_`service` `disable_service` and `enable_service` commands
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
7193f40b87
remove libnettle, missed a >/dev/null
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
acd69fa4b0
silence push/popd
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
6584933e92
fix stickler complaints
...
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
8cf8da4c78
- Check file /etc/pihole/ftlbranch for current FTL branch, download from github if master, or pi-hole.net if other
...
- Check if downloaded binary file can resolve queries, if so stop and disable dnsmasq
- Add service_disable function
- Add dependency libcap2-bin on debian to enable setcap. Need to check other distos
-Always download FTL binary if /etc/pihole/ftlbranch does not contain "master"
- Change some strings/variables that reference dnsmasq and change them to pihole/pihole-FTL
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
Adam Warner
cadab61a21
Merge branch 'development' into FTLDNS
6 years ago
Dan Schaper
3425b9a82e
Fix mktmp > mktemp
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
DL6ER
fcdc85eab8
Remove dnsmasq from dependencies
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago
Dan Schaper
4606693e62
Use pushd/popd and create random temporary directory to prevent potential backdoor binary injection.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
6 years ago
Adam Warner
e61d8e4fb8
adlists.default no longer used. No need to reference it.
...
Use --force switch of gravity to force the cache refresh
Signed-off-by: Adam Warner <adamw@rner.email>
6 years ago
DL6ER
8b79017d0f
Always replace pihole-FTL.service
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
6 years ago