Commit Graph

1048 Commits (4cfe463dfaf2be13dc499e3b9b9dab79e45b56a1)

Author SHA1 Message Date
Dan Schaper af13ceac24
Touch file as ${USER} instead of copying template.
6 years ago
Mcat12 a55cc55338
Only `touch` the regex file if it doesn't already exist
6 years ago
Dan Schaper b2fb3fd35a
Merge pull request #2310 from pi-hole/feature/pihole-FTL.conf
6 years ago
Mcat12 1a8d5fb4a9
Allow PHP to edit the regex file if installed
6 years ago
Mcat12 c73b5456eb
Fix "which" error leaking
6 years ago
Mcat12 3d87398721
Fix `check_service_active` leaking error output
6 years ago
Mark Drobnak 47b56d6123
Fix wrong git command flag
6 years ago
Dan Schaper 512d2dd5f8
Source git repo and not /opt location.
6 years ago
Dan Schaper ad20d5ac1c
Remove -t SOURCE and DIRECTORY reversal flag on install.
6 years ago
Dan Schaper b79ff05e29
Move template files to own subdir. Include pihole-FTL.conf in templates.
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.
6 years ago
Dan Schaper 32cf94fc74
Merge pull request #2297 from pi-hole/bugfix/locales
6 years ago
Adam Warner 9b1356ad01
Revert #2282
6 years ago
Peter Robinson 45521b377a Use ip route rather than old net-tools route in chronometer.sh
6 years ago
Dan Schaper 46a366635c
Fixed locale issue, do not parse for string.
6 years ago
Dan Schaper 1877128fc4
Removes empty comment lines in basic-install.sh
6 years ago
Mark Drobnak 9cd674b528
Merge pull request #2282 from RamSet/tweak/Port53
6 years ago
RamSet 5aea7eb860 corrected function indentation
6 years ago
Mark Drobnak ec30df2020
Merge pull request #2277 from bcambl/centos_fedora_fixes
6 years ago
RamSet bb33427c79 fixed parsing error
6 years ago
RamSet 28a16cebda Addressed lint errors.
6 years ago
RamSet 49c79405bc changed flag and variable name
6 years ago
RamSet 3098f32a07 Fixed intentation and corrected comments.
6 years ago
Dan Schaper 69e06d89ff
Added missing for sourced file.
6 years ago
RamSet 56b04017e7 Port 53 check updated with 4 spaces.
6 years ago
bcambl fa9ecbdb81 add php-json to Fedora web deps
6 years ago
bcambl 2bf6b29b8f trigger an install/upgrade of PHP after enabling the Remi repository
6 years ago
Dan Schaper 9dba9fb366
Convert multiline echos to individual echo statements so they don't lead with different amounts of space.
6 years ago
Dan Schaper a323b126e5
Finished space conversion
6 years ago
Mark Drobnak 0651f1bcd4
Merge pull request #2220 from rrobgill/installedphpcheck
6 years ago
Rob Gill 11f0ade921
comments
6 years ago
Rob Gill 6381bdbf33
don't use major.minor for PHP 5
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
6 years ago
Mark Drobnak 6689e00e6a
Merge pull request #2212 from rrobgill/man-pages
6 years ago
Rob Gill a3569d88c9
Version strings & bash.
6 years ago
Adam Warner f2f6b6ede9
stickler complaints
6 years ago
Adam Warner 7f81cfd45a
Stats can still be generated without logging, no need for this sentence
6 years ago
Rob Gill 13b8e1a2ae
quotes.
6 years ago
Rob Gill 36dbdf955d
Update basic-install.sh
6 years ago
Rob Gill 714b6c98ef
codacy
6 years ago
Rob Gill 7181d7ae6a
Left that fi
6 years ago
Rob Gill 9422d57283
Check version of installed php
6 years ago
Dan Schaper feba4da0b8
Merge pull request #2161 from pi-hole/centos_remi-php7
6 years ago
Rob Gill ed7ebfd58d man page for pihole-FTL
6 years ago
Mark Drobnak 23fbb3cf22
Merge pull request #2205 from rrobgill/manual-page
6 years ago
Rob Gill 9970f3786f
Requested change
6 years ago
Rob Gill ef65bac79b
change status from INFO to CROSS
6 years ago
Rob Gill c0837c726f
blank space
6 years ago
Rob Gill ce5429aba7
stickler
6 years ago
Rob Gill aa191e9202
Update basic-install.sh
6 years ago
Rob Gill a8f0283e93
Update basic-install.sh
6 years ago
Rob Gill 999e47a26c
Remove manual page
6 years ago
Rob Gill a8103ca22d
Manual page install function
6 years ago
Mark Drobnak 1a30043776
Merge pull request #1768 from Al2Klimov/bugfix/install-invalid-user
6 years ago
Alexander A. Klimov 3be1904653 basic-install.sh: fix "install: invalid user ''"
6 years ago
Rob Gill cadd0e4244
move code back to correct location
6 years ago
Rob Gill f35ea9a3ca
replace code i missed during merge
6 years ago
Rob Gill 0971630e01
Merge branch 'development' into uninstall-formatting
6 years ago
Rob Gill b60a9fa371
merge (#2)
6 years ago
Mark Drobnak 8523c0da32
Merge pull request #2180 from rrobgill/resolved/ubuntu-bionic
6 years ago
Rob Gill f0dfa4d53d
Stickler-bot...
6 years ago
Rob Gill f2bedddce4
Changes from #2167 converted to spaces
6 years ago
Rob Gill 552138e851
Appease stickler-bot.
6 years ago
Rob Gill ff71379a8e
Convert from two to four space indetation
6 years ago
Mcat12 34f5db9ed4
Merge branch 'development' into uninstall_compat_check
6 years ago
Mark Drobnak 87506852d1
Merge pull request #1761 from pi-hole/tweak/Uninstall
6 years ago
Rob Gill e6893bc419
Update uninstall.sh
6 years ago
Rob Gill ebeab06710
Appease Stickler-bot
6 years ago
Rob Gill 1911c3690d
Style/Tabs to spaces
6 years ago
Rob Gill 20ccb7b558
move & clarify comments
6 years ago
Rob Gill 8cfe89604a
user-facing messages
6 years ago
Rob Gill 15f0ba839f
reload resloved
6 years ago
Rob Gill c400b914e5
Update basic-install.sh
6 years ago
Rob Gill a431c829cb
Regex & case fix
6 years ago
Rob Gill 25d0e125e5
relocate as function
6 years ago
Rob Gill b89a78ce17
message text
6 years ago
Rob Gill 97809277df
Update uninstall.sh
6 years ago
Rob Gill 3d3e7a330c
restore resolvd.conf
6 years ago
Rob Gill adf2275018
unbind resolved on ubuntu 18.04
6 years ago
bcambl c1ecfbfe63 linting: Double quote to prevent globbing and word splitting
6 years ago
bcambl d3dda443cd flip uninstall compatability check
6 years ago
bcambl ec3802c180 add 'which' dependency (missing on Fedora minimal)
6 years ago
Adam Warner 76654c7856
Actually check for dnsmasq's existence before attempting to interact with it's service
6 years ago
Adam Warner a6e4b0fea5
- Test for existence of remote non-master branch of FTL before attemtping to check for update
6 years ago
bcambl 8ad37af70e CentOS install re-worked to include PHP7 via Remi repository
6 years ago
Adam Warner a07891e3e6
0 is not 1!!
6 years ago
Adam Warner e946a35b18
Move dnsmasq check into FTLcheckUpdate
6 years ago
Adam Warner 68d7337f98
switch up dnsmasq detection logic
6 years ago
Adam Warner 8b4198fd8d
Merge pull request #1835 from Fauxsys/development
6 years ago
Adam Warner e17e69604c
Merge branch 'development' into new/RemoveDefaultBlocklists
6 years ago
Adam Warner 0c8a32b9ae
No need to stop services
6 years ago
Adam Warner d8c60aaae7
Merge pull request #2142 from bcambl/fix_fedora_ip_check
6 years ago
Adam Warner 3216d65353
Merge branch 'development' into new/RemoveDefaultBlocklists
6 years ago
bcambl 1d8ea9e869 Fix static IP checking on Fedora
6 years ago
Adam Warner 8ead0b5483
@fourdee dropped this: `/`
6 years ago
Fauxsys 72c081cfd6 Fix for unattended installations #1767 #1768 #1834
6 years ago
Dan acfc49fd41
Merge branch 'development' into Install-Web-Server
6 years ago
Daniel (Fourdee) 60bcca54eb Minor
6 years ago
Daniel (Fourdee) eccea8a911 Minor
6 years ago
Michele Bologna 55fce489bc Fix: add psmisc as dependency
6 years ago
Daniel (Fourdee) c2c1dc7469 Ensuring bot pleasure
6 years ago
Daniel (Fourdee) 47c1071bb8 Minor
6 years ago
Daniel (Fourdee) e401651f09 Update https://github.com/pi-hole/pi-hole/pull/2115
6 years ago
Adam Warner 7455ac9bfb
Run chooseBlocklists on EVERY reconfigure, not only if the adlist file does not esist.
6 years ago
Adam Warner b6b1dcb275
delete adlists.list if user cancels out of this dialog
6 years ago
Adam Warner 2e4f49a223
Default all to on, change up wording. This commit can be rolled back, it's just an option!
6 years ago
Adam Warner 88d4108f92
- Add new whipstail to choose from example blocklists on new install
6 years ago
Daniel (Fourdee) 3a483a1b20 install_web_server
6 years ago
Adam Warner 310d33b8ee
Merge dev > FTLDNS fix merge conflicts
6 years ago
Mark Drobnak 331472b592
Merge pull request #1999 from pi-hole/tweak/RedundantInstallCode
6 years ago
Adam Warner f37b2bc7c1
move call to `get_binary_name` into `FTLcheckUpdate()` to avoid having to run that first
6 years ago
Adam Warner b1d6c03190
Break out binary name funtion to it's own function
6 years ago
Everett Southwick a8b493cb7d Add support for public Cloudflare DNS servers.
6 years ago
Mark Drobnak a1d6ef04ec
Merge pull request #1758 from mettacrawler/fix-for-RHELish-ifcfg
6 years ago
Adam Warner 238a56cac3
Remove CreateLogFile function, as this is handled by the FTL service
6 years ago
Adam Warner 51765b1f65
chown pihole log to pihole:pihole, rather than pihole:root
6 years ago
Mark Drobnak e131395cce
Merge pull request #2037 from justinamcafee/master
6 years ago
Adam Warner d26ea2b948
remove trailing whitespace
6 years ago
Adam Warner e2e8b733a8
tidy up function
6 years ago
Adam Warner f18bf35b20
use `systemctl is-enabled` to check enabled status of service
6 years ago
Adam Warner 44d8cb77e3
Kill off `mask_service` function
6 years ago
Adam Warner b92ccb2de4
Additionally `mask` the dnsmasq service on systems with systemctl
6 years ago
justinamcafee 30af6e73be
added ;; to line 825
6 years ago
justinamcafee 2895b9bfb7
Added support for FamilyShield from OpenDNS
6 years ago
Adam Warner 84bd86f1ee
- Test to see if dnsmasq service is enabled before stopping and disabling it.
6 years ago
Adam Warner 7193f40b87
remove libnettle, missed a >/dev/null
6 years ago
Adam Warner acd69fa4b0
silence push/popd
6 years ago
Adam Warner 6584933e92
fix stickler complaints
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
6 years ago
Adam Warner cadab61a21
Merge branch 'development' into FTLDNS
6 years ago
Dan Schaper 3425b9a82e
Fix mktmp > mktemp
6 years ago
DL6ER fcdc85eab8
Remove dnsmasq from dependencies
6 years ago
Dan Schaper 4606693e62
Use pushd/popd and create random temporary directory to prevent potential backdoor binary injection.
6 years ago
Adam Warner e61d8e4fb8
adlists.default no longer used. No need to reference it.
6 years ago
DL6ER 8b79017d0f
Always replace pihole-FTL.service
6 years ago
DL6ER 5465ac9ba0
Merge pull request #1929 from pi-hole/fix/flushDB
6 years ago
Mark Drobnak 3472241289
Merge pull request #1962 from floek/master
6 years ago
Florian Freund a944b6ff79 Fixes https://github.com/pi-hole/pi-hole/issues/1772
6 years ago
Sebastian Pucilowski c5a2ca5c98 Trivial spelling mistakes in basic-install.sh comments
6 years ago
Elias Ojala 2b6d9c34c9 Fixed a typo
6 years ago
DL6ER 158ea1d43b
Add sqlite3 dependency
6 years ago
Mark Drobnak 535b8458d4
Merge pull request #1901 from bcambl/epel_check
6 years ago
Dan Schaper 9543203610
Echo the right location for the log.
6 years ago
Dan Schaper cacfe4d387
Linting changes
6 years ago
Dan Schaper a7f0137e5f
Use more secure installation log process.
6 years ago
Dan Schaper b2eb364a4b
Update header
6 years ago
Dan Schaper bb3b1bc6ba
Move ascii berry to after root check, stops the double berry for the sudo refire.
6 years ago
bcambl cc47bf8f6c Fix epel-release install for CentOS
6 years ago
DL6ER a154f1540f
Merge pull request #1778 from loganaden/development
7 years ago