arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-10-18 22:09:04 +00:00
Code Issues Releases Wiki Activity
868 Commits 9 Branches 109 Tags 18 MiB
682113892a
Commit Graph

258 Commits

Author SHA1 Message Date
Dan Schaper
e99be28a73 Variable missing $ 2016-01-25 02:31:03 -08:00
Dan Schaper
32389e4ab8 Terminate string with missing quote 2016-01-25 02:27:44 -08:00
Adam Warner
01d7fc0ac9 Removed apt-get update/upgrade, instead checking for updates availible and advising user to update/upgrade after installation of pi-hole. Addresses issue #218 2016-01-25 10:07:12 +00:00
Chad Howell
d74c8261aa dnsFile2="/etc/dnsmasq.conf.orig" 
added .orig
 2016-01-25 01:38:41 -05:00
Chad Howell
ac373545d0 versionCheckDNSmasq() fixups 
versionCheckDNSmasq() fixups per dschaper's suggestions.
 2016-01-25 01:27:10 -05:00
Chad Howell
a21948d2c6 Typo fix 
Typo fix
 2016-01-25 01:09:45 -05:00
Chad Howell
940480effe Revert "Fix backup to use new 01-pihole.conf location" 
This reverts commit 0c444e6f2b.
 2016-01-25 00:57:36 -05:00
Chad Howell
29c593b8b0 Add user pihole if user does not exsist 
Check if user pihole exist and add if not.  This will give pihole its
own system user without a login or home directory that is not system
dependent.
 2016-01-25 00:28:53 -05:00
Chad Howell
0c444e6f2b Fix backup to use new 01-pihole.conf location 
Fix backup to use new 01-pihole.conf location
 2016-01-25 00:12:51 -05:00
Chad Howell
6cf6e16d22 Add ability to choose upstream DNS servers 
Give the user the ability to choose between Google and DynDNS upstream
servers.  Then insert the chosen DNS servers in to
/etc/dnsmasq.d/01-pihole.conf.  Todo: extend choices to include manually
entered DNS servers.
 2016-01-25 00:11:00 -05:00
Chad Howell
e5f9663a0e Move dnsmasq.conf to dnsmasq.d/01-pihole.conf 
Check if /etc/dnsmasq.conf is from pihole.  If so, replace with an
original and install new in .d directory.  Add and unmolested version of
dnsmasq.conf to the ./advanced directory.
 2016-01-25 00:04:02 -05:00
Promofaux
eec14be10d add $SUDO into spinner control. 2016-01-24 21:19:23 +00:00
Promofaux
c179936b54 add $SUDO 2016-01-24 20:49:37 +00:00
Promofaux
649a565801 run apt-get install as sudo when resolving dependencies 2016-01-24 20:35:24 +00:00
Promofaux
2d4ebf5eb5 FIX CONFLICTS 2016-01-24 20:29:22 +00:00
Promofaux
754beed3a1 Bring up to date with master 2016-01-24 20:22:41 +00:00
Promofaux
9f0927351d Merge from #236 2016-01-24 18:49:25 +00:00
Promofaux
736edf44e4 Added date check before running apt-get update/upgrade. Wont run apt-get update/upgrade if it has already been run today 2016-01-24 17:53:27 +00:00
Promofaux
8a74942da7 Cleaned up output before running gravity.sh 2016-01-24 16:41:11 +00:00
Promofaux
2fe42138c7 removed a space 2016-01-24 16:37:15 +00:00
Promofaux
1563146918 improvements to git functions (passing parameters). Added >/dev/null to attempt to supress output from apt-get upgrade 2016-01-24 16:33:53 +00:00
Promofaux
cf3aea8075 uncomment the apt-get update/upgrade! 2016-01-24 15:27:40 +00:00
Promofaux
6cea480210 Huge update! Base files now cloned from github (or updated if already existing) and copied out to the correct directories. Web admin interface is now cloned from hithub (or updated if already existing). Packages are checked before we go ahead and try to install them anyway. 2016-01-24 03:31:12 +00:00
Promofaux
206717828b Improve spinner function. 2016-01-23 22:25:30 +00:00
Chad Howell
316d26ede2 Add unzip to the dependencies 
unzip is required for the install script to complete.  Some distros do
not have it installed by default.
 2016-01-23 16:29:52 -05:00
