Project

General

Profile

« Previous | Next » 

Revision e90d9933

Added by Chris Buechler over 9 years ago

some CP clean up in nginx start

View differences:

src/etc/inc/system.inc
1170 1170
	}
1171 1171

  
1172 1172
	if ($captive_portal !== false) {
1173
		$captiveportal = ",\"mod_rewrite\",\"mod_evasive\"";
1174 1173
		$captive_portal_rewrite = "url.rewrite-once = ( \"(.*captiveportal.*)\" => \"$1\", \"(.*)\" => \"/index.php?zone={$captive_portal}&redirurl=$1\" )\n";
1175 1174

  
1176 1175
		$maxprocperip = $config['captiveportal'][$captive_portal]['maxprocperip'];
1177 1176
		if (empty($maxprocperip)) {
1178 1177
			$maxprocperip = 10;
1179 1178
		}
1180
		$captive_portal_mod_evasive = "evasive.max-conns-per-ip = {$maxprocperip}";
1179
		$captive_portal_maxprocperip = "limit_conn_zone \$binary_remote_addr zone=addr:10m;\n";
1180
		$captive_portal_maxprocperip .= "limit_conn addr $maxprocperip\n";
1181 1181

  
1182
		$server_upload_dirs = "server.upload-dirs = ( \"{$g['tmp_path']}/captiveportal/\" )\n";
1183
		if (!is_dir("{$g['tmp_path']}/captiveportal")) {
1184
			@mkdir("{$g['tmp_path']}/captiveportal", 0555);
1185
		}
1186
		$server_max_request_size = "server.max-request-size    = 384";
1187
		$cgi_config = "";
1188
	} else {
1189
		$captiveportal = ",\"mod_cgi\"";
1190
		$captive_portal_rewrite = "";
1191
		$captive_portal_mod_evasive = "";
1192
		$server_upload_dirs = "server.upload-dirs = ( \"{$g['upload_path']}/\", \"{$g['tmp_path']}/\", \"/var/\" )\n";
1193
		$server_max_request_size = "server.max-request-size    = 2097152";
1194
		$cgi_config = "cgi.assign                 = ( \".cgi\" => \"\" )";
1195
	}
1182
	} 
1196 1183

  
1197 1184
	if (empty($port)) {
1198 1185
		$nginx_port = "80";
......
1233 1220
		}
1234 1221
	}
1235 1222

  
1236
	if ($captive_portal !== false) {
1237
		$fast_cgi_path = "{$g['tmp_path']}/php-fastcgi-{$captive_portal}.socket";
1238
		$fastcgi_config = <<<EOD
1239
#### fastcgi module
1240
## read fastcgi.txt for more info
1241
fastcgi.server = ( ".php" =>
1242
	( "localhost" =>
1243
		(
1244
			"socket" => "{$fast_cgi_path}",
1245
			"max-procs" => {$max_procs},
1246
			"bin-environment" => (
1247
				"PHP_FCGI_CHILDREN" => "{$max_php_children}",
1248
				"PHP_FCGI_MAX_REQUESTS" => "500"
1249
			),
1250
			"bin-path" => "/usr/local/bin/php-cgi"
1251
		)
1252
	)
1253
)
1254

  
1255
EOD;
1256
	} else {
1257
		$fast_cgi_path = "{$g['varrun_path']}/php-fpm.socket";
1258
		$fastcgi_config = <<<EOD
1259
#### fastcgi module
1260
## read fastcgi.txt for more info
1261
fastcgi.server = ( ".php" =>
1262
	( "localhost" =>
1263
		(
1264
			"socket" => "{$fast_cgi_path}",
1265
			"broken-scriptfilename" => "enable"
1266
		)
1267
	)
1268
)
1269

  
1270
EOD;
1271
	}
1272

  
1273 1223
	$nginx_config = <<<EOD
1274 1224
#
1275 1225
# nginx configuration file

Also available in: Unified diff