Adam Warner
4840bdb031
add a double space to the beginning of some outputs
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
5 years ago
Adam Warner
a85e7a2a43
Merge pull request #2999 from pi-hole:fix/api_utf8_encoding
...
Add php-xml package as new dependency
5 years ago
DL6ER
61d233f069
Merge pull request #2964 from bcambl/selinux_enforcing
...
Exit installation when SELinux in unsupported state
5 years ago
DL6ER
d457d40e0b
Add php-xml package as new dependency.
...
Signed-off-by: DL6ER <dl6er@dl6er.de>
5 years ago
Adam Warner
6571a63ffa
Add --tags to descibe command
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
5 years ago
Adam Warner
a7e81c8ea0
remove extra space
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
5 years ago
Adam Warner
73d9abae3e
And finally, we please stickler
...
Signed-off-by: Adam Warner <adamw@rner.email>
5 years ago
Adam Warner
c8b9e42649
Please Codefactor.
...
Signed-off-by: Adam Warner <adamw@rner.email>
5 years ago
Adam Warner
62c00ae1d8
pushd/popd instead of juggling with a variable
...
Signed-off-by: Adam Warner <adamw@rner.email>
5 years ago
MichaIng
ea67c828cd
Minor installer output enhancements
...
+ Print restart hint after setting IPv4 address on a separate line with [i] prefix to not break text alignment
+ Print final upstream DNS choice as a single printf call and by this fix missing info and linebreak on "Custom" choices.
+ Minor if/then/else code alignment
Signed-off-by: MichaIng <micha@dietpi.com>
5 years ago
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
5 years ago
Sylvia van Os
97decb3a73
Standardize DNS list and write to file for AdminLTE
...
Signed-off-by: Sylvia van Os <sylvia@hackerchick.me>
5 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