Adam Warner
0568a69d83
Use WEBPORT instead of PRIVACY_LEVEL to set the web port...
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
b8acccde90
Update comments on the move of /etc/dnsmasq.old -> /etc/dnsmasq.old to better reflect why we are doing it
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
e3ffec5762
Change when old configs are removed
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
0e558e4c36
Remove some code that installs the blockpage/sets up web directories
...
Remove some code that disables dnsmasq if it is running
Create dnsmasq.d directory if it does not exist
1 year ago
Adam Warner
31f16510e2
Clear out some no longer needed ftl/dnsmasq config code
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
d2d1195928
Needs tweaking, offer chance to change web interface port
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
Adam Warner
31ee15200d
gut the install script of references to web server/lighttpd
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
1 year ago
MichaIng
b74c6d5120
Add support for RISC-V 64-bit installs
...
Signed-off-by: MichaIng <micha@dietpi.com>
1 year ago
Christian König
c96463bda2
Fix getting 'privacylevel'
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Adam Warner
58275ecd13
Revert "Ignore commented lines when reading PRIVACYLEVEL from config file"
2 years ago
Dan Schaper
fb032ea6e7
Ignore commented lines when reading PRIVACYLEVEL from config file ( #5177 )
2 years ago
MichaIng
73de49323c
Remove systemd service and optionally override configs on uninstall
...
This has been forgotten when adding the new native systemd service.
Signed-off-by: MichaIng <micha@dietpi.com>
2 years ago
Christian König
4fd0f15d90
Ignore commented lines when reding PRIVACYLEVEL from config file
...
Create dedicated getVal function in utils.sh as it might be useful somewhere else
Account for tailing comments and $key not being on the first line
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Adam Warner
c65ea9c47c
Adam does not always think things through completly. He will go and sit on the naughty step now.
...
Co-authored-by: Adam Warner <me@adamwarner.co.uk>
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Adam Warner
3ad8965959
Tweak old pihole lighttpd config warning message to better reflect the consequences of making changes to the file
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Adam Warner
68a03cc877
Ensure that /run/lighttpd exists and is owned by lighttpd user. It is likely that new installs will fail currently
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Adam Warner
50be36400c
Always set lighttpd config dir permissions ( #5038 )
2 years ago
Adam Warner
ce7f926e92
Only remove the `server.modules+=` from new config if lighttpd version is < 1.4.56 ( #5133 )
2 years ago
Adam Warner
d30a5f1b95
Get the lighttpd version from `dpkg-query` instead
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Christian König
771b7cfcc7
Run updatechecker after gravity
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Adam Warner
7bb86e4118
Add a check for the version number of lighttpd. Only remove the server.modules += section of the new pihole-admin config if the version number is not greater than or equal to 1.4.56
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Adam Warner
634e3b0e46
mod_accesslog was ommited from the list of server modules, which causes a warning to be flashed up in the error log. Enabling this
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Christian König
f73b965fcd
Create versions file before sourcing it
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
b9ebb05246
Set permission after we know the user wants to install the web server
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
c59e11a332
Always set lighttpd config dir permissions
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Glenn Strauss
34f45d011d
lighttpd: do not install obsolete 404 handler
...
(/var/www/html/pihole/ dir and contents are still removed in uninstall)
(/var/www/html/index.lighttpd.orig is still removed in uninstall)
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
2 years ago
Glenn Strauss
c6342ed84c
lighttpd: do not overwrite /etc/lighttpd/lighttpd.conf
...
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
2 years ago
Glenn Strauss
08c7691d1e
lighttpd pihole-admin.conf for admin interface
...
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
2 years ago
Glenn Strauss
dafc9983f5
lighttpd include external.conf using file glob
...
lighttpd 1.4.40 and later support 'include' using file glob
(The prior code for compatibility was presumably for Debian Jessie
and earlier, now obsolete. Debian Stretch -- currently oldstable --
ships with lighttpd 1.4.45)
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
2 years ago
Adam Warner
c2bb190dce
Explicitly create group pihole on installation ( #5039 )
2 years ago
MichaIng
06de172952
Skip setcap on installs with systemd
...
since the systemd unit uses "AmbientCapabilities" to grant capabilities.
Signed-off-by: MichaIng <micha@dietpi.com>
Signed-off-by: MichaIng <micha@dietpi.com>
2 years ago
Adam Warner
ff5ee29566
Add native systemd service ( #4924 )
2 years ago
Christian König
33d2163f19
Explicitly create group pihole on installation
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
6d8abc2e30
Don't install `which`
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Adam Warner
6b8ba3c15e
Replace deprecated shell commands ( #4907 )
2 years ago
Adam Warner
64e61aac4a
Simplify versions.sh ( #4959 )
2 years ago
Stephan Pillhofer
122bc6b927
Fix static IP not set because of in-line comment
...
Signed-off-by: Stephan Pillhofer <43667664+StephanPillhofer@users.noreply.github.com>
2 years ago
Stephan Pillhofer
06cf7afbc2
Fix static IP not set
...
Signed-off-by: Stephan Pillhofer <43667664+StephanPillhofer@users.noreply.github.com>
2 years ago
MichaIng
81927334f2
Add native systemd service
...
Inspired by: https://github.com/pi-hole/pi-hole/pull/2112
A pre-start and a post-stop script are added to reduce doubled setup and cleanup code.
Since systemd services do not natively support dynamic users, test once whether capabilities are supported during install/update, and remove User=pihole otherwise.
Signed-off-by: MichaIng <micha@dietpi.com>
Co-authored-by: DL6ER <dl6er@dl6er.de>
2 years ago
a1346054
e3db5fc601
basic-install.sh: Use `command -v` instead of `which`
...
`command -v` is the standardized version of `which` and doesn't require
any extra packages
Signed-off-by: a1346054 <36859588+a1346054@users.noreply.github.com>
2 years ago
a1346054
9c51050283
basic-install.sh: Use `grep -E` instead of `egrep`
...
Signed-off-by: a1346054 <36859588+a1346054@users.noreply.github.com>
2 years ago
RD WebDesign
c5b3b8dd68
Fix `pihole -r` dialog exit
...
- if an option is selected: Get option (repair/reconfigure);
- if exit or ESC: Get exit code (1/255)
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2 years ago
Christian König
18d28533eb
Update local and remote versions at the same time
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Adam Warner
755ec8bf2f
$$ != $
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Adam Warner
1c1407e083
Use utils.sh in install script ( #4872 )
2 years ago
Christian König
d4ce5b1c2a
Fix tabs in dialog boxes
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
yubiuser
2ff1fa1b85
Merge branch 'development' into use_utils
2 years ago
Christian König
1335c44deb
Add jq to dependencies
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
9b5ea13a33
Use utils.sh in install script
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
yubiuser
37102e5a01
Merge branch 'development' into removeblockpagefunctionality
2 years ago
MichaIng
b3c8045b52
Skip web server dialog if --disable-install-webserver has been passed
...
Prior to https://github.com/pi-hole/pi-hole/pull/4772 , the web server dialog was skipped if --disable-install-webserver was passed (INSTALL_WEB_SERVER=false). This commit restores this behaviour.
Signed-off-by: MichaIng <micha@dietpi.com>
2 years ago
Christian König
97447b2f3b
Do not remove blockingpage.css from existing installations as some users might use them for custom.php
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
27fa284eda
Fix missing PI_HOLE_BLOCKPAGE_DIR
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
6c9bd7a632
Remove blockingpage.css
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Adam Warner
c78cf82fc6
no need to declare $viewPort
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Christian König
c7410b0be9
Always indent
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
7320c10dd3
Fix git indention
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Adam Warner
c6da627b7d
Move release version check inside the else block
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Adam Warner
9028898ba7
Move code from `check_epel_repo_required` into the rpm branch of the if check on package_manager_detect(), adjust tests to accommodate
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Adam Warner
0e8c1ec023
Flip logic on epel check - if _not_ fedora, then (try to, depending on supported OS) install EPEL.
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Adam Warner
313c0ddf28
Update automated install/basic-install.sh
...
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <github@adamwarner.co.uk>
2 years ago
Adam Warner
b613758419
rename select_rpm_php and simplify it to remove code no longer needed (discussed internally removing the unsupported dialog here to match behaviour on non rpm distros)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Adam Warner
9c03915cb0
Remove special Centos7 hand holds. Move the unsupported dialog out to a further if block so that a user may still continue to install on centos7 (provided they have the pre-requisites installed)
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
yubiuser
a45c9f9f50
Merge pull request #4848 from pi-hole/indent_update
...
Indent installation/update complete message
2 years ago
Christian König
2610739624
Indent installation/update complete message
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
68eddd2377
Add OS_CHECK_DEPS to uninstall script
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
8c778c14dc
Move linebreaks
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
yubiuser
d5c798d1a9
Apply reviewers suggestion
...
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
14e1eea22d
Fix spaces in dialog msg
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
yubiuser
c7108a632c
Merge pull request #4824 from pi-hole/Alam_Rocky
...
Don't fail if Alma or Rocky are detected
2 years ago
Christian König
bc8fcc744c
Fix shellcheck warnings
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
a3f1317add
Don't fail if Alma or Rocky is detected
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Adam Warner
13135498c1
Merge pull request #4811 from pi-hole/CAPS
...
Print all SELINUX output in lowercase
2 years ago
Christian König
b25805348f
Print all SELINUX output in lowercase
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Adam Warner
59dab6a568
Simplifications per @yubiuser's suggestion
...
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Adam Warner
ecfb96d339
If old log paths exist in logrotate file, replace them with new ones
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
Adam Warner
e4444ae6a5
fixes "Set static IP using custom values results in error" ( #4807 )
...
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2 years ago
yubiuser
8e4adb6e39
Merge pull request #4788 from pi-hole/SKIP_INSTALL
...
Rename PH_TEST to SKIP_INSTALL
2 years ago
yubiuser
6aaa446354
Merge pull request #4802 from pi-hole/codespell
...
Fix spelling mistakes
2 years ago
Christian König
3d8672bc59
Clean consecutive mkdir
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
b49db58ec2
Fix spelling mistakes
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Dan Schaper
56a32047b8
Logic fix
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2 years ago
Dan Schaper
48d5d6bed2
Always create the log target directory before any movements
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2 years ago
Adam Warner
04abc4dacd
Merge pull request #4792 from pi-hole/fix/mkdir_logs
...
Create new log directory
2 years ago
Dan Schaper
fd41801977
Create new log directory
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2 years ago
Christian König
518cbd10e0
Rename also in docker files
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
0a8761ee68
Rename PH_TEST to SKIP_INSTALL
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Christian König
5c564e53ca
Fix indention in install script output
...
Signed-off-by: Christian König <ckoenig@posteo.de>
2 years ago
Dan Schaper
853cd9670a
Merge pull request #4772 from pi-hole/tweak/dialog
...
Convert installer whiptail to dialog
2 years ago
Dan Schaper
cfbc731eab
Apply suggestions from code review
...
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2 years ago
Dan Schaper
46f991f578
Apply suggestions from code review
...
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2 years ago
RD WebDesign
ad70ece73e
Fixing dialog line breaks
...
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
2 years ago
Dan Schaper
39cb1029e9
Clarify button labels
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2 years ago
Dan Schaper
a39c470f2d
Requested changes.
...
Co-authored-by: MichaIng <micha@dietpi.com>
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2 years ago
Dan Schaper
72fcdb128a
Rework cenos7 functions
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2 years ago
Dan Schaper
44667b5ffb
Add dialog to RPM installer requirements.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2 years ago
yubiuser
696d1c4ec3
Merge pull request #4777 from pi-hole/tweak/default_log_path
...
Change default FTL log file path to /var/log/pihole/FTL.log
2 years ago
Dan Schaper
1ed5ff306d
Align dialog texts.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2 years ago
Dan Schaper
bf57a786e6
Convert whiptail to dialog.
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2 years ago
Dan Schaper
80bef5f6b6
Direct pull for epel-release
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2 years ago