Promofaux
e8b8fb0835 s 2016-01-23 00:23:32 +00:00
Promofaux
6663ced38d Initial commit 2016-01-23 00:13:16 +00:00
Promofaux
c99a8a9b15 initial commit 2016-01-22 20:30:32 +00:00
Dan Schaper
ea0fb15ff2 Move creation of pihole directory out of IPv6 function 2016-01-22 19:48:55 +00:00
Adam Warner
05a59b17be Changed URLs in installScripts() to match new organisation links 2016-01-22 16:50:01 +00:00
Kenneth Koski
ce578534fe Fixing minor typos in basic-install.sh 2016-01-21 11:33:49 -06:00
Promofaux
3f40a95929 Whoops, should probably commit more often. Massive overhaul. Cleaned up output, less verbose (will still output errors, but gets rid of anything not needed) Added a spinner so users don't think it has stalled 2016-01-20 23:34:18 +00:00
Promofaux
5c25c42da8 Make installPiholeWeb() more inteliigent. Checks for existence of /var/www/html/pihole, and only downloads from repo if it does not exist. Will stop install script from overwriting any tweaks users have made to index.html 2016-01-20 22:14:17 +00:00
Promofaux
96011bc2ae make InstallWebAdmin() a bit more intelligent, and less verbose. Checks if installing over an existing installation, and if so, will remove existing webadmin folder. 2016-01-20 22:02:54 +00:00
Promofaux
4f59577fd1 Remove SUDO from line that runs gravity.sh to stop files in /etc/pihole being owned by root 2016-01-20 21:20:52 +00:00
Promofaux
bc51f88805 Check if any list.* files exist from previous installation, if they do delete them. 2016-01-19 22:52:29 +00:00
jacobsalmela
0a0f00da3b fixes #169 
exits if sudo is not installed when run as a regular user
 2016-01-16 14:10:03 -06:00
jacobsalmela
bee109c784 better uninstall 
More from JoshKastang.  This closes #153 as it is the last step from
his ideas.
 2016-01-16 13:56:08 -06:00
jacobsalmela
5d608a2db5 leave system cron alone 
Taking JoshKastang’s idea from #153, the system cron file will be left
alone and the pihole.cron gets its own.
 2016-01-16 13:48:29 -06:00
jacobsalmela
7c6ef0cfd0 privileged install 
This puts sudo in a variable if run as a regular user.  If already
running as root, the script proceeds as normal.  Not a perfect fix, but
should help for install on other systems.
 2016-01-16 13:40:09 -06:00
Jacob Salmela
0cf859344a Merge pull request #176 from xd1936/patch-1 
Install Figlet Fonts with Toilet
 2016-01-16 13:19:15 -06:00
jacobsalmela
6125b2520b install git for updateDashboard.sh 
I also download and chmod the script
 2016-01-16 13:15:44 -06:00
jacobsalmela
bd5ed2bcf0 move webinterface.sh into scripts folder 
I also renamed it to make it is easier to identify.
 2016-01-16 13:12:55 -06:00
Leo
665dfdfe8e Install Figlet Fonts with Toilet 
Some OS' don't have Figlet Fonts, which causes `chronometer.sh` to have `error: font small not found` instead of the pretty "Pi-hole" display
 2016-01-15 18:50:32 -05:00
Adam Warner
6b1f14647c add reference to blacklist.sh 2016-01-15 15:52:27 +00:00
Josh Kastang
802638ce8b replaces the non-repository managed web interface for pihole and keeps it updated 2016-01-10 19:08:29 +00:00
Jacob Salmela
6f9d2d0567 fixes #145 
A much more elegant way to get the screen size.
 2016-01-02 17:20:33 -06:00
Clinton
bc3224e0b9 installer - only select first (probably default) interface in list instead of all 2016-01-02 22:10:26 +00:00
Salmela
d37db4304c A few small display changes 
IPv6 box was missing the title.
Added some IPv6 echoes.
 2016-01-01 10:59:30 -06:00
Salmela
d646612a25 Block ads over IPv6 
I’m pretty sure this works well.  Maybe someone else can try it out.
 2015-12-31 20:26:05 -06:00
Clinton Montague
b757e7a769 Fix typo in installer 
IPv4 was mentioned in an IPv6 setting - changed to correctly reference IPv6.
 2015-12-28 12:29:54 +00:00
