Merge branch 'development' of github.com:MPOS/php-mpos into development

This commit is contained in:
Sebastian Grewe 2018-05-24 13:26:47 +02:00
commit bbb008eb7a
2 changed files with 37 additions and 37 deletions

View File

@ -4,14 +4,14 @@ $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
/** /**
* Do not edit this unless you have confirmed that your config has been updated! * Do not edit this unless you have confirmed that your config has been updated!
* Also the URL to check for the most recent upstream versions available * Also the URL to check for the most recent upstream versions available
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-config-version * https://github.com/MPOS/php-mpos/wiki/Config-Setup#config-version
**/ **/
$config['version'] = '1.0.1'; $config['version'] = '1.0.1';
$config['version_url'] = 'https://raw.githubusercontent.com/MPOS/php-mpos/master/include/version.inc.php'; $config['version_url'] = 'https://raw.githubusercontent.com/MPOS/php-mpos/master/include/version.inc.php';
/** /**
* Unless you disable this, we'll do a quick check on your config first. * Unless you disable this, we'll do a quick check on your config first.
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-config-check * https://github.com/MPOS/php-mpos/wiki/Config-Setup#config-check
*/ */
$config['skip_config_tests'] = false; $config['skip_config_tests'] = false;
@ -24,7 +24,7 @@ $config['check_valid_coinaddress'] = true;
/** /**
* Defines * Defines
* Debug setting and salts for hashing passwords * Debug setting and salts for hashing passwords
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-defines--salts * https://github.com/MPOS/php-mpos/wiki/Config-Setup#defines--salts
*/ */
$config['DEBUG'] = 0; $config['DEBUG'] = 0;
$config['SALT'] = 'PLEASEMAKEMESOMETHINGRANDOM'; $config['SALT'] = 'PLEASEMAKEMESOMETHINGRANDOM';
@ -33,7 +33,7 @@ $config['SALTY'] = 'THISSHOULDALSOBERRAANNDDOOM';
/** /**
* Coin Algorithm * Coin Algorithm
* Algorithm used by this coin, sha256d or scrypt * Algorithm used by this coin, sha256d or scrypt
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-algorithm * https://github.com/MPOS/php-mpos/wiki/Config-Setup#algorithm
**/ **/
$config['algorithm'] = 'scrypt'; $config['algorithm'] = 'scrypt';
@ -47,7 +47,7 @@ $config['getbalancewithunconfirmed'] = true;
/** /**
* Database configuration * Database configuration
* MySQL database configuration * MySQL database configuration
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-database-configuration * https://github.com/MPOS/php-mpos/wiki/Config-Setup#database-configuration
**/ **/
$config['db']['host'] = 'localhost'; $config['db']['host'] = 'localhost';
$config['db']['user'] = 'someuser'; $config['db']['user'] = 'someuser';
@ -75,7 +75,7 @@ $config['db-ro']['name'] = 'mpos';
/** /**
* Local wallet RPC * Local wallet RPC
* RPC configuration for your daemon/wallet * RPC configuration for your daemon/wallet
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-local-wallet-rpc * https://github.com/MPOS/php-mpos/wiki/Config-Setup#local-wallet-rpc
**/ **/
$config['wallet']['type'] = 'http'; $config['wallet']['type'] = 'http';
$config['wallet']['host'] = 'localhost:19334'; $config['wallet']['host'] = 'localhost:19334';
@ -85,7 +85,7 @@ $config['wallet']['password'] = 'testnet';
/** /**
* Swiftmailer configuration * Swiftmailer configuration
* Configure your way to send mails * Configure your way to send mails
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-swiftmailer * https://github.com/MPOS/php-mpos/wiki/Config-Setup#swiftmailer
**/ **/
$config['swiftmailer']['type'] = 'sendmail'; $config['swiftmailer']['type'] = 'sendmail';
$config['swiftmailer']['sendmail']['path'] = '/usr/sbin/sendmail'; $config['swiftmailer']['sendmail']['path'] = '/usr/sbin/sendmail';
@ -100,7 +100,7 @@ $config['swiftmailer']['smtp']['throttle'] = 100;
/** /**
* Getting Started Config * Getting Started Config
* Shown to users in the 'Getting Started' section * Shown to users in the 'Getting Started' section
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-getting-started * https://github.com/MPOS/php-mpos/wiki/Config-Setup#getting-started
**/ **/
$config['gettingstarted']['coinname'] = 'Litecoin'; $config['gettingstarted']['coinname'] = 'Litecoin';
$config['gettingstarted']['coinurl'] = 'http://www.litecoin.org'; $config['gettingstarted']['coinurl'] = 'http://www.litecoin.org';
@ -110,7 +110,7 @@ $config['gettingstarted']['stratumport'] = '3333';
/** /**
* Ticker API * Ticker API
* Fetch exchange rates via an API * Fetch exchange rates via an API
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-ticker-api * https://github.com/MPOS/php-mpos/wiki/Config-Setup#ticker-api
**/ **/
$config['price']['enabled'] = false; $config['price']['enabled'] = false;
$config['price']['url'] = 'https://btc-e.nz'; $config['price']['url'] = 'https://btc-e.nz';
@ -120,7 +120,7 @@ $config['price']['currency'] = 'USD';
/** /**
* Automatic Payout Thresholds * Automatic Payout Thresholds
* Minimum and Maximum auto payout amount * Minimum and Maximum auto payout amount
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-automatic-payout-thresholds * https://github.com/MPOS/php-mpos/wiki/Config-Setup#automatic-payout-thresholds
**/ **/
$config['ap_threshold']['min'] = 1; $config['ap_threshold']['min'] = 1;
$config['ap_threshold']['max'] = 250; $config['ap_threshold']['max'] = 250;
@ -128,49 +128,49 @@ $config['ap_threshold']['max'] = 250;
/** /**
* Minimum manual Payout Threshold * Minimum manual Payout Threshold
* Minimum manual payout amount * Minimum manual payout amount
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-manual-payout-threshold * https://github.com/MPOS/php-mpos/wiki/Config-Setup#manual-payout-threshold
**/ **/
$config['mp_threshold'] = 1; $config['mp_threshold'] = 1;
/** /**
* Donation thresholds * Donation thresholds
* Minimum donation amount in percent * Minimum donation amount in percent
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-donation-thresholds * https://github.com/MPOS/php-mpos/wiki/Config-Setup#donation-thresholds
**/ **/
$config['donate_threshold']['min'] = 1; $config['donate_threshold']['min'] = 1;
/** /**
* Account Specific Settings * Account Specific Settings
* Settings for each user account * Settings for each user account
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-account-specific-settings * https://github.com/MPOS/php-mpos/wiki/Config-Setup#account-specific-settings
**/ **/
$config['accounts']['invitations']['count'] = 5; $config['accounts']['invitations']['count'] = 5;
/** /**
* Currency * Currency
* Shorthand name for the currency * Shorthand name for the currency
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-currency * https://github.com/MPOS/php-mpos/wiki/Config-Setup#currency
*/ */
$config['currency'] = 'LTC'; $config['currency'] = 'LTC';
/** /**
* Coin Target * Coin Target
* Target time for coins to be generated * Target time for coins to be generated
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-coin-target * https://github.com/MPOS/php-mpos/wiki/Config-Setup#coin-target
**/ **/
$config['cointarget'] = '150'; $config['cointarget'] = '150';
/** /**
* Coin Diff Change * Coin Diff Change
* Amount of blocks between difficulty changes * Amount of blocks between difficulty changes
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-coin-diff-change * https://github.com/MPOS/php-mpos/wiki/Config-Setup#coin-diff-change
**/ **/
$config['coindiffchangetarget'] = 2016; $config['coindiffchangetarget'] = 2016;
/** /**
* TX Fees * TX Fees
* Fees applied to transactions * Fees applied to transactions
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-tx-fees * https://github.com/MPOS/php-mpos/wiki/Config-Setup#tx-fees
**/ **/
$config['txfee_auto'] = 0.1; $config['txfee_auto'] = 0.1;
$config['txfee_manual'] = 0.1; $config['txfee_manual'] = 0.1;
@ -178,8 +178,8 @@ $config['txfee_manual'] = 0.1;
/** /**
* Block & Pool Bonus * Block & Pool Bonus
* Bonus coins for blockfinder or a pool bonus for everyone * Bonus coins for blockfinder or a pool bonus for everyone
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-block-bonus * https://github.com/MPOS/php-mpos/wiki/Config-Setup#block-bonus
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-pool-bonus * https://github.com/MPOS/php-mpos/wiki/Config-Setup#pool-bonus
*/ */
$config['block_bonus'] = 0; $config['block_bonus'] = 0;
$config['pool_bonus'] = 0; $config['pool_bonus'] = 0;
@ -188,14 +188,14 @@ $config['pool_bonus_type'] = 'payout';
/** /**
* Payout System * Payout System
* Payout system chosen * Payout system chosen
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-payout-system * https://github.com/MPOS/php-mpos/wiki/Config-Setup#payout-system
**/ **/
$config['payout_system'] = 'prop'; $config['payout_system'] = 'prop';
/** /**
* Sendmany Support * Sendmany Support
* Enable/Disable Sendmany RPC method * Enable/Disable Sendmany RPC method
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-sendmany-support * https://github.com/MPOS/php-mpos/wiki/Config-Setup#sendmany-support
**/ **/
$config['sendmany']['enabled'] = false; $config['sendmany']['enabled'] = false;
@ -209,7 +209,7 @@ $config['payout']['txlimit_auto'] = 500;
/** /**
* Round Purging * Round Purging
* Round share purging configuration * Round share purging configuration
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-round-purging * https://github.com/MPOS/php-mpos/wiki/Config-Setup#round-purging
**/ **/
$config['purge']['sleep'] = 1; $config['purge']['sleep'] = 1;
$config['purge']['shares'] = 25000; $config['purge']['shares'] = 25000;
@ -217,7 +217,7 @@ $config['purge']['shares'] = 25000;
/** /**
* Share Archiving * Share Archiving
* Share archiving configuration details * Share archiving configuration details
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-archiving * https://github.com/MPOS/php-mpos/wiki/Config-Setup#archiving
**/ **/
$config['archive']['maxrounds'] = 10; $config['archive']['maxrounds'] = 10;
$config['archive']['maxage'] = 60 * 24; $config['archive']['maxage'] = 60 * 24;
@ -226,14 +226,14 @@ $config['archive']['maxage'] = 60 * 24;
/** /**
* Pool Fees * Pool Fees
* Fees applied to users * Fees applied to users
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-pool-fees * https://github.com/MPOS/php-mpos/wiki/Config-Setup#pool-fees
*/ */
$config['fees'] = 0; $config['fees'] = 0;
/** /**
* PPLNS * PPLNS
* Pay Per Last N Shares * Pay Per Last N Shares
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-pplns-settings * https://github.com/MPOS/php-mpos/wiki/Config-Setup#pplns-settings
*/ */
$config['pplns']['shares']['default'] = 4000000; $config['pplns']['shares']['default'] = 4000000;
$config['pplns']['shares']['type'] = 'blockavg'; $config['pplns']['shares']['type'] = 'blockavg';
@ -244,14 +244,14 @@ $config['pplns']['dynamic']['percent'] = 30;
/** /**
* Difficulty * Difficulty
* Difficulty setting for stratum/pushpool * Difficulty setting for stratum/pushpool
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-pool-target-difficulty * https://github.com/MPOS/php-mpos/wiki/Config-Setup#pool-target-difficulty
*/ */
$config['difficulty'] = 20; $config['difficulty'] = 20;
/** /**
* Block Reward * Block Reward
* Block reward configuration details * Block reward configuration details
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-reward-settings * https://github.com/MPOS/php-mpos/wiki/Config-Setup#reward-settings
**/ **/
$config['reward_type'] = 'block'; $config['reward_type'] = 'block';
$config['reward'] = 50; $config['reward'] = 50;
@ -259,7 +259,7 @@ $config['reward'] = 50;
/** /**
* Confirmations * Confirmations
* Credit and Network confirmation settings * Credit and Network confirmation settings
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-confirmations * https://github.com/MPOS/php-mpos/wiki/Config-Setup#confirmations
*/ */
$config['confirmations'] = 120; $config['confirmations'] = 120;
$config['network_confirmations'] = 120; $config['network_confirmations'] = 120;
@ -267,7 +267,7 @@ $config['network_confirmations'] = 120;
/** /**
* PPS * PPS
* Pay Per Share configuration details * Pay Per Share configuration details
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-pps-settings * https://github.com/MPOS/php-mpos/wiki/Config-Setup#pps-settings
**/ **/
$config['pps']['reward']['default'] = 50; $config['pps']['reward']['default'] = 50;
$config['pps']['reward']['type'] = 'blockavg'; $config['pps']['reward']['type'] = 'blockavg';
@ -276,7 +276,7 @@ $config['pps']['blockavg']['blockcount'] = 10;
/** /**
* Memcache * Memcache
* Memcache configuration details * Memcache configuration details
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-memcache * https://github.com/MPOS/php-mpos/wiki/Config-Setup#memcache
**/ **/
$config['memcache']['enabled'] = true; $config['memcache']['enabled'] = true;
$config['memcache']['host'] = 'localhost'; $config['memcache']['host'] = 'localhost';
@ -292,7 +292,7 @@ $config['memcache']['sasl']['password'] = '';
/** /**
* Cookies * Cookies
* Cookie configuration details * Cookie configuration details
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-cookies * https://github.com/MPOS/php-mpos/wiki/Config-Setup#cookies
**/ **/
$config['cookie']['duration'] = '1440'; $config['cookie']['duration'] = '1440';
$config['cookie']['domain'] = ''; $config['cookie']['domain'] = '';
@ -303,7 +303,7 @@ $config['cookie']['secure'] = false;
/** /**
* Smarty Cache * Smarty Cache
* Enable smarty cache and cache length * Enable smarty cache and cache length
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-smarty-cache * https://github.com/MPOS/php-mpos/wiki/Config-Setup#smarty-cache
**/ **/
$config['smarty']['cache'] = 0; $config['smarty']['cache'] = 0;
$config['smarty']['cache_lifetime'] = 30; $config['smarty']['cache_lifetime'] = 30;
@ -311,6 +311,6 @@ $config['smarty']['cache_lifetime'] = 30;
/** /**
* System load * System load
* Disable some calls when high system load * Disable some calls when high system load
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-system-load * https://github.com/MPOS/php-mpos/wiki/Config-Setup#system-load
**/ **/
$config['system']['load']['max'] = 10.0; $config['system']['load']['max'] = 10.0;

