Merge branch 'next' of github.com:TheSerapher/php-mmcfe-ng into next

This commit is contained in:
Sebastian Grewe 2013-05-14 23:59:08 +02:00
commit 03cb52260b

View File

@ -85,6 +85,26 @@ Please create the `mmcfe-ng/public/include/config/global.inc.php`
configuration from the supplied template
`mmcfe-ng/public/include/config/global.inc.dist.php`.
Pushpoold
---------
Please ensure the passwords are read from the proper table by adding this to your configuration:
```
# database settings
"database" : {
"engine" : "mysql",
"port" : "3306",
"name" : "mmcfeng_database_name",
"username" : "someuser",
"password" : "somepass",
"sharelog" : true,
"stmt.pwdb":"SELECT `password` FROM `workers` WHERE `username` = ?",
"stmt.sharelog":"INSERT INTO shares (rem_host, username, our_result, upstream_result, reason, solution) VALUES (?, ?, ?, ?, ?, ?)"
},
```
Database
========