mirror of
https://github.com/pi-hole/pi-hole.git
synced 2025-04-22 23:30:13 +00:00
Big sudo refactor.
In general: - Each script reruns itself as either root or pihole. Any $SUDO variables are removed. - Two new scripts are created that need to be run as root. - The installer creates a file in sudoers.d that allows the pihole user to run the above two scripts as root. piholeReloadServices.sh: Script to reload dnsmasq (or start it if required). piholeSetPermissions.sh: Script to set the permissions on /etc/pihole basic-install.sh: - Copy two new scripts. - Set owner and permissions on /etc/pihole - Install the sudoers file to allow the pihole user to run certain scripts as root without a password. uninstall.sh: - Remote two new scripts. - Remove sudoers file gravity.sh: - Rerun as pihole user. - Use sudo for setting permissions and reloading services. - Replaced chmod 777 with piholeSetPermissions.sh. blacklist.sh, whitelist.sh: Rerun as pihole user. Use sudo for reloading services. chronometer.sh, piholeLogFlush.sh: Rerun as pihole user. setupLCD.sh: Rerun as root.
This commit is contained in:
ryt51V
parent
3eb6739263
commit
9a68adf36f
10 changed files with 291 additions and 64 deletions
|
|
@ -23,6 +23,29 @@ if [[ $# = 0 ]]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
# Check if pihole user, and if not then rerun with sudo.
|
||||
echo ":::"
|
||||
runninguser=$(whoami)
|
||||
if [[ "$runninguser" = "pihole" ]];then
|
||||
echo "::: You are pihole user."
|
||||
# Older versions of Pi-hole set $SUDO="sudo" and prefixed commands with it,
|
||||
# rather than rerunning as sudo. Just in case it turns up by accident,
|
||||
# explicitly set the $SUDO variable to an empty string.
|
||||
SUDO=""
|
||||
else
|
||||
echo "::: sudo will be used."
|
||||
# Check if it is actually installed
|
||||
# If it isn't, exit because the install cannot complete
|
||||
if [[ $(dpkg-query -s sudo) ]];then
|
||||
echo "::: Running sudo -u pihole $@"
|
||||
sudo -u pihole "$@"
|
||||
exit $?
|
||||
else
|
||||
echo "::: Please install sudo."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
#globals
|
||||
blacklist=/etc/pihole/blacklist.txt
|
||||
adList=/etc/pihole/gravity.list
|
||||
|
|
@ -153,15 +176,11 @@ function Reload() {
|
|||
echo ":::"
|
||||
echo -n "::: Refresh lists in dnsmasq..."
|
||||
|
||||
dnsmasqPid=$(pidof dnsmasq)
|
||||
|
||||
if [[ $dnsmasqPid ]]; then
|
||||
# service already running - reload config
|
||||
sudo kill -HUP $dnsmasqPid
|
||||
else
|
||||
# service not running, start it up
|
||||
sudo service dnsmasq start
|
||||
fi
|
||||
# Reloading services requires root.
|
||||
# The installer should have created a file in sudoers.d to allow pihole user
|
||||
# to run piholeReloadServices.sh as root with sudo without a password
|
||||
sudo --non-interactive /usr/local/bin/piholeReloadServices.sh
|
||||
|
||||
echo " done!"
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,28 @@
|
|||
# the Free Software Foundation, either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
|
||||
# Check if pihole user, and if not then rerun with sudo.
|
||||
echo ":::"
|
||||
runninguser=$(whoami)
|
||||
if [[ "$runninguser" = "pihole" ]];then
|
||||
echo "::: You are pihole user."
|
||||
# Older versions of Pi-hole set $SUDO="sudo" and prefixed commands with it,
|
||||
# rather than rerunning as sudo. Just in case it turns up by accident,
|
||||
# explicitly set the $SUDO variable to an empty string.
|
||||
SUDO=""
|
||||
else
|
||||
echo "::: sudo will be used."
|
||||
# Check if it is actually installed
|
||||
# If it isn't, exit because the install cannot complete
|
||||
if [[ $(dpkg-query -s sudo) ]];then
|
||||
echo "::: Running sudo -u pihole $@"
|
||||
sudo -u pihole "$@"
|
||||
exit $?
|
||||
else
|
||||
echo "::: Please install sudo."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
#Functions##############################################################################################################
|
||||
piLog="/var/log/pihole.log"
|
||||
|
|
|
|||
|
|
@ -10,4 +10,27 @@
|
|||
# the Free Software Foundation, either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
|
||||
# Check if pihole user, and if not then rerun with sudo.
|
||||
echo ":::"
|
||||
runninguser=$(whoami)
|
||||
if [[ "$runninguser" = "pihole" ]];then
|
||||
echo "::: You are pihole user."
|
||||
# Older versions of Pi-hole set $SUDO="sudo" and prefixed commands with it,
|
||||
# rather than rerunning as sudo. Just in case it turns up by accident,
|
||||
# explicitly set the $SUDO variable to an empty string.
|
||||
SUDO=""
|
||||
else
|
||||
echo "::: sudo will be used."
|
||||
# Check if it is actually installed
|
||||
# If it isn't, exit because the install cannot complete
|
||||
if [[ $(dpkg-query -s sudo) ]];then
|
||||
echo "::: Running sudo -u pihole $@"
|
||||
sudo -u pihole "$@"
|
||||
exit $?
|
||||
else
|
||||
echo "::: Please install sudo."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
truncate -s 0 /var/log/pihole.log
|
||||
|
|
|
|||
60
advanced/Scripts/piholeReloadServices.sh
Normal file
60
advanced/Scripts/piholeReloadServices.sh
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
#!/usr/bin/env bash
|
||||
# Pi-hole: A black hole for Internet advertisements
|
||||
# (c) 2015, 2016 by Jacob Salmela
|
||||
# Network-wide ad blocking via your Raspberry Pi
|
||||
# http://pi-hole.net
|
||||
# Restarts pihole services
|
||||
#
|
||||
# Pi-hole is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
|
||||
# Check if root, and if not then rerun with sudo.
|
||||
echo ":::"
|
||||
if [[ $EUID -eq 0 ]];then
|
||||
echo "::: You are root."
|
||||
# Older versions of Pi-hole set $SUDO="sudo" and prefixed commands with it,
|
||||
# rather than rerunning as sudo. Just in case it turns up by accident,
|
||||
# explicitly set the $SUDO variable to an empty string.
|
||||
SUDO=""
|
||||
else
|
||||
echo "::: sudo will be used."
|
||||
# Check if it is actually installed
|
||||
# If it isn't, exit because the install cannot complete
|
||||
if [[ $(dpkg-query -s sudo) ]];then
|
||||
echo "::: Running sudo $@"
|
||||
sudo "$@"
|
||||
exit $?
|
||||
else
|
||||
echo "::: Please install sudo or run this script as root."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
spinner(){
|
||||
local pid=$1
|
||||
local delay=0.001
|
||||
local spinstr='/-\|'
|
||||
|
||||
spin='-\|/'
|
||||
i=0
|
||||
while kill -0 $pid 2>/dev/null
|
||||
do
|
||||
i=$(( (i+1) %4 ))
|
||||
printf "\b${spin:$i:1}"
|
||||
sleep .1
|
||||
done
|
||||
printf "\b"
|
||||
}
|
||||
|
||||
dnsmasqPid=$(pidof dnsmasq)
|
||||
|
||||
if [[ $dnsmasqPid ]]; then
|
||||
# service already running - reload config
|
||||
$SUDO kill -HUP $dnsmasqPid & spinner $!
|
||||
else
|
||||
# service not running, start it up
|
||||
$SUDO service dnsmasq start & spinner $!
|
||||
fi
|
||||
36
advanced/Scripts/piholeSetPermissions.sh
Normal file
36
advanced/Scripts/piholeSetPermissions.sh
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
#!/usr/bin/env bash
|
||||
# Pi-hole: A black hole for Internet advertisements
|
||||
# (c) 2015, 2016 by Jacob Salmela
|
||||
# Network-wide ad blocking via your Raspberry Pi
|
||||
# http://pi-hole.net
|
||||
# Sets permissions to pihole files and directories
|
||||
#
|
||||
# Pi-hole is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
|
||||
# Check if root, and if not then rerun with sudo.
|
||||
echo ":::"
|
||||
if [[ $EUID -eq 0 ]];then
|
||||
echo "::: You are root."
|
||||
# Older versions of Pi-hole set $SUDO="sudo" and prefixed commands with it,
|
||||
# rather than rerunning as sudo. Just in case it turns up by accident,
|
||||
# explicitly set the $SUDO variable to an empty string.
|
||||
SUDO=""
|
||||
else
|
||||
echo "::: sudo will be used."
|
||||
# Check if it is actually installed
|
||||
# If it isn't, exit because the install cannot complete
|
||||
if [[ $(dpkg-query -s sudo) ]];then
|
||||
echo "::: Running sudo $@"
|
||||
sudo "$@"
|
||||
exit $?
|
||||
else
|
||||
echo "::: Please install sudo or run this script as root."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
chown --recursive root:pihole /etc/pihole
|
||||
chmod --recursive ug=rwX,o=rX /etc/pihole
|
||||
|
|
@ -10,6 +10,28 @@
|
|||
# the Free Software Foundation, either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
|
||||
# Check if root, and if not then rerun with sudo.
|
||||
echo ":::"
|
||||
if [[ $EUID -eq 0 ]];then
|
||||
echo "::: You are root."
|
||||
# Older versions of Pi-hole set $SUDO="sudo" and prefixed commands with it,
|
||||
# rather than rerunning as sudo. Just in case it turns up by accident,
|
||||
# explicitly set the $SUDO variable to an empty string.
|
||||
SUDO=""
|
||||
else
|
||||
echo "::: sudo will be used."
|
||||
# Check if it is actually installed
|
||||
# If it isn't, exit because the install cannot complete
|
||||
if [[ $(dpkg-query -s sudo) ]];then
|
||||
echo "::: Running sudo $@"
|
||||
sudo "$@"
|
||||
exit $?
|
||||
else
|
||||
echo "::: Please install sudo or run this script as root."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
############ FUNCTIONS ###########
|
||||
# Run this script as root or under sudo
|
||||
echo ":::"
|
||||
|
|
@ -45,11 +67,11 @@ getInitSys() {
|
|||
autoLoginPiToConsole() {
|
||||
if [ -e /etc/init.d/lightdm ]; then
|
||||
if [ $SYSTEMD -eq 1 ]; then
|
||||
$SUDO systemctl set-default multi-user.target
|
||||
$SUDO ln -fs /etc/systemd/system/autologin@.service /etc/systemd/system/getty.target.wants/getty@tty1.service
|
||||
systemctl set-default multi-user.target
|
||||
ln -fs /etc/systemd/system/autologin@.service /etc/systemd/system/getty.target.wants/getty@tty1.service
|
||||
else
|
||||
$SUDO update-rc.d lightdm disable 2
|
||||
$SUDO sed /etc/inittab -i -e "s/1:2345:respawn:\/sbin\/getty --noclear 38400 tty1/1:2345:respawn:\/bin\/login -f pi tty1 <\/dev\/tty1 >\/dev\/tty1 2>&1/"
|
||||
update-rc.d lightdm disable 2
|
||||
sed /etc/inittab -i -e "s/1:2345:respawn:\/sbin\/getty --noclear 38400 tty1/1:2345:respawn:\/bin\/login -f pi tty1 <\/dev\/tty1 >\/dev\/tty1 2>&1/"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
|
@ -62,27 +84,27 @@ autoLoginPiToConsole
|
|||
# Set chronomter to run automatically when pi logs in
|
||||
echo /usr/local/bin/chronometer.sh >> /home/pi/.bashrc
|
||||
# OR
|
||||
#$SUDO echo /usr/local/bin/chronometer.sh >> /etc/profile
|
||||
#echo /usr/local/bin/chronometer.sh >> /etc/profile
|
||||
|
||||
# Set up the LCD screen based on Adafruits instuctions:
|
||||
# https://learn.adafruit.com/adafruit-pitft-28-inch-resistive-touchscreen-display-raspberry-pi/easy-install
|
||||
curl -SLs https://apt.adafruit.com/add-pin | $SUDO bash
|
||||
$SUDO apt-get -y install raspberrypi-bootloader
|
||||
$SUDO apt-get -y install adafruit-pitft-helper
|
||||
$SUDO adafruit-pitft-helper -t 28r
|
||||
curl -SLs https://apt.adafruit.com/add-pin | bash
|
||||
apt-get -y install raspberrypi-bootloader
|
||||
apt-get -y install adafruit-pitft-helper
|
||||
adafruit-pitft-helper -t 28r
|
||||
|
||||
# Download the cmdline.txt file that prevents the screen from going blank after a period of time
|
||||
$SUDO mv /boot/cmdline.txt /boot/cmdline.orig
|
||||
$SUDO curl -o /boot/cmdline.txt https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/cmdline.txt
|
||||
mv /boot/cmdline.txt /boot/cmdline.orig
|
||||
curl -o /boot/cmdline.txt https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/cmdline.txt
|
||||
|
||||
# Back up the original file and download the new one
|
||||
$SUDO mv /etc/default/console-setup /etc/default/console-setup.orig
|
||||
$SUDO curl -o /etc/default/console-setup https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/console-setup
|
||||
mv /etc/default/console-setup /etc/default/console-setup.orig
|
||||
curl -o /etc/default/console-setup https://raw.githubusercontent.com/pi-hole/pi-hole/master/advanced/console-setup
|
||||
|
||||
# Instantly apply the font change to the LCD screen
|
||||
$SUDO setupcon
|
||||
setupcon
|
||||
|
||||
$SUDO reboot
|
||||
reboot
|
||||
|
||||
# Start showing the stats on the screen by running the command on another tty:
|
||||
# http://unix.stackexchange.com/questions/170063/start-a-process-on-a-different-tty
|
||||
|
|
|
|||
|
|
@ -23,6 +23,29 @@ if [[ $# = 0 ]]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
# Check if pihole user, and if not then rerun with sudo.
|
||||
echo ":::"
|
||||
runninguser=$(whoami)
|
||||
if [[ "$runninguser" = "pihole" ]];then
|
||||
echo "::: You are pihole user."
|
||||
# Older versions of Pi-hole set $SUDO="sudo" and prefixed commands with it,
|
||||
# rather than rerunning as sudo. Just in case it turns up by accident,
|
||||
# explicitly set the $SUDO variable to an empty string.
|
||||
SUDO=""
|
||||
else
|
||||
echo "::: sudo will be used."
|
||||
# Check if it is actually installed
|
||||
# If it isn't, exit because the install cannot complete
|
||||
if [[ $(dpkg-query -s sudo) ]];then
|
||||
echo "::: Running sudo -u pihole $@"
|
||||
sudo -u pihole "$@"
|
||||
exit $?
|
||||
else
|
||||
echo "::: Please install sudo."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
#globals
|
||||
whitelist=/etc/pihole/whitelist.txt
|
||||
adList=/etc/pihole/gravity.list
|
||||
|
|
@ -162,15 +185,11 @@ function Reload() {
|
|||
# Reload hosts file
|
||||
echo ":::"
|
||||
echo -n "::: Refresh lists in dnsmasq..."
|
||||
dnsmasqPid=$(pidof dnsmasq)
|
||||
|
||||
if [[ $dnsmasqPid ]]; then
|
||||
# service already running - reload config
|
||||
sudo kill -HUP $dnsmasqPid
|
||||
else
|
||||
# service not running, start it up
|
||||
sudo service dnsmasq start
|
||||
fi
|
||||
# Reloading services requires root.
|
||||
# The installer should have created a file in sudoers.d to allow pihole user
|
||||
# to run piholeReloadServices.sh as root with sudo without a password
|
||||
sudo --non-interactive /usr/local/bin/piholeReloadServices.sh
|
||||
echo " done!"
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue