Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-27 07:12:27 +00:00
Code Issues Projects Releases Packages Wiki Activity
5525 commits 10 branches 109 tags 28 MiB
Commit graph

5525 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
7a3add3a2e Merge pull request #72 from dschaper/master 
Change shell path to environment
 2015-11-14 20:02:28 -06:00
Dan Schaper
3992c0fba8 Merge pull request #5 from dschaper/dschaper-patch-1 
Change shebang to environment
 2015-11-14 15:09:22 -08:00
Dan Schaper
763aa6aa5c Change shebang to environment 
Find bash in the environment, not hard coded to path
 2015-11-11 00:43:00 -08:00
Jacob Salmela
ce0ca3cc61 for use with /etc/crontab 
Adding a system-wide crontab to update the ad source lists, flush the
log daily, and (eventually) record the stats for historical purposes.
 2015-11-07 07:58:35 -06:00
Dan Schaper
5495f23e4e Merge pull request #3 from jacobsalmela/master 
Upstream sync
 2015-11-06 15:47:58 -08:00
Jacob Salmela
e9bd7b1d47 Merge pull request #70 from jacobsalmela/development 
Merge development changes
 2015-11-06 17:29:29 -06:00
Jacob Salmela
a7d1b0b42c Revert "theme addition" 
This reverts commit e1b8419a07.
 2015-11-06 17:17:14 -06:00
Jacob Salmela
e1b8419a07 theme addition 
Further adherence to the science/star trek theme
 2015-11-06 17:16:14 -06:00
Jacob Salmela
932d410b66 anal retentive changes 
OCD
 2015-11-06 17:14:05 -06:00
Jacob Salmela
c297a86211 decluttering output 
I love the adherence to the theme, but this line makes it difficult to
quickly read what is happening.
 2015-11-06 17:10:17 -06:00
Jacob Salmela
1b65193fe4 new hostsfile url 
This seems to be the more appropriate URL:
http://hosts-file.net/ad_servers.txt.

I compared it to the original URL using opendiff and they are exactly
the same.
 2015-11-06 17:05:04 -06:00
Jacob Salmela
a06098bb16 remove filename from whitelist output 
I also cleared the whitespace (or rather, Atom did).
I moved the pinhole.conf to it's current location
I commented out mahakala
 2015-11-06 17:03:55 -06:00
Jacob Salmela
a675dc3f2c Merge pull request #68 from dschaper/hawson-reduce-memory 
Hawson reduce memory
 2015-11-06 16:50:37 -06:00
Dan Schaper
15b9fb68d7 Remove filename from wc 
Line 118 and Line 127 changed wc to remove filename from output.
 2015-11-06 10:24:12 -08:00
Dan Schaper
642c31c361 Theme changes 2015-11-05 18:33:05 -08:00
Dan Schaper
8e21488542 hawson memory reductions 2015-11-05 18:22:17 -08:00
Dan Schaper
deb6e76e08 Merge pull request #1 from dschaper/hawson-reduce-memory 
Upstream Branch pseudo-rebase
 2015-11-05 18:11:43 -08:00
Dan Schaper
23eece9443 Upstream Branch pseudo-rebase 2015-11-05 18:11:34 -08:00
Jacob Salmela
1b51b9ade3 for use as a cron job 
The log will be flushed daily and stats will be stored in a DB for
displaying on the Web interface.
 2015-11-05 14:31:38 -06:00
Jacob Salmela
a36352dfb6 Merge pull request #58 from Giermann/patch-1 
add whitespace after $piholeIP
 2015-11-04 21:02:58 -06:00
Jacob Salmela
271163ed66 Merge pull request #61 from nathanpjones/improve-whitelist-script 
Improve whitelisting script
 2015-11-04 20:35:42 -06:00
Jacob Salmela
3290dbbe48 link to Sky-Hole fork 
Pi-hole in the cloud with Sky-Hole.
 2015-10-31 17:09:21 -05:00
Jacob Salmela
d9aa19d2cd Link to Security Now! mention 2015-10-27 18:22:54 -05:00
Jacob Salmela
58e4fbd0fb New, easier-to-remember installation command 
Also a picture of the Web interface and how to access it since it is now included in the automated installer.
 2015-10-27 17:59:01 -05:00
Jacob Salmela
ec7bbd4ca8 Merge pull request #63 from jacobsalmela/installation 
Installs the Web interface now
 2015-10-27 17:28:28 -05:00
Jacob Salmela
2f9e650739 Merge pull request #62 from jacobsalmela/lighttpd 
New lighttpd.conf.  Closes #31 and #50
 2015-10-27 17:26:45 -05:00
Jacob Salmela
4ad2b68ee1 reverting IPv6 so I can merge lighttpd.conf 2015-10-27 17:16:17 -05: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
Nathan Jones
deb48c124f Improve whitelisting script 
Match domain exactly instead of partially.
Gather list of domains to minimize number of times that hosts file must be enumerated.
Only add domain to whitelist if it isn't already present.
 2015-10-25 16:53:20 -07:00
Jacob Salmela
ca9ca36315 Merge pull request #60 from ManuCart/patch-1 
Update basic-install.sh
 2015-10-24 19:20:49 -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
Sven Giermann
d5ffec64f2 add whitespace after $piholeIP 
In my case there had been no whitespace in piholeIP (I configured it statically because 'hostname -I' returns multiple IP addresses, which ends in errornous hosts file), so it's more safe to add one between IP and hostname.

Further, I removed the obsolete latentBlacklist variable.
 2015-10-22 15:17:44 +02:00
Jacob Salmela
17904b3106 ads still get blocked when a 404 happens 2015-10-17 12:12:51 -05:00
Jacob Salmela
7b16a42f31 conditionals for accessing the web interface 
This adds in some back end improvements for better debugging.  It also
allows you to access the Web interface, while you are connected to the
Pi-hole, which resolves #31
 2015-10-17 12:11:03 -05:00
Jacob Salmela
28dd956449 changing web server root folder 
Since the version of lighted in Jessie moved the default folder to
/var/www/html, I am going to make it the same for wheezy for better
compatibility.

Also removed spaces
 2015-10-17 12:04:49 -05:00
Jacob Salmela
bf397db73e adding crontab file 
I plan to use this to be deployed with the automatic installer.  Just
pushing the file for now so I can test download it.
 2015-10-15 18:58:12 -05:00