diff --git a/.gitignore b/.gitignore index aad5ceb..bc0fafc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,6 @@ *.a stratum/stratum stratum/blocknotify +stratum/config/ *.log web/yaamp/runtime/* - diff --git a/README.md b/README.md index cd7f3b4..f9f2c2c 100755 --- a/README.md +++ b/README.md @@ -20,13 +20,25 @@ Config for nginx: include fastcgi_params; } -If you use apache, it should be something like (set in web/.htaccess): +If you use apache, it should be something like (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 = ( + "^(.*)\?(.*)" => "index.php?r=$1&$2", + "^(.*)" => "index.php?r=$1", + "." => "index.php" + ) + } + + 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. diff --git a/web/.htaccess b/web/.htaccess index 9d3be03..77b7780 100644 --- a/web/.htaccess +++ b/web/.htaccess @@ -1,10 +1,6 @@ RewriteEngine On - -#RewriteCond %{REQUEST_FILENAME} -s [OR] -#RewriteCond %{REQUEST_FILENAME} -l [OR] -#RewriteCond %{REQUEST_FILENAME} -d -#RewriteRule ^.*$ - [NC,L] -#RewriteRule ^.*$ index.php [NC,L] +RewriteOptions Inherit RewriteCond %{REQUEST_FILENAME} !-f RewriteRule ^(.*) index.php?r=$1 [QSA] + diff --git a/web/robots.txt b/web/robots.txt index e4b001e..a82d96e 100644 --- a/web/robots.txt +++ b/web/robots.txt @@ -1,2 +1,2 @@ User-agent: * - +Disallow: diff --git a/web/yaamp/.htaccess b/web/yaamp/.htaccess new file mode 100644 index 0000000..c9c4d1b --- /dev/null +++ b/web/yaamp/.htaccess @@ -0,0 +1,2 @@ +deny from all + diff --git a/web/yaamp/models/db_shares_vipModel.php b/web/yaamp/models/db_shares_vipModel.php deleted file mode 100644 index 109c31a..0000000 --- a/web/yaamp/models/db_shares_vipModel.php +++ /dev/null @@ -1,33 +0,0 @@ -