tpruvot · jakubartur · Feb 20, 2019 · Feb 20, 2019 · Feb 20, 2019 · Feb 20, 2019
diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,7 @@ web/assets/
 .idea/*
 web/yaamp/.idea/
 *.0
+web/keys.sample.php
+web/yaamp/modules/site/coin_form.php
+web/yaamp/modules/site/index.php
+web/yaamp/modules/site/results/current_results.php
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,137 +1,32 @@
-[![Build Status](https://travis-ci.org/tpruvot/yiimp.svg?branch=next)](https://travis-ci.org/tpruvot/yiimp)
+### Welcome to the cryptopool.builders github!
+### This fork of YiiMP is designed to work with our Ultimate Crypto-Server Installer program.
+Trying to install this on a server not built by our installer will cause headaches, frustrations, and screaming loudly at your monitor.
 
-#yiimp - yaamp fork
+#### Please go to https://github.com/cryptopool-builders/Multi-Pool-Installer for our installer.
 
-WARNINGS
-- Use at your own risks.
-- Usage of this software requires abilities with sysadmin, database admin, coin daemons, and sometimes a bit of programming. Running a production pool can literally be more work than a full-time job.
+## Changes to this fork include but not limited to:
 
-Required:
+```
+- File structure -
+$STORAGE_ROOT/yiimp/site/web
+$STORAGE_ROOT/yiimp/site/stratum (Only on single server installs)
+$STORAGE_ROOT/yiimp/site/configuration
+$STORAGE_ROOT/yiimp/site/crons
+$STORAGE_ROOT/yiimp/site/log
+$STORAGE_ROOT/yiimp/starts
 
-	linux, mysql, php, memcached, a webserver (lighttpd or nginx recommended)
+- Site Files-
+Updated various files to work with new file structure
+```
 
 
-Config for nginx:
+## Donations for continued support of this script are welcomed at:
+* BTC 3DvcaPT3Kio8Hgyw4ZA9y1feNnKZjH7Y21
+* BCH qrf2fhk2pfka5k649826z4683tuqehaq2sc65nfz3e
+* ETH 0x6A047e5410f433FDBF32D7fb118B6246E3b7C136
+* LTC MLS5pfgb7QMqBm3pmBvuJ7eRCRgwLV25Nz
 
-	location / {
-		try_files $uri @rewrite;
-	}
-
-	location @rewrite {
-		rewrite ^/(.*)$ /index.php?r=$1;
-	}
-
-	location ~ \.php$ {
-		fastcgi_pass unix:/var/run/php5-fpm.sock;
-		fastcgi_index index.php;
-		include fastcgi_params;
-	}
-
-
-If you use apache, it should be something like that (already set in web/.htaccess):
-
-	RewriteEngine on
-
-	RewriteCond %{REQUEST_FILENAME} !-f
-	RewriteRule ^(.*) index.php?r=$1 [QSA]
-
-
-If you use lighttpd, use the following config:
-
-	$HTTP["host"] =~ "yiimp.ccminer.org" {
-	        server.document-root = "/var/yaamp/web"
-	        url.rewrite-if-not-file = (
-			"^(.*)/([0-9]+)$" => "index.php?r=$1&id=$2",
-			"^(.*)\?(.*)" => "index.php?r=$1&$2",
-	                "^(.*)" => "index.php?r=$1",
-	                "." => "index.php"
-	        )
-
-		url.access-deny = ( "~", ".dat", ".log" )
-	}
-
-
-For the database, import the initial dump present in the sql/ folder
-
-Then, apply the migration scripts to be in sync with the current git, they are sorted by date of change.
-
-Your database need at least 2 users, one for the web site (php) and one for the stratum connections (password set in config/algo.conf).
-
-
-
-The recommended install folder for the stratum engine is /var/stratum. Copy all the .conf files, run.sh, the stratum binary and the blocknotify binary to this folder. 
-
-Some scripts are expecting the web folder to be /var/web. You can use directory symlinks...
-
-
-Add your exchange API public and secret keys in these two separated files:
-
-	/etc/yiimp/keys.php - fixed path in code
-	web/serverconfig.php - use sample as base...
-
-You can find sample config files in web/serverconfig.sample.php and web/keys.sample.php
-
-This web application includes some command line tools, add bin/ folder to your path and type "yiimp" to list them, "yiimp checkup" can help to test your initial setup.
-Future scripts and maybe the "cron" jobs will then use this yiic console interface.
-
-You need at least three backend shells (in screen) running these scripts:
-
-	web/main.sh
-	web/loop2.sh
-	web/block.sh
-
-Start one stratum per algo using the run.sh script with the algo as parameter. For example, for x11:
-
-	run.sh x11
-
-Edit each .conf file with proper values.
-
-Look at rc.local, it starts all three backend shells and all stratum processes. Copy it to the /etc folder so that all screen shells are started at boot up.
-
-All your coin's config files need to blocknotify their corresponding stratum using something like:
-
-	blocknotify=blocknotify yaamp.com:port coinid %s
-
-On the website, go to http://server.com/site/adminRights to login as admin. You have to change it to something different in the code (web/yaamp/modules/site/SiteController.php). A real admin login may be added later, but you can setup a password authentification with your web server, sample for lighttpd:
-
-	htpasswd -c /etc/yiimp/admin.htpasswd <adminuser>
-
-and in the lighttpd config file:
-
-	# Admin access
-	$HTTP["url"] =~ "^/site/adminRights" {
-	        auth.backend = "htpasswd"
-	        auth.backend.htpasswd.userfile = "/etc/yiimp/admin.htpasswd"
-	        auth.require = (
-	                "/" => (
-	                        "method" => "basic",
-	                        "realm" => "Yiimp Administration",
-	                        "require" => "valid-user"
-	                )
-	        )
-	}
-
-And finally remove the IP filter check in SiteController.php
-
-
-
-There are logs generated in the /var/stratum folder and /var/log/stratum/debug.log for the php log.
-
-More instructions coming as needed.
-
-
-There a lot of unused code in the php branch. Lot come from other projects I worked on and I've been lazy to clean it up before to integrate it to yaamp. It's mostly based on the Yii framework which implements a lightweight MVC.
-
-	http://www.yiiframework.com/
-
-
-Credits:
-
-Thanks to globalzon to have released the initial Yaamp source code.
-
---
-
-You can support this project donating to tpruvot :
-
-BTC : 1Auhps1mHZQpoX4mCcVL8odU81VakZQ6dR
+## Credits:
 
+* Thanks to tpruvot for the yiimp release
+* Thanks to mailinabox for the installer idea
diff --git a/README.md.old b/README.md.old
@@ -0,0 +1,136 @@
+[![Build Status](https://travis-ci.org/tpruvot/yiimp.svg?branch=next)](https://travis-ci.org/tpruvot/yiimp)
+
+#yiimp - yaamp fork
+
+WARNINGS
+- Use at your own risks.
+- Usage of this software requires abilities with sysadmin, database admin, coin daemons, and sometimes a bit of programming. Running a production pool can literally be more work than a full-time job.
+
+Required:
+
+	linux, mysql, php, memcached, a webserver (lighttpd or nginx recommended)
+
+
+Config for nginx:
+
+	location / {
+		try_files $uri @rewrite;
+	}
+
+	location @rewrite {
+		rewrite ^/(.*)$ /index.php?r=$1;
+	}
+
+	location ~ \.php$ {
+		fastcgi_pass unix:/var/run/php5-fpm.sock;
+		fastcgi_index index.php;
+		include fastcgi_params;
+	}
+
+
+If you use apache, it should be something like that (already set in web/.htaccess):
+
+	RewriteEngine on
+
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteRule ^(.*) index.php?r=$1 [QSA]
+
+
+If you use lighttpd, use the following config:
+
+	$HTTP["host"] =~ "yiimp.ccminer.org" {
+	        server.document-root = "/var/yaamp/web"
+	        url.rewrite-if-not-file = (
+			"^(.*)/([0-9]+)$" => "index.php?r=$1&id=$2",
+			"^(.*)\?(.*)" => "index.php?r=$1&$2",
+	                "^(.*)" => "index.php?r=$1",
+	                "." => "index.php"
+	        )
+
+		url.access-deny = ( "~", ".dat", ".log" )
+	}
+
+
+For the database, import the initial dump present in the sql/ folder
+
+Then, apply the migration scripts to be in sync with the current git, they are sorted by date of change.
+
+Your database need at least 2 users, one for the web site (php) and one for the stratum connections (password set in config/algo.conf).
+
+
+
+The recommended install folder for the stratum engine is /var/stratum. Copy all the .conf files, run.sh, the stratum binary and the blocknotify binary to this folder. 
+
+Some scripts are expecting the web folder to be /var/web. You can use directory symlinks...
+
+
+Add your exchange API public and secret keys in these two separated files:
+
+	/etc/yiimp/keys.php - fixed path in code
+	web/serverconfig.php - use sample as base...
+
+You can find sample config files in web/serverconfig.sample.php and web/keys.sample.php
+
+This web application includes some command line tools, add bin/ folder to your path and type "yiimp" to list them, "yiimp checkup" can help to test your initial setup.
+Future scripts and maybe the "cron" jobs will then use this yiic console interface.
+
+You need at least three backend shells (in screen) running these scripts:
+
+	web/main.sh
+	web/loop2.sh
+	web/block.sh
+
+Start one stratum per algo using the run.sh script with the algo as parameter. For example, for x11:
+
+	run.sh x11
+
+Edit each .conf file with proper values.
+
+Look at rc.local, it starts all three backend shells and all stratum processes. Copy it to the /etc folder so that all screen shells are started at boot up.
+
+All your coin's config files need to blocknotify their corresponding stratum using something like:
+
+	blocknotify=blocknotify yaamp.com:port coinid %s
+
+On the website, go to http://server.com/site/adminRights to login as admin. You have to change it to something different in the code (web/yaamp/modules/site/SiteController.php). A real admin login may be added later, but you can setup a password authentification with your web server, sample for lighttpd:
+
+	htpasswd -c /etc/yiimp/admin.htpasswd <adminuser>
+
+and in the lighttpd config file:
+
+	# Admin access
+	$HTTP["url"] =~ "^/site/adminRights" {
+	        auth.backend = "htpasswd"
+	        auth.backend.htpasswd.userfile = "/etc/yiimp/admin.htpasswd"
+	        auth.require = (
+	                "/" => (
+	                        "method" => "basic",
+	                        "realm" => "Yiimp Administration",
+	                        "require" => "valid-user"
+	                )
+	        )
+	}
+
+And finally remove the IP filter check in SiteController.php
+
+
+
+There are logs generated in the /var/stratum folder and /var/log/stratum/debug.log for the php log.
+
+More instructions coming as needed.
+
+
+There a lot of unused code in the php branch. Lot come from other projects I worked on and I've been lazy to clean it up before to integrate it to yaamp. It's mostly based on the Yii framework which implements a lightweight MVC.
+
+	http://www.yiiframework.com/
+
+
+Credits:
+
+Thanks to globalzon to have released the initial Yaamp source code.
+
+--
+
+You can support this project donating to tpruvot :
+
+BTC : 1Auhps1mHZQpoX4mCcVL8odU81VakZQ6dR
diff --git a/_config.yml b/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-midnight
diff --git a/bin/blocknotify.sh b/bin/blocknotify.sh
diff --git a/bin/kill_stratum b/bin/kill_stratum
diff --git a/bin/yiimp b/bin/yiimp
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 ROOTDIR=/data/yiimp
 DIR=`pwd`

diff --git a/bin/yiimp_restart_loop.sh b/bin/yiimp_restart_loop.sh
diff --git a/rc.local b/rc.local
@@ -53,6 +53,7 @@ screen -dmS allium $STRATUM_DIR/run.sh allium
 #screen -dmS lyra2 $STRATUM_DIR/run.sh lyra2
 screen -dmS lyra2v2 $STRATUM_DIR/run.sh lyra2v2
 screen -dmS lyra2z $STRATUM_DIR/run.sh lyra2z
+screen -dmS lyra2zz $STRATUM_DIR/run.sh lyra2zz
 screen -dmS rainforest $STRATUM_DIR/run.sh rainforest
 
 screen -dmS blakecoin $STRATUM_DIR/run.sh blakecoin # blake 8

diff --git a/sql/2018-09-22-workers.sql b/sql/2018-09-22-workers.sql
@@ -0,0 +1,6 @@
+-- Recent additions to add after db init (.gz)
+-- mysql yaamp -p < file.sql
+
+-- filled by the stratum instance, to allow to handle/watch multiple instances
+
+ALTER TABLE `workers` MODIFY COLUMN name VARCHAR(98);
diff --git a/sql/2019-03-coins_thepool_life.sql b/sql/2019-03-coins_thepool_life.sql
@@ -0,0 +1,11 @@
+-- Recent additions to add after db init (.gz)
+-- mysql yaamp -p < file.sql
+
+-- Additional fields for additions by cryptopool.builders
+
+ALTER TABLE `coins` ADD `link_twitter` varchar(1024) DEFAULT NULL AFTER `link_explorer`;
+ALTER TABLE `coins` ADD `link_facebook` varchar(1024) DEFAULT NULL AFTER `link_twitter`;
+ALTER TABLE `coins` ADD `donation_address` varchar(1024) DEFAULT NULL AFTER `link_facebook`;
+ALTER TABLE `coins` ADD `link_discord` varchar(1024) DEFAULT NULL AFTER `link_twitter`;
+ALTER TABLE `coins` ADD `usefaucet` tinyint(1) UNSIGNED NOT NULL DEFAULT '0' AFTER `donation_address`;
+ALTER TABLE `coins` ADD `dedicatedport` int(11) DEFAULT NULL AFTER `rpcport`;
diff --git a/sql/2019-11-10-yiimp.sql.gz b/sql/2019-11-10-yiimp.sql.gz
diff --git a/sql/labels.json b/sql/labels.json
@@ -530,6 +530,7 @@
 "MUN":"Muniti",
 "MWC":"MultiWalletCoin",
 "MXT":"MarteXcoin",
+"MXBIT":"Matrixbit",
 "MYC":"MyCoin",
 "MYR":"Myriadcoin",
 "MYST":"MystCoin",