Jacob Salmela
184d1bd046 fixes #126 
These commands were left out, resulting in the Web interface not showing ads blocked despite the Pi-hole working.  It is just a permissions error.
 2015-12-16 11:23:44 -06:00
Dan Schaper
4027139d9c More merge conflict resolution 2015-12-06 20:24:58 -08:00
Dan Schaper
d215fa9ade Resolve merge confict 2015-12-06 20:22:34 -08:00
Dan Schaper
dcccb2ee2b Merge branch 'bug/multipleIP' into development 2015-12-06 11:58:02 -08:00
Dan Schaper
412a190b42 Basic-install.sh should only show one ip address in whiptail screen. 2015-12-06 11:05:09 -08:00
Dan Schaper
d2b260fc1e Log file is automatically generated by dnsmasq, no need to create. 2015-12-06 10:29:59 -08:00
Dan Schaper
22d0e82d92 Add GPL V2+ header 2015-12-06 06:31:49 -08:00
Dan Schaper
7cf5320f50 Only write to dhcpcd.conf if address isn't set 2015-12-06 02:40:30 -08:00
Dan Schaper
9421366e4f Breakout basic-install.sh to functions 2015-12-03 09:25:13 -08:00
Jacob Salmela
bc0a8e7733 final dialog verbiage 
Updating dialog to reflect changes in #90
 2015-11-25 18:08:17 -06:00
Dan Schaper
b011fe28d9 No longer need a reboot 2015-11-25 14:34:06 -08:00
Dan Schaper
6e13134328 Revert FHS change until merged 2015-11-25 13:55:32 -08:00
Dan Schaper
29ae66c6db Check IP info for outgoing interface 2015-11-25 13:43:59 -08:00
Jacob Salmela
464003d674 uninstall script 
This should remove the Pi-hole.
 2015-11-25 13:36:39 -08:00
Jacob Salmela
d0d165ad16 chmod the log flusher 2015-11-15 13:14:56 +00:00
Jacob Salmela
0cb20fc080 typo 2015-11-15 13:14:46 +00:00
Jacob Salmela
dee3df4e11 download master gravity 2015-11-15 13:14:33 +00:00
Jacob Salmela
814873c643 reboot logic 2015-11-15 13:14:22 +00:00
Jacob Salmela
0936e394d4 reboot only if new IP was set 2015-11-15 13:14:07 +00:00
Jacob Salmela
ad91eb44fb choose an interface 
also fixing ipv6 logic
 2015-11-15 13:13:21 +00:00
Jacob Salmela
76c217d9cc moving to functions 
Also download the whitelist script.  Ask for donations for IPv6 support.
 2015-11-15 13:13:07 +00:00
Jacob Salmela
46b4000e75 reboot works better 2015-11-15 13:12:55 +00:00
Jacob Salmela
8ac8aa72ce Closing dialog 
Also starting the Pi-hole and restarting networking.
 2015-11-15 13:12:41 +00:00
Jacob Salmela
8df376860c simple function to run install commands 
The arrays were cool, but I think this just works easier.
 2015-11-15 13:12:30 +00:00
Jacob Salmela
eec0a31216 trying text output 
I commented out the whiptail dialog at the end in place of text so you
can see what is going on.  I also install the crontab.
 2015-11-15 13:12:16 +00:00
Jacob Salmela
fb3fde3d19 testing with no reboot 2015-11-15 13:12:04 +00:00
Jacob Salmela
1482b9563c does gravity use static IP? 
The changes to the gravity script check for a temp file containing the
static address set during the install.  I need to verify it works so I
have to change the URL.  I will change it back before merging with
master.
 2015-11-15 13:11:49 +00:00
Jacob Salmela
6d989f9160 overwrite html folder 
If the files already exist, the installer stalls out because it asks if
you want to replace the existing files.  the -o option forces an
overwrite.
 2015-11-15 13:11:29 +00:00
Jacob Salmela
f37990351e dumb mistake 
fixed the variable name
 2015-11-15 13:11:21 +00:00
Jacob Salmela
a44591ca6b fix permission denied for log file 
Just use a temporary file and then move it over once the install is
complete.
 2015-11-15 13:11:03 +00:00
Jacob Salmela
37f255d761 save output to log file instead 
Since the progress bar hides the output now.  Instead of destroying it,
send it to a log file instead so users who want to see it still can.
 2015-11-15 13:10:43 +00:00
