Commit Graph

1672 Commits

Author SHA1 Message Date
DL6ER db278d81e4 Added webpage.sh 2016-11-16 21:34:43 +01:00
Dan Schaper bdad454a0d Merge pull request #920 from pi-hole/PromoFaux-patch-1
Update piholeDebug.sh
2016-11-16 11:22:04 -08:00
Adam Warner ac8064c754 Merge pull request #918 from nlamirault/patch-2
Add Pi-Hole exporter for Prometheus
2016-11-16 18:53:00 +00:00
Dan Schaper 736e963cef Merge pull request #919 from haydenknowles/development
moved newline to correct place
2016-11-15 18:40:00 -08:00
Adam Warner b191cd73a7 Update piholeDebug.sh
wording
2016-11-15 13:28:18 +00:00
Hayden Knowles 86d3ca48ae moved newline to correct place 2016-11-15 22:40:57 +13:00
Nicolas Lamirault fd7e4f2268 Add Pi-Hole Prometheus exporter project 2016-11-15 09:27:16 +01:00
Dan Schaper e9475a9739 Merge pull request #887 from brontide/dependancy_cleanup
Dependancy cleanup
2016-11-07 21:45:23 -08:00
Dan Schaper d4270e02e9 Merge pull request #902 from elpatron68/master
Added Link to blink1_pi-hole.py
2016-11-07 21:44:28 -08:00
Mcat12 b9a263ecb2 Merge pull request #907 from pi-hole/bugfix/chronometer-interface
replace hardcoded interface with var
2016-11-07 21:35:09 -05:00
Dan Schaper 4929d415a6 Merge pull request #906 from pi-hole/Fix/send-frs-into-orbit
Direct users to Discourse for FRs
2016-11-07 17:32:28 -08:00
Dan Schaper b9e1f518aa Merge pull request #909 from bcambl/fix_ifcfg_append
Fedora: write interface config instead of append
2016-11-07 17:23:50 -08:00
bcambl 0caa44e979 write ifcfg instead of appending 2016-11-07 12:54:31 -06:00
Jacob Salmela ca56ca5bd8 promo-tweak
Better logic introduced by @PromoFaux
2016-11-06 11:16:48 -06:00
Jacob Salmela a0f0dff88e replace hardcoded interface with var
setupVars.conf is already sourced, so we just need to replace the
hardcoded value with the variable name.
2016-11-06 08:18:57 -06:00
Jacob Salmela e5cc38a210 Direct users to Discourse for FRs
It's a better platform for it because users can vote and we can have
easier discussions for it.
2016-11-06 08:08:58 -06:00
Adam Warner 6cb5bb7200 Merge pull request #903 from pi-hole/feature/PRGuide
PR against Development guide
2016-11-04 21:17:20 +00:00
Dan Schaper 563696e291 PR against Development guide
PA will tag PR to Master with -1 approval in the next release. That will deny any PR's against Master from users and changing branches after the PR is started does not appear to modify the PA actions.
2016-11-04 14:01:01 -07:00
Markus Busche c755b3c49e Added Link to blink1_pi-hole.py 2016-11-04 21:56:14 +01:00
diginc b9f3493dbc move PH_TRUE to Dockerfiles to DRY 2016-11-03 22:34:04 -05:00
Dan Schaper 8c08e9e473 Merge pull request #891 from pi-hole/bugfix/chronometer-domain-count
Bugfix/chronometer domain count
2016-11-03 13:55:29 -07:00
Adam Hill c2930b0ca5 remove the debug print in mock_command 2016-11-03 08:34:44 -05:00
Adam Warner 4300759287 Fix logic. If both v6 and v4 divide by two, else dont. 2016-11-03 08:01:25 +00:00
Adam Warner fc1854cadd Merge pull request #897 from pi-hole/feature/travisDevBadge
Update README.md
2016-11-03 07:49:30 +00:00
Adam Warner 933973b12c Merge pull request #898 from pi-hole/fix/removeCC
Remove CodeClimate yaml, Travis new ShellChecker
2016-11-03 07:48:36 +00:00
diginc 5b54b9cb11 update Pihole fixture comment 2016-11-03 00:05:19 -05:00
diginc d2f815bba7 no longer need to write bash test scripts 2016-11-03 00:02:28 -05:00
diginc a5a067d50f switching testinfra's Docker run from dash to bash 2016-11-02 23:58:54 -05:00
diginc 699e299345 add a comment about bash vs dash. future refact needed 2016-11-02 23:40:50 -05:00
diginc 05e114173d update comments, add configureFirewall test
* Comments to clarify some of the existing tests
* mock_command to allow recording of calls and mocking return calls in bash
* new configureFirewall test (only the first one of it's many paths)
2016-11-02 23:25:13 -05:00
Dan Schaper d958b3ff65 Remove CodeClimate yaml, Travis new ShellChecker 2016-11-02 20:14:04 -07:00
diginc 0d7e06a141 remove old pytest output file 2016-11-02 22:13:39 -05:00
diginc 633095aee1 switch to consistent style 2016-11-02 22:13:05 -05:00
Dan Schaper a4aeb9a1dd Update README.md 2016-11-02 20:07:51 -07:00
Eric Warnke 71005e1db3 Merge with change of spacing in development 2016-11-02 19:01:34 -04:00
Promofaux d7d6d6f991 Update to use new Var name 2016-11-02 21:46:30 +00:00
Adam Warner 5986121cfc Merge pull request #896 from pi-hole/bugfix/649
Check for missing index.html, replace if missing.
2016-11-02 21:27:45 +00: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
Adam Warner afed7d4af0 Merge pull request #890 from pi-hole/feature/defensiveTweaks
Feature/defensive tweaks
2016-11-02 20:23:04 +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
Promofaux 2f976504e8 switch out -eq for == 2016-11-02 20:06:21 +00:00
Dan Schaper b5fc88227b Merge .gitignore 2016-11-02 12:36:00 -07:00
Dan Schaper 4b7b859db9 Gotta catch 'em all...' 2016-11-02 12:29:55 -07:00
Dan Schaper f7d0de53bb Compare string to string. 2016-11-02 12:11:34 -07:00
Dan Schaper 603ec997ba Remove testing block. 2016-11-02 12:09:33 -07:00
Dan Schaper f7266ef4c8 Version remote check returns -1 on failure to detect curl silent failing. Update detects loss of contact to GitHub or fallthrough condition and reports to user. 2016-11-02 12:07:59 -07:00
Dan Schaper 3d43e1568c Use explicit calls for function to self-document 2016-11-02 11:39:22 -07:00
Dan Schaper 3cf6a65da9 Remove *.yml ignoring
Travis YAML might not be good to ignore.
2016-11-02 11:32:53 -07:00