diff --git a/contributors.txt b/contributors.txt index 5425119a7..9776221fe 100644 --- a/contributors.txt +++ b/contributors.txt @@ -1,45 +1,45 @@ -Уважаемые пользователи TorrentPier II! - -За помощь, оказанную в развитии нашего движка, выражаем особую благодарность нижеперечисленным участникам форума: - -*************************** -** Сборы 2013 года ** -*************************** - -emilio13 -UralSOFT -aik -Sarymian -eve -Алексей Письменский -qaqra -rserg99 -leszav -Dr_Brown -Bullit -Triceratop (http://goldenshara.com/) -Ramzess - -**************************** -** Сборы 2014 года ** -**************************** - -SamSeGo -alesel (http://sporttracker.kz/) -Bullit -igorsaevets -vasilich619 -wint1000 (http://asmlocator.ru/) -Philstone (http://worldofminecraft.su/) -Nightwolf -nord51 -Вася - -***************************** -** Прочая информация ** -***************************** - -Большое вам всем спасибо за помощь. - -Если в данных списках кто-то не указан, либо если вы хотите указать дополнительно адрес своего трекера, отправьте письмо по адресу admin@torrentpier.me, +Уважаемые пользователи TorrentPier II! + +За помощь, оказанную в развитии нашего движка, выражаем особую благодарность нижеперечисленным участникам форума: + +*************************** +** Сборы 2013 года ** +*************************** + +emilio13 +UralSOFT +aik +Sarymian +eve +Алексей Письменский +qaqra +rserg99 +leszav +Dr_Brown +Bullit +Triceratop (http://goldenshara.com/) +Ramzess + +**************************** +** Сборы 2014 года ** +**************************** + +SamSeGo +alesel (http://sporttracker.kz/) +Bullit +igorsaevets +vasilich619 +wint1000 (http://asmlocator.ru/) +Philstone (http://worldofminecraft.su/) +Nightwolf +nord51 +Вася + +***************************** +** Прочая информация ** +***************************** + +Большое вам всем спасибо за помощь. + +Если в данных списках кто-то не указан, либо если вы хотите указать дополнительно адрес своего трекера, отправьте письмо по адресу admin@torrentpier.me, с указанием вашего ника на форуме и адреса вашего трекера, дабы мы могли вас добавить в этот список. \ No newline at end of file diff --git a/install/php-fpm+nginx/nginx.conf b/install/php-fpm+nginx/nginx.conf index 3be984daa..e32641d2a 100644 --- a/install/php-fpm+nginx/nginx.conf +++ b/install/php-fpm+nginx/nginx.conf @@ -1,145 +1,145 @@ -user www www; -worker_processes 4; - -#error_log /var/log/nginx/error.log; -#error_log /var/log/nginx/error.log notice; -#error_log /var/log/nginx/error.log info; - -pid /var/run/nginx.pid; - -worker_rlimit_nofile 1024; -events { - worker_connections 1024; -} - -http { - include mime.types; - default_type application/octet-stream; - - #log_format main '$remote_addr - $remote_user [$time_local] $request ' - # '"$status" $body_bytes_sent "$http_referer" ' - # '"$http_user_agent" "$http_x_forwarded_for"'; - - #log_format IP .$remote_addr.; - - access_log off; - - server_tokens off; - reset_timedout_connection on; - - sendfile on; - - # http://en.wikipedia.org/wiki/Asynchronous_I/O - # aio sendfile; - - output_buffers 1 64k; - - tcp_nopush on; - tcp_nodelay on; - send_lowat 12000; - log_not_found off; - - keepalive_timeout 65; - - limit_req_zone $binary_remote_addr zone=one:16m rate=5r/s; - - gzip on; - gzip_vary on; - gzip_min_length 2048; - gzip_comp_level 5; - gzip_http_version 1.0; - gzip_proxied any; - gzip_disable "msie6"; - gzip_types text/plain text/css application/x-javascript text/xml application/xml application/xml+rss text/javascript; - - client_max_body_size 10m; - large_client_header_buffers 4 8k; - client_body_temp_path /tmp/nginx/client_temp 1 2; - - server { - #listen 80 default sndbuf=32k rcvbuf=8k accept_filter=httpready; - #listen [::]:80 default sndbuf=32k rcvbuf=8k accept_filter=httpready; - - listen 80 default sndbuf=32k rcvbuf=8k; - server_name sitedomain.ru; - - charset utf8; - - access_log off; - - location / { - root /var/www; - index index.html index.htm index.php; - } - - error_page 404 /404.html; - error_page 500 502 503 504 /50x.html; - - # pass the PHP scripts to FastCGI server listening on /tmp/php.sock; - # - location ~ \.php$ { - #limit_req zone=one burst=20 nodelay; - #limit_req_log_level info; - - root /var/www; - fastcgi_index index.php; - fastcgi_pass unix:/tmp/php.sock; # 127.0.0.1:9000; - fastcgi_intercept_errors on; - - # FreeBSD Optimization - fastcgi_pass_request_body off; - client_body_in_file_only clean; - fastcgi_param REQUEST_BODY_FILE $request_body_file; - - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_TRANSLATED $document_root$fastcgi_script_name; - - include fastcgi_params; - } - - # Old XBTT config -# location ^~ /bt/ { -# access_log off; -# if ( $query_string ~ "^uk=([^&?]{10})[&?]+(.*)$" ) { -# set $uk $1; -# set $qs $2&ip=$remote_addr; -# } -# if ( $query_string ~ "^uk=([^&?]{10})[&?]+((.*&|)ip=.*)$" ) { -# set $uk $1; -# set $qs $2; -# } -# if ( $qs ) { -# rewrite ^.*/([a-z]+)(\.php|)$ /$uk/$1?$qs break; -# } -# rewrite ^/?(.*)$ /$1?ip=$remote_addr&$query_string break; -# proxy_pass http://127.0.0.1:2710/; -# } - - # Cached Images - location ~* \.(jpg|jpeg|gif|png|css|js|ico)$ { - root /var/www; - access_log off; - expires 30d; - add_header Cache-Control public; - } - - location ~ \/admin|backup\/ { - deny all; - # allow YOUR_IP; - } - # Deny folder (Sec. lvl1) - location ~ \/(cache|log|attach_mod|config|includes|language|triggers)\/ { - deny all; - } - - # deny access to .htaccess files, if Apache's document root - # concurs with nginx's one - # deny sql,tpl,db,inc,log - location ~ /\.ht { - deny all; - } - location ~ \.(.*sql|tpl|db|inc|log)$ { - deny all; - } - } +user www www; +worker_processes 4; + +#error_log /var/log/nginx/error.log; +#error_log /var/log/nginx/error.log notice; +#error_log /var/log/nginx/error.log info; + +pid /var/run/nginx.pid; + +worker_rlimit_nofile 1024; +events { + worker_connections 1024; +} + +http { + include mime.types; + default_type application/octet-stream; + + #log_format main '$remote_addr - $remote_user [$time_local] $request ' + # '"$status" $body_bytes_sent "$http_referer" ' + # '"$http_user_agent" "$http_x_forwarded_for"'; + + #log_format IP .$remote_addr.; + + access_log off; + + server_tokens off; + reset_timedout_connection on; + + sendfile on; + + # http://en.wikipedia.org/wiki/Asynchronous_I/O + # aio sendfile; + + output_buffers 1 64k; + + tcp_nopush on; + tcp_nodelay on; + send_lowat 12000; + log_not_found off; + + keepalive_timeout 65; + + limit_req_zone $binary_remote_addr zone=one:16m rate=5r/s; + + gzip on; + gzip_vary on; + gzip_min_length 2048; + gzip_comp_level 5; + gzip_http_version 1.0; + gzip_proxied any; + gzip_disable "msie6"; + gzip_types text/plain text/css application/x-javascript text/xml application/xml application/xml+rss text/javascript; + + client_max_body_size 10m; + large_client_header_buffers 4 8k; + client_body_temp_path /tmp/nginx/client_temp 1 2; + + server { + #listen 80 default sndbuf=32k rcvbuf=8k accept_filter=httpready; + #listen [::]:80 default sndbuf=32k rcvbuf=8k accept_filter=httpready; + + listen 80 default sndbuf=32k rcvbuf=8k; + server_name sitedomain.ru; + + charset utf8; + + access_log off; + + location / { + root /var/www; + index index.html index.htm index.php; + } + + error_page 404 /404.html; + error_page 500 502 503 504 /50x.html; + + # pass the PHP scripts to FastCGI server listening on /tmp/php.sock; + # + location ~ \.php$ { + #limit_req zone=one burst=20 nodelay; + #limit_req_log_level info; + + root /var/www; + fastcgi_index index.php; + fastcgi_pass unix:/tmp/php.sock; # 127.0.0.1:9000; + fastcgi_intercept_errors on; + + # FreeBSD Optimization + fastcgi_pass_request_body off; + client_body_in_file_only clean; + fastcgi_param REQUEST_BODY_FILE $request_body_file; + + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_TRANSLATED $document_root$fastcgi_script_name; + + include fastcgi_params; + } + + # Old XBTT config +# location ^~ /bt/ { +# access_log off; +# if ( $query_string ~ "^uk=([^&?]{10})[&?]+(.*)$" ) { +# set $uk $1; +# set $qs $2&ip=$remote_addr; +# } +# if ( $query_string ~ "^uk=([^&?]{10})[&?]+((.*&|)ip=.*)$" ) { +# set $uk $1; +# set $qs $2; +# } +# if ( $qs ) { +# rewrite ^.*/([a-z]+)(\.php|)$ /$uk/$1?$qs break; +# } +# rewrite ^/?(.*)$ /$1?ip=$remote_addr&$query_string break; +# proxy_pass http://127.0.0.1:2710/; +# } + + # Cached Images + location ~* \.(jpg|jpeg|gif|png|css|js|ico)$ { + root /var/www; + access_log off; + expires 30d; + add_header Cache-Control public; + } + + location ~ \/admin|backup\/ { + deny all; + # allow YOUR_IP; + } + # Deny folder (Sec. lvl1) + location ~ \/(cache|log|attach_mod|config|includes|language|triggers)\/ { + deny all; + } + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # deny sql,tpl,db,inc,log + location ~ /\.ht { + deny all; + } + location ~ \.(.*sql|tpl|db|inc|log)$ { + deny all; + } + } } \ No newline at end of file diff --git a/install/sphinx/sphinx.conf b/install/sphinx/sphinx.conf index be2360d8d..d29033d81 100644 --- a/install/sphinx/sphinx.conf +++ b/install/sphinx/sphinx.conf @@ -1,104 +1,104 @@ -source torrentpier -{ - type = mysql - sql_host = localhost - sql_user = user - sql_pass = pass - sql_db = dbase - sql_query_pre = SET NAMES utf8 - sql_query_pre = SET CHARACTER_SET_RESULTS=utf8 - sql_query_pre = SET CHARACTER_SET_CLIENT=utf8 -} - -source topics: torrentpier -{ - sql_query = \ - SELECT topic_id, forum_id, topic_title \ - FROM bb_topics \ - WHERE topic_id BETWEEN $start AND $end - - sql_query_range = SELECT MIN(topic_id), MAX(topic_id) FROM bb_topics - sql_range_step = 100000 - - sql_attr_uint = forum_id - sql_ranged_throttle = 50 - sql_query_info = SELECT * FROM bb_topics WHERE topic_id = $id -} - -source posts: torrentpier -{ - sql_query = \ - SELECT pt.post_id, pt.post_text, t.topic_title, t.topic_id, t.forum_id \ - FROM bb_posts_text pt \ - LEFT JOIN bb_topics t on pt.post_id = t.topic_first_post_id \ - WHERE pt.post_id BETWEEN $start AND $end - - sql_query_range = SELECT MIN(post_id), MAX(post_id) FROM bb_posts_text - sql_range_step = 100000 - - sql_attr_uint = topic_id - sql_attr_uint = forum_id - sql_ranged_throttle = 50 - sql_query_info = SELECT * FROM bb_posts_text WHERE post_id = $id -} - -source users: torrentpier -{ - sql_query = \ - SELECT user_id, username \ - FROM bb_users \ - WHERE user_id BETWEEN $start AND $end - - sql_query_range = SELECT 1, MAX(user_id) FROM bb_users - sql_range_step = 1000 - sql_query_info = SELECT * FROM bb_users WHERE user_id = $id -} - -index topics -{ - docinfo = extern - morphology = stem_enru - charset_type = utf-8 - charset_table = 0..9, A..Z->a..z, _, a..z, U+410..U+42C->U+430..U+44C, U+42E..U+42F->U+44E..U+44F, U+430..U+44C, U+44E..U+44F, U+0401->U+0435, U+0451->U+0435, U+042D->U+0435, U+044D->U+0435 - min_prefix_len = 0 - min_infix_len = 0 - min_word_len = 1 - min_stemming_len = 4 - enable_star = 1 - phrase_boundary = :, - , . , $ - phrase_boundary_step = 1 - html_strip = 1 - path = ./sphinx/data/topics - source = topics -} - -index posts: topics -{ - path = ./sphinx/data/posts - source = posts -} - -index users: topics -{ - path = ./sphinx/data/users - source = users -} - -indexer -{ - mem_limit = 256M -} - -searchd -{ - listen = 127.0.0.1:3312 - log = ./sphinx/log/searchd.log - query_log = ./sphinx/log/query.log - read_timeout = 5 - max_children = 15 - max_matches = 5000 - seamless_rotate = 1 - preopen_indexes = 0 - unlink_old = 1 - pid_file = ./sphinx/searchd.pid +source torrentpier +{ + type = mysql + sql_host = localhost + sql_user = user + sql_pass = pass + sql_db = dbase + sql_query_pre = SET NAMES utf8 + sql_query_pre = SET CHARACTER_SET_RESULTS=utf8 + sql_query_pre = SET CHARACTER_SET_CLIENT=utf8 +} + +source topics: torrentpier +{ + sql_query = \ + SELECT topic_id, forum_id, topic_title \ + FROM bb_topics \ + WHERE topic_id BETWEEN $start AND $end + + sql_query_range = SELECT MIN(topic_id), MAX(topic_id) FROM bb_topics + sql_range_step = 100000 + + sql_attr_uint = forum_id + sql_ranged_throttle = 50 + sql_query_info = SELECT * FROM bb_topics WHERE topic_id = $id +} + +source posts: torrentpier +{ + sql_query = \ + SELECT pt.post_id, pt.post_text, t.topic_title, t.topic_id, t.forum_id \ + FROM bb_posts_text pt \ + LEFT JOIN bb_topics t on pt.post_id = t.topic_first_post_id \ + WHERE pt.post_id BETWEEN $start AND $end + + sql_query_range = SELECT MIN(post_id), MAX(post_id) FROM bb_posts_text + sql_range_step = 100000 + + sql_attr_uint = topic_id + sql_attr_uint = forum_id + sql_ranged_throttle = 50 + sql_query_info = SELECT * FROM bb_posts_text WHERE post_id = $id +} + +source users: torrentpier +{ + sql_query = \ + SELECT user_id, username \ + FROM bb_users \ + WHERE user_id BETWEEN $start AND $end + + sql_query_range = SELECT 1, MAX(user_id) FROM bb_users + sql_range_step = 1000 + sql_query_info = SELECT * FROM bb_users WHERE user_id = $id +} + +index topics +{ + docinfo = extern + morphology = stem_enru + charset_type = utf-8 + charset_table = 0..9, A..Z->a..z, _, a..z, U+410..U+42C->U+430..U+44C, U+42E..U+42F->U+44E..U+44F, U+430..U+44C, U+44E..U+44F, U+0401->U+0435, U+0451->U+0435, U+042D->U+0435, U+044D->U+0435 + min_prefix_len = 0 + min_infix_len = 0 + min_word_len = 1 + min_stemming_len = 4 + enable_star = 1 + phrase_boundary = :, - , . , $ + phrase_boundary_step = 1 + html_strip = 1 + path = ./sphinx/data/topics + source = topics +} + +index posts: topics +{ + path = ./sphinx/data/posts + source = posts +} + +index users: topics +{ + path = ./sphinx/data/users + source = users +} + +indexer +{ + mem_limit = 256M +} + +searchd +{ + listen = 127.0.0.1:3312 + log = ./sphinx/log/searchd.log + query_log = ./sphinx/log/query.log + read_timeout = 5 + max_children = 15 + max_matches = 5000 + seamless_rotate = 1 + preopen_indexes = 0 + unlink_old = 1 + pid_file = ./sphinx/searchd.pid } \ No newline at end of file diff --git a/other/converter/TBDevYSE_pre6/ReadMe.txt b/other/converter/TBDevYSE_pre6/ReadMe.txt index 2ffa0d7a1..dd8137e3e 100644 --- a/other/converter/TBDevYSE_pre6/ReadMe.txt +++ b/other/converter/TBDevYSE_pre6/ReadMe.txt @@ -1,21 +1,21 @@ -TBDev Yuna Scatari Edition pre6 to TorrentPier 1.0.x converter. - -Quick guide: -1. Install and configure TorrentPier 1.0.0 or higher. -2. Import your TBDevYSE database into TorrentPier database (concretely 'comments', 'categories', 'torrents' and 'users' tables). -3. Put the contents of folder 'root' into your TorrentPier root. -4. Configure 'converter/settings.php' for optimal settings. -5. Run convert.php. -6. See 'converter/passwords.php' for new password to login under admin account. -7. Resychronize statistics using admin panel. -8. Make your new tracker popular! ----- -9. If you need to notify users for new passwords (which are needed to login in TorrentPier) via TBDevYSE PM system, - copy two files: automatically generated 'converter/passwords.php' and 'for_tbdev/pass.php' to your TBDevYSE root and run pass.php - (Don't forget to remove these files after completion). - You allow to change message text, see $msg in pass.php for this. -10. If you want to redirect peers from older announce to new announce everytime, replace original TBDev's announce.php with - 'for_tbdev/announce.php' - -Cheers, RoadTrain. +TBDev Yuna Scatari Edition pre6 to TorrentPier 1.0.x converter. + +Quick guide: +1. Install and configure TorrentPier 1.0.0 or higher. +2. Import your TBDevYSE database into TorrentPier database (concretely 'comments', 'categories', 'torrents' and 'users' tables). +3. Put the contents of folder 'root' into your TorrentPier root. +4. Configure 'converter/settings.php' for optimal settings. +5. Run convert.php. +6. See 'converter/passwords.php' for new password to login under admin account. +7. Resychronize statistics using admin panel. +8. Make your new tracker popular! +---- +9. If you need to notify users for new passwords (which are needed to login in TorrentPier) via TBDevYSE PM system, + copy two files: automatically generated 'converter/passwords.php' and 'for_tbdev/pass.php' to your TBDevYSE root and run pass.php + (Don't forget to remove these files after completion). + You allow to change message text, see $msg in pass.php for this. +10. If you want to redirect peers from older announce to new announce everytime, replace original TBDev's announce.php with + 'for_tbdev/announce.php' + +Cheers, RoadTrain. http://torrentpier.me/ \ No newline at end of file diff --git a/other/converter/TBDevYSE_pre6/for_tbdev/pass.php b/other/converter/TBDevYSE_pre6/for_tbdev/pass.php index 2e9794d83..827609c81 100644 --- a/other/converter/TBDevYSE_pre6/for_tbdev/pass.php +++ b/other/converter/TBDevYSE_pre6/for_tbdev/pass.php @@ -1,46 +1,46 @@ - -