View File

@ -23,7 +23,7 @@ $config['logging']['path'] = realpath(BASEPATH.'../logs');
/** /**
* Memcache Rate Limiting * Memcache Rate Limiting
* Rate limit requests using Memcache * Rate limit requests using Memcache
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-memcache-rate-limiting * https://github.com/MPOS/php-mpos/wiki/Config-Setup#memcache-rate-limiting
*/ */
$config['mc_antidos']['enabled'] = true; $config['mc_antidos']['enabled'] = true;
$config['mc_antidos']['protect_ajax'] = true; $config['mc_antidos']['protect_ajax'] = true;
@ -38,14 +38,14 @@ $config['mc_antidos']['error_push_page'] = array('page' => 'error', 'action' =>
/** /**
* CSRF Protection * CSRF Protection
* Enable or disable CSRF protection * Enable or disable CSRF protection
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-csrf-protection * https://github.com/MPOS/php-mpos/wiki/Config-Setup#csrf-protection
*/ */
$config['csrf']['enabled'] = true; $config['csrf']['enabled'] = true;
/** /**
* E-mail confirmations for user actions * E-mail confirmations for user actions
* Two-factor confirmation for user actions * Two-factor confirmation for user actions
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-e-mail-confirmations * https://github.com/MPOS/php-mpos/wiki/Config-Setup#e-mail-confirmations
*/ */
$config['twofactor']['enabled'] = true; $config['twofactor']['enabled'] = true;
$config['twofactor']['options']['details'] = true; $config['twofactor']['options']['details'] = true;
@ -55,7 +55,7 @@ $config['twofactor']['options']['changepw'] = true;
/** /**
* Lock account after X * Lock account after X
* Lock accounts after X invalid logins or pins * Lock accounts after X invalid logins or pins
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-lock-accounts-after-failed-logins * https://github.com/MPOS/php-mpos/wiki/Config-Setup#lock-accounts-after-failed-logins
**/ **/
$config['maxfailed']['login'] = 3; $config['maxfailed']['login'] = 3;
$config['maxfailed']['pin'] = 3; $config['maxfailed']['pin'] = 3;