[or-cvs] r16754: {torstatus} (ticket:109) Fixing up INSTALL file instead of adding instal (in torstatus/trunk: . geoip)
kasimir at seul.org
kasimir at seul.org
Thu Sep 4 15:55:14 UTC 2008
Author: kasimir
Date: 2008-09-04 11:55:14 -0400 (Thu, 04 Sep 2008)
New Revision: 16754
Modified:
torstatus/trunk/INSTALL
torstatus/trunk/geoip/geoip.inc
Log:
(ticket:109) Fixing up INSTALL file instead of adding installer
Modified: torstatus/trunk/INSTALL
===================================================================
--- torstatus/trunk/INSTALL 2008-09-04 15:45:00 UTC (rev 16753)
+++ torstatus/trunk/INSTALL 2008-09-04 15:55:14 UTC (rev 16754)
@@ -1,4 +1,4 @@
-Copyright (c) 2007 Kasimir Gabert
+Copyright (c) 2007-2008 Kasimir Gabert
See LICENSE for licensing information
TorStatus - Tor Network Status
@@ -18,7 +18,8 @@
support GD and PHP, and for the modern graphs must support
Perl through CGI.
2) Set the folder 'web' as the document root for your virtual host
- or web server, and the folder 'cgi-bin' as your cgi folder.
+ or web server, and the folder 'cgi-bin' as your cgi folder if
+ you have CGI/Perl support.
3) Enable compression for the web directory in Apache
c) Local Tor Server
1) Make sure you have a local Tor server running
@@ -26,20 +27,25 @@
2) You need to add 'ControlPort PORTNUMBER' to your Tor config file.
3) You need to add 'DownloadExtraInfo 1' to your Tor config file for
banwidth graphs to work correctly.
- 4) Set the cgi-bin directory of your webserver to TorStatus'
- cgi-bin directory. (For Perl-based graphs)
d) Configure TorStatus
1) You may find the full list of configuration options in README.
2) You must copy 'web/config_template.php' to 'web/config.php'
3) You must set:
$LocalTorServerIP
$LocalTorServerControlPort
+ $LocalTorServerControlPassword
+ - Only if it applies to your Tor configuration
$SQL_Server
$SQL_User
$SQL_Pass
$SQL_Catalog (means SQL database)
- $TNS_Path (leaving trailing slash)
+ $TNS_Path
+ - This is the path to the directory that you
+ installed TorStatus to. Be sure to leave a trailing
+ slash!
$myMirrorName
+ - This should be all lower case and without spaces, to
+ work well in the mirror updating program
4) Test your setup by running './tns_update.pl' or
'perl tns_update.pl'. If no errors occur after several minutes,
then things should be setup correctly. Also browse to your website
Modified: torstatus/trunk/geoip/geoip.inc
===================================================================
--- torstatus/trunk/geoip/geoip.inc 2008-09-04 15:45:00 UTC (rev 16753)
+++ torstatus/trunk/geoip/geoip.inc 2008-09-04 15:55:14 UTC (rev 16754)
@@ -103,7 +103,8 @@
"VA" => 228, "VC" => 229, "VE" => 230, "VG" => 231, "VI" => 232, "VN" => 233,
"VU" => 234, "WF" => 235, "WS" => 236, "YE" => 237, "YT" => 238, "RS" => 239,
"ZA" => 240, "ZM" => 241, "ME" => 242, "ZW" => 243, "A1" => 244, "A2" => 245,
-"O1" => 246, "AX" => 247, "GG" => 248, "IM" => 249, "JE" => 250
+"O1" => 246, "AX" => 247, "GG" => 248, "IM" => 249, "JE" => 250, "BL" => 251,
+"MF" => 252
);
var $GEOIP_COUNTRY_CODES = array(
"", "AP", "EU", "AD", "AE", "AF", "AG", "AI", "AL", "AM", "AN", "AO", "AQ",
@@ -125,7 +126,7 @@
"TF", "TG", "TH", "TJ", "TK", "TM", "TN", "TO", "TL", "TR", "TT", "TV", "TW",
"TZ", "UA", "UG", "UM", "US", "UY", "UZ", "VA", "VC", "VE", "VG", "VI", "VN",
"VU", "WF", "WS", "YE", "YT", "RS", "ZA", "ZM", "ME", "ZW", "A1", "A2", "O1",
-"AX", "GG", "IM", "JE"
+"AX", "GG", "IM", "JE", "BL", "MF"
);
var $GEOIP_COUNTRY_CODES3 = array(
"","AP","EU","AND","ARE","AFG","ATG","AIA","ALB","ARM","ANT","AGO","AQ","ARG",
@@ -147,7 +148,7 @@
"TGO","THA","TJK","TKL","TLS","TKM","TUN","TON","TUR","TTO","TUV","TWN","TZA",
"UKR","UGA","UM","USA","URY","UZB","VAT","VCT","VEN","VGB","VIR","VNM","VUT",
"WLF","WSM","YEM","YT","SRB","ZAF","ZMB","MNE","ZWE","A1","A2","O1",
-"ALA","GGY","IMN","JEY"
+"ALA","GGY","IMN","JEY","BLM","MAF"
);
var $GEOIP_COUNTRY_NAMES = array(
"", "Asia/Pacific Region", "Europe", "Andorra", "United Arab Emirates",
@@ -158,49 +159,49 @@
"Burundi", "Benin", "Bermuda", "Brunei Darussalam", "Bolivia", "Brazil",
"Bahamas", "Bhutan", "Bouvet Island", "Botswana", "Belarus", "Belize",
"Canada", "Cocos (Keeling) Islands", "Congo, The Democratic Republic of the",
-"Central African Republic", "Congo", "Switzerland", "Cote D'Ivoire", "Cook
-Islands", "Chile", "Cameroon", "China", "Colombia", "Costa Rica", "Cuba", "Cape
-Verde", "Christmas Island", "Cyprus", "Czech Republic", "Germany", "Djibouti",
+"Central African Republic", "Congo", "Switzerland", "Cote D'Ivoire", "Cook Islands",
+"Chile", "Cameroon", "China", "Colombia", "Costa Rica", "Cuba", "Cape Verde",
+"Christmas Island", "Cyprus", "Czech Republic", "Germany", "Djibouti",
"Denmark", "Dominica", "Dominican Republic", "Algeria", "Ecuador", "Estonia",
"Egypt", "Western Sahara", "Eritrea", "Spain", "Ethiopia", "Finland", "Fiji",
-"Falkland Islands (Malvinas)", "Micronesia, Federated States of", "Faroe
-Islands", "France", "France, Metropolitan", "Gabon", "United Kingdom",
+"Falkland Islands (Malvinas)", "Micronesia, Federated States of", "Faroe Islands",
+"France", "France, Metropolitan", "Gabon", "United Kingdom",
"Grenada", "Georgia", "French Guiana", "Ghana", "Gibraltar", "Greenland",
-"Gambia", "Guinea", "Guadeloupe", "Equatorial Guinea", "Greece", "South Georgia
-and the South Sandwich Islands", "Guatemala", "Guam", "Guinea-Bissau",
+"Gambia", "Guinea", "Guadeloupe", "Equatorial Guinea", "Greece", "South Georgia and the South Sandwich Islands",
+"Guatemala", "Guam", "Guinea-Bissau",
"Guyana", "Hong Kong", "Heard Island and McDonald Islands", "Honduras",
"Croatia", "Haiti", "Hungary", "Indonesia", "Ireland", "Israel", "India",
"British Indian Ocean Territory", "Iraq", "Iran, Islamic Republic of",
"Iceland", "Italy", "Jamaica", "Jordan", "Japan", "Kenya", "Kyrgyzstan",
-"Cambodia", "Kiribati", "Comoros", "Saint Kitts and Nevis", "Korea, Democratic
-People's Republic of", "Korea, Republic of", "Kuwait", "Cayman Islands",
+"Cambodia", "Kiribati", "Comoros", "Saint Kitts and Nevis", "Korea, Democratic People's Republic of",
+"Korea, Republic of", "Kuwait", "Cayman Islands",
"Kazakstan", "Lao People's Democratic Republic", "Lebanon", "Saint Lucia",
"Liechtenstein", "Sri Lanka", "Liberia", "Lesotho", "Lithuania", "Luxembourg",
-"Latvia", "Libyan Arab Jamahiriya", "Morocco", "Monaco", "Moldova, Republic
-of", "Madagascar", "Marshall Islands", "Macedonia",
+"Latvia", "Libyan Arab Jamahiriya", "Morocco", "Monaco", "Moldova, Republic of",
+"Madagascar", "Marshall Islands", "Macedonia",
"Mali", "Myanmar", "Mongolia", "Macau", "Northern Mariana Islands",
"Martinique", "Mauritania", "Montserrat", "Malta", "Mauritius", "Maldives",
"Malawi", "Mexico", "Malaysia", "Mozambique", "Namibia", "New Caledonia",
"Niger", "Norfolk Island", "Nigeria", "Nicaragua", "Netherlands", "Norway",
-"Nepal", "Nauru", "Niue", "New Zealand", "Oman", "Panama", "Peru", "French
-Polynesia", "Papua New Guinea", "Philippines", "Pakistan", "Poland", "Saint
-Pierre and Miquelon", "Pitcairn Islands", "Puerto Rico", "Palestinian Territory",
+"Nepal", "Nauru", "Niue", "New Zealand", "Oman", "Panama", "Peru", "French Polynesia",
+"Papua New Guinea", "Philippines", "Pakistan", "Poland", "Saint Pierre and Miquelon",
+"Pitcairn Islands", "Puerto Rico", "Palestinian Territory",
"Portugal", "Palau", "Paraguay", "Qatar", "Reunion", "Romania",
"Russian Federation", "Rwanda", "Saudi Arabia", "Solomon Islands",
"Seychelles", "Sudan", "Sweden", "Singapore", "Saint Helena", "Slovenia",
"Svalbard and Jan Mayen", "Slovakia", "Sierra Leone", "San Marino", "Senegal",
-"Somalia", "Suriname", "Sao Tome and Principe", "El Salvador", "Syrian Arab
-Republic", "Swaziland", "Turks and Caicos Islands", "Chad", "French Southern
-Territories", "Togo", "Thailand", "Tajikistan", "Tokelau", "Turkmenistan",
+"Somalia", "Suriname", "Sao Tome and Principe", "El Salvador", "Syrian Arab Republic",
+"Swaziland", "Turks and Caicos Islands", "Chad", "French Southern Territories",
+"Togo", "Thailand", "Tajikistan", "Tokelau", "Turkmenistan",
"Tunisia", "Tonga", "Timor-Leste", "Turkey", "Trinidad and Tobago", "Tuvalu",
"Taiwan", "Tanzania, United Republic of", "Ukraine",
"Uganda", "United States Minor Outlying Islands", "United States", "Uruguay",
-"Uzbekistan", "Holy See (Vatican City State)", "Saint Vincent and the
-Grenadines", "Venezuela", "Virgin Islands, British", "Virgin Islands, U.S.",
+"Uzbekistan", "Holy See (Vatican City State)", "Saint Vincent and the Grenadines",
+"Venezuela", "Virgin Islands, British", "Virgin Islands, U.S.",
"Vietnam", "Vanuatu", "Wallis and Futuna", "Samoa", "Yemen", "Mayotte",
"Serbia", "South Africa", "Zambia", "Montenegro", "Zimbabwe",
"Anonymous Proxy","Satellite Provider","Other",
-"Aland Islands","Guernsey","Isle of Man","Jersey"
+"Aland Islands","Guernsey","Isle of Man","Jersey","Saint Barthelemy","Saint Martin"
);
}
function geoip_load_shared_mem ($file) {
More information about the tor-commits
mailing list