Commit Graph

449 Commits (ff2783f9fc884e24d2e8d88918f4aeb01ffeb985)

Author SHA1 Message Date
Dan Schaper ff2783f9fc
Tabs to spaces and formatting.
8 years ago
Dan Schaper 8cb01cdd29
One step to rename variables.
8 years ago
Adam Warner 10982a0f45 Merge pull request #990 from pi-hole/dontkillsetupVars.conf
8 years ago
DL6ER d4c378ed5d Remove PIHOLE_INTERFACE if already set (not PIHOLE_DOMAIN)
8 years ago
DL6ER 7872f68a45 Only try to remove parts inthe file if the file already exists
8 years ago
DL6ER ec8c848106 Don't kill already existing setupVars.conf on update (and fresh install)
8 years ago
Mcat12 3b50ce8c54 Merge pull request #977 from pi-hole/activatewebUIpw
8 years ago
DL6ER 1eeaa01234 Always put the information that we added a password if we did (not only on update but also on fresh install)
8 years ago
DL6ER e2898217d2 Made message shorter
8 years ago
DL6ER f81dadc5d0 Fix final message
8 years ago
Promofaux c10ec5548f remove code that replaces tokens in 01-pihole.conf
8 years ago
Mcat12 92f4824884 Automatically enable IPv6
8 years ago
DL6ER a00034a6a7 Add password to webUI after update if there is none
8 years ago
trinapicot 870454330d Add check for lighty.conf before trying to move it
8 years ago
Dan Schaper d53a3af191 Merge pull request #899 from diginc/configureFirewall_unittest
8 years ago
Dan Schaper e9475a9739 Merge pull request #887 from brontide/dependancy_cleanup
8 years ago
bcambl 0caa44e979 write ifcfg instead of appending
8 years ago
diginc b9f3493dbc move PH_TRUE to Dockerfiles to DRY
8 years ago
diginc 633095aee1 switch to consistent style
8 years ago
Eric Warnke 71005e1db3 Merge with change of spacing in development
8 years ago
Promofaux c452a4569e .js
8 years ago
Promofaux a182a208dc Tidy up output
8 years ago
Promofaux d273b4b48b Check for missing index.html, replace if missing.
8 years ago
Promofaux b429e890ad move web interface message inside "if not update" block. Check for pi-hole deps AFTER whiptails
8 years ago
Dan Schaper 6d415a7384 Merge pull request #894 from diginc/InstallFixes_UnitTests
8 years ago
Dan Schaper 8b9f0487c0 Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
8 years ago
Adam Warner 50bd8b4a09 Further tweaks to local repo handling
8 years ago
Dan Schaper 7740e4268c Consistency and standards basic-install start.
8 years ago
Adam Warner 3df2ef8587 Cherry picking f6f6f6d, conflict fix
8 years ago
Adam Warner 354309fcad set QUERY_LOGGING default to true
8 years ago
Adam Warner edd00e8e70 consistency
8 years ago
Adam Warner 82e7de2aaa Account for variable name changes
8 years ago
Adam Warner b723714c0c Convention : https://google.github.io/styleguide/shell.xml?showone=Constants_and_Environment_Variable_Names#Constants_and_Environment_Variable_Names
8 years ago
Adam Warner a2903b6e63 Consistency
8 years ago
Dan Schaper 9a1876571b Prototype `whiptails` so they don't fall to shell. Need to do this to all functions.
8 years ago
Dan Schaper c07d7165ab Global variables CAP'ed
8 years ago
Dan Schaper d695c5972f `local` variables just to be safe and make sure they stay in this function.
8 years ago
Dan Schaper bbc09ed313 Swap variable names.
8 years ago
Promofaux 617a147706 Wording adjustment
8 years ago
Promofaux d4dccfdb2d Cherry pick 229439c
8 years ago
Dan Schaper d9528dfd09 Bash is funny with returns.
8 years ago
Dan Schaper 12f5f8ba00 Begin to bring code up to Pi-hole conventions. Block installScripts and begin factoring out redundant code.
8 years ago
Dan Schaper db0f3307e0 Only take out scripts in the directory, don't remove the directory as a whole. Need this for the future installs.
8 years ago
Dan Schaper 7a22471787 New naming convention, and reorder functions as bash would prefer them to be.
8 years ago
diginc b4524839bb Merge branch 'development' of https://github.com/pi-hole/pi-hole into InstallFixes_UnitTests
8 years ago
Eric Warnke fb5ac6d6d7 We should prefer the php metapackage if it's there, falling back on php5 if it's not
8 years ago
Eric Warnke 4e7ca51beb Added dependancy for ping and lsof used in debug scripts
8 years ago
Eric Warnke 65e0fcbf10 Merge branch 'development' of https://github.com/pi-hole/pi-hole into wheezy_fix2
8 years ago
Dan Schaper e22aca49c8 Merge pull request #813 from das7pad/development
8 years ago
Adam Warner 21fc6344bf Merge pull request #849 from pi-hole/aManHasNoNameResolution
8 years ago