arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2025-07-30 10:58:08 +00:00
Code Issues Releases Wiki Activity

Enable systemd service unit + set capabilities for executable after installing the two files

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2018-04-14 10:35:21 +02:00
parent d273f58e67
commit 9b0aa6e561
No known key found for this signature in database
GPG Key ID: 00135ACBD90B28DD
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
automated install/basic-install.sh
View File

@ -1589,7 +1589,7 @@ updatePihole() {
# Install base files and web interface
installScripts
# Install config files
installConfigs
installConfigs
# If the user wants to install the dasboard,
if [[ "${INSTALL_WEB}" == true ]]; then
# do so
@ -1755,7 +1755,9 @@ FTLinstall() {
pushd "$(mktemp -d)" > /dev/null || { echo "Unable to make temporary directory for FTL binary download"; return 1; }
# Always replace pihole-FTL.service
install -T -m 0755 "${PI_HOLE_LOCAL_REPO}/advanced/pihole-FTL.service" "/etc/init.d/pihole-FTL"
install -T -m 0755 "${PI_HOLE_LOCAL_REPO}/advanced/pihole-FTL.service" "/etc/systemd/system/pihole-FTL.service"
# Enable service script (we have to do this after replacing the service unit)
systemctl enable pihole-FTL.service
local ftlBranch
local url
@ -1786,6 +1788,8 @@ FTLinstall() {
stop_service pihole-FTL &> /dev/null
# Install the new version with the correct permissions
install -T -m 0755 "${binary}" /usr/bin/pihole-FTL
# Set net admin permissions so that FTL can serve DNS, DHCP and IMAP (for DHCPv6)
setcap CAP_NET_BIND_SERVICE,CAP_NET_RAW,CAP_NET_ADMIN+eip "/usr/bin/pihole-FTL"
# Move back into the original directory the user was in
popd > /dev/null || { echo "Unable to return to original directory after FTL binary download."; return 1; }
# Install the FTL service