tyler.durden
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,633 Commits 8 Branches 109 Tags 31 MiB
Commit Graph

463 Commits

Author SHA1 Message Date
trinapicot 0a423ffd40 Fix check for lighttpd install before configuration directory removal 2016-12-07 20:31:34 -07:00
trinapicot 870454330d Add check for lighty.conf before trying to move it 2016-12-02 13:54:11 -07:00
Dan Schaper d53a3af191 Merge pull request #899 from diginc/configureFirewall_unittest 
Configure firewall unittest
 2016-11-19 11:07:38 -08:00
Mcat12 bd61f38169 Merge pull request #926 from zbholman/patch-2 
Added removal of pihole user to the uninstall.sh
 2016-11-16 17:31:56 -05:00
zbholman cac9c63325 Added removal of pihole user to the uninstall.sh 
Not sure if I should have created a variable for the username or if the echo is necessary. And this is my first time doing a pull request, hopefully it works out lol.
 2016-11-16 17:06:30 -05:00
Hayden Knowles 86d3ca48ae moved newline to correct place 2016-11-15 22:40:57 +13:00
Dan Schaper e9475a9739 Merge pull request #887 from brontide/dependancy_cleanup 
Dependancy cleanup
 2016-11-07 21:45:23 -08:00
bcambl 0caa44e979 write ifcfg instead of appending 2016-11-07 12:54:31 -06:00
diginc b9f3493dbc move PH_TRUE to Dockerfiles to DRY 2016-11-03 22:34:04 -05:00
diginc 633095aee1 switch to consistent style 2016-11-02 22:13:05 -05:00
Eric Warnke 71005e1db3 Merge with change of spacing in development 2016-11-02 19:01:34 -04:00
Promofaux c452a4569e .js 2016-11-02 21:17:00 +00:00
Promofaux a182a208dc Tidy up output 2016-11-02 21:06:12 +00:00
Promofaux d273b4b48b Check for missing index.html, replace if missing. 2016-11-02 20:57:56 +00:00
Promofaux b429e890ad move web interface message inside "if not update" block. Check for pi-hole deps AFTER whiptails 2016-11-02 20:16:36 +00:00
Dan Schaper 6d415a7384 Merge pull request #894 from diginc/InstallFixes_UnitTests 
Unit tests framework and some basic tests
 2016-11-02 09:42:20 -07:00
Dan Schaper 8b9f0487c0 Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks 
# Conflicts:
#	advanced/Scripts/update.sh
#	automated install/basic-install.sh
 2016-11-02 06:57:33 -07:00
Adam Warner 50bd8b4a09 Further tweaks to local repo handling 2016-11-02 13:34:57 +00:00
Dan Schaper 7740e4268c Consistency and standards basic-install start. 2016-11-02 05:17:28 -07:00
Adam Warner 3df2ef8587 Cherry picking f6f6f6d, conflict fix 2016-11-02 04:31:28 -07:00
Adam Warner 354309fcad set QUERY_LOGGING default to true 2016-11-02 04:28:58 -07:00
Adam Warner edd00e8e70 consistency 2016-11-02 04:12:37 -07:00
Adam Warner 82e7de2aaa Account for variable name changes 2016-11-02 04:12:21 -07:00
Adam Warner b723714c0c Convention : https://google.github.io/styleguide/shell.xml?showone=Constants_and_Environment_Variable_Names#Constants_and_Environment_Variable_Names 2016-11-02 04:12:06 -07:00
Adam Warner a2903b6e63 Consistency 2016-11-02 04:11:54 -07:00
Dan Schaper 9a1876571b Prototype `whiptails` so they don't fall to shell. Need to do this to all functions. 2016-11-02 04:11:41 -07:00
Dan Schaper c07d7165ab Global variables CAP'ed 2016-11-02 04:11:27 -07:00
Dan Schaper d695c5972f `local` variables just to be safe and make sure they stay in this function. 2016-11-02 04:11:09 -07:00
Dan Schaper bbc09ed313 Swap variable names. 2016-11-02 04:10:57 -07:00
Promofaux 617a147706 Wording adjustment 2016-11-02 04:10:29 -07:00
Promofaux d4dccfdb2d Cherry pick 229439c 2016-11-02 04:08:53 -07:00
Dan Schaper d9528dfd09 Bash is funny with returns. 2016-11-02 00:51:38 -07:00
Dan Schaper 12f5f8ba00 Begin to bring code up to Pi-hole conventions. Block installScripts and begin factoring out redundant code. 2016-11-02 00:14:25 -07:00
Dan Schaper db0f3307e0 Only take out scripts in the directory, don't remove the directory as a whole. Need this for the future installs. 2016-11-01 22:48:30 -07:00
Dan Schaper 7a22471787 New naming convention, and reorder functions as bash would prefer them to be. 2016-11-01 22:19:40 -07:00
diginc b4524839bb Merge branch 'development' of https://github.com/pi-hole/pi-hole into InstallFixes_UnitTests 2016-11-01 23:52:20 -05:00
Eric Warnke fb5ac6d6d7 We should prefer the php metapackage if it's there, falling back on php5 if it's not 2016-10-31 21:31:13 -04:00
Eric Warnke 4e7ca51beb Added dependancy for ping and lsof used in debug scripts 2016-10-31 21:24:57 -04:00
Eric Warnke 65e0fcbf10 Merge branch 'development' of https://github.com/pi-hole/pi-hole into wheezy_fix2 2016-10-28 13:14:00 -04:00
Dan Schaper e22aca49c8 Merge pull request #813 from das7pad/development 
Create missing directory for lighttpd
 2016-10-28 10:05:08 -07:00
Adam Warner 21fc6344bf Merge pull request #849 from pi-hole/aManHasNoNameResolution 
[BugFix] A man has no name resolution
 2016-10-27 19:41:07 +01:00
Promofaux 794fa21137 install uninstall.sh... 2016-10-27 12:44:21 +01:00
Eric Warnke 977d1d1998 Merge branch 'development' of https://github.com/pi-hole/pi-hole into wheezy_fix2 2016-10-27 07:37:40 -04:00
Promofaux cde003bc98 \ all the /s! 2016-10-27 11:13:00 +01:00
Adam Warner 3996e11425 Merge pull request #859 from pi-hole/ImproveWhitelistBlacklist 
Improvements to White and Blacklists
 2016-10-26 19:52:16 +01:00
Eric Warnke 3a4fe3e391 Wheezy install fix by selecting appropriate deps, made the php check the same 2016-10-26 14:47:29 -04:00
Eric Warnke 4ed6e4d016 Tiny screens get sane minimums 2016-10-26 11:15:02 -04:00
Eric Warnke ac8d24a1ce Even with no detected screen size, it should presume 80x24 2016-10-26 11:14:54 -04:00
Eric Warnke fc776921d5 stty is more compatible and does not require any additional dependancies for busybox 2016-10-26 11:14:46 -04:00
Adam Warner 55a653aca4 clear out /opt/pihole folder before installing scripts 2016-10-26 10:00:00 +01:00