Merge conflict resolution

This commit is contained in:
Dan Schaper
2016-01-20 20:56:10 +00:00
2 changed files with 15 additions and 1 deletions
+12 -1
View File
@@ -7,4 +7,15 @@ Using **[AdminLTE](https://almsaeedstudio.com)**, this project will create a Web
From this interface, you will be able to see stats on how well your Pi-hole is performing. You will also be able to update the lists used to block ads.
![Pi-hole Web interface](http://i.imgur.com/x2iMfoc.png)
![Fully responsive](http://i.imgur.com/NyAIXm8.png)
![Fully responsive](http://i.imgur.com/NyAIXm8.png)
## API
A basic read-only API can be accessed at `/admin/api.php`. It returns the following JSON:
```JSON
{
"domains_being_blocked": "136708",
"dns_queries_today": "18108",
"ads_blocked_today": "14648",
"ads_percentage_today": 80.892423238348
}
```
+3
View File
@@ -0,0 +1,3 @@
<?php
echo exec("/usr/local/bin/chronometer.sh -j");
?>