Jacob Salmela
72cf5c91a5 set static ip and suppress more output 
Created a function to set a static IP address.

I also sent STDOUT and STDERR to /dev/null so it doesn't mangle the
progress bar.  When the device reboots, it still gets mangled a bit
(via ssh).
 2015-11-15 13:10:26 +00:00
Jacob Salmela
dfe1b126c4 progress dialog working 
The ellipses cause errors, so they were removed.

I was on the right track with the associate array, but it would
previously execute the commands out of order.  Following directions
from the URL in the comments, I made another array that helps keep the
array in the order.
 2015-11-15 13:10:09 +00:00
Jacob Salmela
4229a3e5e9 whiptail revamp of install script 
This is a large update that helps users install the Pi-hole a bit
easier by using some dialog windows and also letting the user set a
static IP (I still need to figure out how to actually set the address
in the system, but everything else having to do with the install script
works).
 2015-11-15 13:07:03 +00:00
Jacob Salmela
7a0b92d2c1 missed a few file paths 2015-10-27 17:03:48 -05:00
Jacob Salmela
cfc4697236 Download and install the Web interface 
dnsmasq also needs to be able to read the log file to properly display
the statistics
 2015-10-27 16:21:20 -05:00
Jacob Salmela
bc3ece778d /var/www/html instead of /var/www 
lighttpd in Jessie uses /var/www/html for the root folder, so in order
to only edit one lightpd.conf file, the installer will create the
correct directory even if not being run on Jessie.
 2015-10-27 16:19:01 -05:00
Jacob Salmela
6d0c67af9a Install and enable PHP 
Needed to view the admin web interface
 2015-10-27 16:16:22 -05:00
Emmanuel CHARETTE
ced96905e9 Update basic-install.sh 
change `shutdown -r now` to reboot for ssh users
 2015-10-24 21:55:31 +02:00
mospaeda
06e89614e9 Dnsutils package missing for dig tool 2015-10-05 23:58:15 +02:00
mospaeda
7b49677d24 add install for bc and toilet tools 
these tools are needed later by chronometer.sh
 2015-09-22 22:38:25 +02:00
mospaeda
56d4b7b0f7 Update basic-install.sh 2015-09-22 22:13:16 +02:00
mospaeda
96bc557e21 Update basic-install.sh 2015-09-22 22:11:30 +02:00
mospaeda
11fcfc4bf5 Update basic-install.sh 2015-09-22 22:10:33 +02:00
mospaeda
6fc798ebe4 Update basic-install.sh 2015-09-18 00:40:21 +02:00
mospaeda
2b4500363b Update basic-install.sh 2015-09-18 00:31:17 +02:00
mospaeda
2d91a7a3c4 Update basic-install.sh 2015-09-18 00:22:21 +02:00
mospaeda
d15a085dd0 Update basic-install.sh 2015-09-18 00:20:50 +02:00
mospaeda
8718321727 Update basic-install.sh 2015-09-18 00:06:04 +02:00
Mathias
46bda342a9 Fix URL of chronometer.sh 
Github URLs seems to be case-sensitive. Now the chronometer.sh souldn't contain "Not Found" anymore. ;)
 2015-08-10 22:50:06 +02:00
jacobsalmela
6953c02402 detect original pihole and backup 
Detects if the Pi had an original Pi-hole by looking for adList.conf.
If it exists, it backs up all the files to /etc/pihole/original.  Then,
the script continues as normal and creates the new files.  This helps
ensure that /etc/hosts and /etc/dnsmasq.d/adList.conf are not being
used simultaneously.
 2015-06-21 07:53:29 -05:00
jacobsalmela
a2350ba880 misspelled "install" 2015-06-16 17:23:48 -05:00
jacobsalmela
56c776af22 hosts format script 2015-05-19 13:31:37 -05:00
jacobsalmela
fe4e579005 working copy (I think) 
for use with the upcoming Raspberry Pi, ad-blocking, wireless router.
 2015-02-08 17:17:45 -06:00
jacobsalmela
55ebc0e492 fixing dns 2014-12-20 13:10:58 -06:00
jacobsalmela
ea5616d3b3 escaping ascii art 2014-12-20 12:44:36 -06:00
jacobsalmela
4ba3ba2ef5 initial commit - unstable 2014-12-20 12:43:10 -06:00