Skip to content

Commit

Permalink
Merge pull request #2739 from r4sas/development
Browse files Browse the repository at this point in the history
fix documentation links
  • Loading branch information
TheSerapher authored May 24, 2018
2 parents 085dfa0 + 20a9c59 commit e5b1ec5
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 37 deletions.
66 changes: 33 additions & 33 deletions include/config/global.inc.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
/**
* 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
* 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_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.
* 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;

Expand All @@ -24,7 +24,7 @@
/**
* Defines
* 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['SALT'] = 'PLEASEMAKEMESOMETHINGRANDOM';
Expand All @@ -33,7 +33,7 @@
/**
* Coin Algorithm
* 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';

Expand All @@ -47,7 +47,7 @@
/**
* 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']['user'] = 'someuser';
Expand Down Expand Up @@ -75,7 +75,7 @@
/**
* Local wallet RPC
* 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']['host'] = 'localhost:19334';
Expand All @@ -85,7 +85,7 @@
/**
* Swiftmailer configuration
* 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']['sendmail']['path'] = '/usr/sbin/sendmail';
Expand All @@ -100,7 +100,7 @@
/**
* Getting Started Config
* 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']['coinurl'] = 'http://www.litecoin.org';
Expand All @@ -110,7 +110,7 @@
/**
* Ticker 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']['url'] = 'https://btc-e.nz';
Expand All @@ -120,66 +120,66 @@
/**
* Automatic Payout Thresholds
* 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']['max'] = 250;

/**
* Minimum manual Payout Threshold
* 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;

/**
* Donation thresholds
* 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;

/**
* Account Specific Settings
* 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;

/**
* 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';

/**
* Coin Target
* 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';

/**
* Coin Diff Change
* 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;

/**
* TX Fees
* 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_manual'] = 0.1;

/**
* Block & Pool Bonus
* 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#wiki-pool-bonus
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#block-bonus
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#pool-bonus
*/
$config['block_bonus'] = 0;
$config['pool_bonus'] = 0;
Expand All @@ -188,14 +188,14 @@
/**
* Payout System
* 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';

/**
* Sendmany Support
* 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;

Expand All @@ -209,15 +209,15 @@
/**
* Round Purging
* 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']['shares'] = 25000;

/**
* Share Archiving
* 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']['maxage'] = 60 * 24;
Expand All @@ -226,14 +226,14 @@
/**
* Pool Fees
* 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;

/**
* PPLNS
* 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']['type'] = 'blockavg';
Expand All @@ -244,30 +244,30 @@
/**
* Difficulty
* 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;

/**
* Block Reward
* 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'] = 50;

/**
* Confirmations
* 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['network_confirmations'] = 120;

/**
* PPS
* 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']['type'] = 'blockavg';
Expand All @@ -276,7 +276,7 @@
/**
* Memcache
* 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']['host'] = 'localhost';
Expand All @@ -292,7 +292,7 @@
/**
* Cookies
* 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']['domain'] = '';
Expand All @@ -303,14 +303,14 @@
/**
* Smarty Cache
* 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_lifetime'] = 30;

/**
* 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;
8 changes: 4 additions & 4 deletions include/config/security.inc.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/**
* Memcache Rate Limiting
* 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']['protect_ajax'] = true;
Expand All @@ -38,14 +38,14 @@
/**
* 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;

/**
* E-mail confirmations 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']['options']['details'] = true;
Expand All @@ -55,7 +55,7 @@
/**
* Lock account after X
* 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']['pin'] = 3;

0 comments on commit e5b1ec5

Please sign in to comment.