Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-04-23 15:50:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/arevindh/pi-hole

Browse source
This commit is contained in:
Siddhu 2017-12-08 00:43:55 +05:30
commit 5a7fbfaf47
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
advanced/Scripts/webpage.sh
View file

@ -37,17 +37,15 @@ Options:
-e, email Set an administrative contact address for the Block Page -e, email Set an administrative contact address for the Block Page
-h, --help Show this help dialog -h, --help Show this help dialog
-i, interface Specify dnsmasq's interface listening behavior -i, interface Specify dnsmasq's interface listening behavior
<<<<<<< HEAD
Add '-h' for more info on interface usage Add '-h' for more info on interface usage
-s, speedtest Set speedtest intevel , user 0 to disable Speedtests -s, speedtest Set speedtest intevel , user 0 to disable Speedtests
use -sn to prevent logging to results list use -sn to prevent logging to results list
-sd Set speedtest display range -sd Set speedtest display range
-sn Run speedtest now
-sc Clear speedtest data -sc Clear speedtest data
-ss Set custom server" -ss Set custom server"
=======
Add '-h' for more info on interface usage" Add '-h' for more info on interface usage"
>>>>>>> 5ba413569ea8a4220c7e3bd2fa8c28b33b9e8492
exit 0 exit 0
} }

7
automated install/basic-install.sh
View file

@ -42,7 +42,7 @@ coltable=/opt/pihole/COL_TABLE
# We store several other folders and # We store several other folders and
webInterfaceGitUrl="https://github.com/pi-hole/AdminLTE.git" webInterfaceGitUrl="https://github.com/pi-hole/AdminLTE.git"
webInterfaceDir="/var/www/html/admin" webInterfaceDir="/var/www/html/admin"
piholeGitUrl="https://github.com/pi-hole/pi-hole.git" piholeGitUrl="https://github.com/arevindh/pi-hole.git"
PI_HOLE_LOCAL_REPO="/etc/.pihole" PI_HOLE_LOCAL_REPO="/etc/.pihole"
# These are the names of piholes files, stored in an array # These are the names of piholes files, stored in an array
PI_HOLE_FILES=(chronometer list piholeDebug piholeLogFlush setupLCD update version gravity uninstall webpage) PI_HOLE_FILES=(chronometer list piholeDebug piholeLogFlush setupLCD update version gravity uninstall webpage)
@ -390,6 +390,9 @@ welcomeDialogs() {
# Request that users donate if they enjoy the software since we all work on it in our free time # Request that users donate if they enjoy the software since we all work on it in our free time
whiptail --msgbox --backtitle "Plea" --title "Free and open source" "\\n\\nThe Pi-hole is free, but powered by your donations: http://pi-hole.net/donate" ${r} ${c} whiptail --msgbox --backtitle "Plea" --title "Free and open source" "\\n\\nThe Pi-hole is free, but powered by your donations: http://pi-hole.net/donate" ${r} ${c}
#Display speedtest mod dialog
whiptail --msgbox --backtitle "Speedtest Mod" --title "Speedtest Mod Included" "\n\nSpeedtestMod faq @ https://goo.gl/7FSZ43" ${r} ${c}
# Explain the need for a static address # Explain the need for a static address
whiptail --msgbox --backtitle "Initiating network interface" --title "Static IP Needed" "\\n\\nThe Pi-hole is a SERVER so it needs a STATIC IP ADDRESS to function properly. whiptail --msgbox --backtitle "Initiating network interface" --title "Static IP Needed" "\\n\\nThe Pi-hole is a SERVER so it needs a STATIC IP ADDRESS to function properly.
@ -1918,7 +1921,7 @@ main() {
if command -v sudo &> /dev/null; then if command -v sudo &> /dev/null; then
echo -e "${OVER} ${TICK} Sudo utility check" echo -e "${OVER} ${TICK} Sudo utility check"
# Download the install script and run it with admin rights # Download the install script and run it with admin rights
exec curl -sSL https://raw.githubusercontent.com/pi-hole/pi-hole/master/automated%20install/basic-install.sh | sudo bash "$@" exec curl -sSL https://raw.githubusercontent.com/arevindh/pi-hole/master/automated%20install/basic-install.sh | sudo bash "$@"
exit $? exit $?
# Otherwise, # Otherwise,
else else