Development

Navigation

← Previous Changeset
Next Changeset →

Changeset 1012

Timestamp:

02/20/08 21:07:23 (8 months ago)

Author:

rats

Message:

* Fixed #1059: ERROR: Undefined rwith! in setup

Files:

trunk/CHANGELOG (modified) (1 diff)
trunk/configs/logrotate/ispcp (modified) (1 diff)
trunk/configs/postfix/main.cf (modified) (1 diff)
trunk/docs/Debian/INSTALL (modified) (2 diffs)
trunk/engine/ispcp-als-mngr (modified) (15 diffs)
trunk/engine/ispcp-dmn-mngr (modified) (18 diffs)
trunk/engine/ispcp-sub-mngr (modified) (12 diffs)
trunk/engine/ispcp_common_methods.pl (modified) (4 diffs)
trunk/engine/setup/ispcp-setup-methods.pl (modified) (4 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/CHANGELOG

r1011	r1012
1	1	ispCP ω 1.0.0 Changelog
2	2	~~~~~~~~~~~~~~~~~~~~~~~~~~~~
	3
	4	2008-02-20 Benedikt Heintel
	5	- SETUP:
	6	* Fixed #1059: ERROR: Undefined rwith! in setup
3	7
4	8	2008-02-19 Benedikt Heintel

trunk/configs/logrotate/ispcp

r900	r1012
9	9	sharedscripts
10	10	prerotate
11		/var/www/ispcp/engine/traffic/ispcp-vrl-traff >/var/log/ispcp/ispcp-vrl-traff.log
	11	/var/www/ispcp/engine/traffic/ispcp-vrl-traff > /var/log/ispcp/ispcp-vrl-traff.log
12	12	endscript
13	13	postrotate

trunk/configs/postfix/main.cf

r1009	r1012
25	25	myorigin = $myhostname
26	26
27		smtpd_banner = $myhostname ESMTP ispCP {MTA_VERSION} Managed ~~{MTA_HOST_TYPE}~~
	27	smtpd_banner = $myhostname ESMTP ispCP {MTA_VERSION} Managed
28	28	setgid_group = postdrop
29	29

trunk/docs/Debian/INSTALL

r1005	r1012
60	60
61	61	2. Change to the newly created directory:
62		# cd ./ispcp-omega-1.0.0~~-rc4~~
	62	# cd ./ispcp-omega-1.0.0
63	63
64	64	3. Install the required modules
…	…
137	137
138	138	2. Change to the newly created directory:
139		# cd ./ispcp-omega-1.0.0~~-rc4~~
	139	# cd ./ispcp-omega-1.0.0
140	140
141	141	3. Install the required modules

trunk/engine/ispcp-als-mngr

r1004	r1012
288	288	my $entry_repl = "$entry_b_val$entry_val$entry_e_val\n$entry_b$entry_e";
289	289
290		($rs, $working) = repl_tag($entry_b, $entry_e, $working, $entry_repl);
	290	($rs, $working) = repl_tag($entry_b, $entry_e, $working, $entry_repl, "als_add_named_cfg_data");
291	291
292	292	return $rs if ($rs != 0);
…	…
318	318	if ($rs == 0) { # YES ! Data is here ! /in production config file/;
319	319
320		($rs, $sys) = repl_tag($dta_b, $dta_e, $sys, $working);
	320	($rs, $sys) = repl_tag($dta_b, $dta_e, $sys, $working, "als_add_named_cfg_data");
321	321
322	322	return $rs if ($rs != 0);
…	…
509	509	if ($rs == 0) { # YES ! Data is here ! /in production config file/;
510	510
511		($rs, $sys) = repl_tag($dta_b, $dta_e, $sys, $working);
	511	($rs, $sys) = repl_tag($dta_b, $dta_e, $sys, $working, "als_del_named_cfg_data");
512	512
513	513	return $rs if ($rs != 0);
…	…
999	999	$als_cgi_e,
1000	1000	$als_entry,
1001		$cgi_entry
	1001	$cgi_entry,
	1002	"gen_httpd_als_entry"
1002	1003	);
1003	1004
…	…
1025	1026	$als_php2_e,
1026	1027	$als_entry,
1027		$php2_entry
	1028	$php2_entry,
	1029	"gen_httpd_als_entry"
1028	1030	);
1029	1031
…	…
1036	1038	$als_php_e,
1037	1039	$als_entry,
1038		$php_entry
	1040	$php_entry,
	1041	"gen_httpd_als_entry"
1039	1042	);
1040	1043
…	…
1053	1056	$als_rdr_e,
1054	1057	$als_entry,
1055		$rdr_entry
	1058	$rdr_entry,
	1059	"gen_httpd_als_entry"
1056	1060	);
1057	1061
…	…
1256	1260	$als_e,
1257	1261	$vh_entry_val,
1258		$repl
	1262	$repl,
	1263	"als_add_httpd_cfg_data"
1259	1264	);
1260	1265	return $rs if ($rs != 0);
…	…
1268	1273	$vh_e,
1269	1274	$working,
1270		$repl
	1275	$repl,
	1276	"als_add_httpd_cfg_data "
1271	1277	);
1272	1278
…	…
1323	1329	$als_e,
1324	1330	$vh_entry_contents,
1325		$repl
	1331	$repl,
	1332	"als_add_httpd_cfg_data"
1326	1333	);
1327	1334
…	…
1334	1341	$vh_e_val,
1335	1342	$working,
1336		$vh_entry_contents
	1343	$vh_entry_contents,
	1344	"als_add_httpd_cfg_data"
1337	1345	);
1338	1346
…	…
1353	1361	if ($rs == 0) { # Yes, We have some ! We'll replace it;
1354	1362
1355		($rs, $sys) = repl_tag($cfg_b, $cfg_e, $sys, $working);
	1363	($rs, $sys) = repl_tag($cfg_b, $cfg_e, $sys, $working, "als_add_httpd_cfg_data");
1356	1364
1357	1365	return $rs if ($rs != 0);
…	…
1614	1622	$vh_e_val,
1615	1623	$working,
1616		$vh_entry_contents
	1624	$vh_entry_contents,
	1625	"als_del_httpd_cfg_data"
1617	1626	);
1618	1627
…	…
1629	1638	if ($rs == 0) { # Yes, We have some ! We'll replace it;
1630	1639
1631		($rs, $sys) = repl_tag($cfg_b, $cfg_e, $sys, $working);
	1640	($rs, $sys) = repl_tag($cfg_b, $cfg_e, $sys, $working, "als_del_httpd_cfg_data");
1632	1641
1633	1642	return $rs if ($rs != 0);
…	…
2605	2614	t2.domain_uid,
2606	2615	t2.domain_admin_id,
2607		t2.domain_created_id,
2608		t2.domain_created,
	2616	t2.domain_created_id,
	2617	t2.domain_created,
2609	2618	t2.domain_last_modified,
2610	2619	t2.domain_mailacc_limit,
2611	2620	t2.domain_ftpacc_limit,
2612		t2.domain_traffic_limit,
2613		t2.domain_sqld_limit,
	2621	t2.domain_traffic_limit,
	2622	t2.domain_sqld_limit,
2614	2623	t2.domain_sqlu_limit,
2615	2624	t2.domain_status,

trunk/engine/ispcp-dmn-mngr

r996	r1012
262	262	my $entry_repl = "$entry_b_val$entry_val$entry_e_val\n$entry_b$entry_e";
263	263
264		($rs, $working) = repl_tag($entry_b, $entry_e, $working, $entry_repl);
	264	($rs, $working) = repl_tag($entry_b, $entry_e, $working, $entry_repl, "dmn_add_named_cfg_data");
265	265
266	266	return $rs if ($rs != 0);
…	…
292	292	if ($rs == 0) { # YES ! Data is here ! /in production config file/;
293	293
294		($rs, $sys) = repl_tag($dta_b, $dta_e, $sys, $working);
	294	($rs, $sys) = repl_tag($dta_b, $dta_e, $sys, $working, "dmn_add_named_cfg_data");
295	295
296	296	return $rs if ($rs != 0);
…	…
488	488	if ($rs == 0) { # YES ! Data is here ! /in production config file/;
489	489
490		($rs, $sys) = repl_tag($dta_b, $dta_e, $sys, $working);
	490	($rs, $sys) = repl_tag($dta_b, $dta_e, $sys, $working, "dmn_del_named_cfg_data");
491	491
492	492	return $rs if ($rs != 0);
…	…
1055	1055	$dmn_awstats_e,
1056	1056	$dmn_entry,
1057		$awstats_entry
	1057	$awstats_entry,
	1058	"gen_httpd_dmn_group_entry"
1058	1059	);
1059	1060
…	…
1076	1077	$dmn_cgi_e,
1077	1078	$dmn_entry,
1078		$cgi_entry
	1079	$cgi_entry,
	1080	"gen_httpd_dmn_group_entry"
1079	1081	);
1080	1082
…	…
1098	1100	$dmn_php2_e,
1099	1101	$dmn_entry,
1100		$php2_entry
	1102	$php2_entry,
	1103	"gen_httpd_dmn_group_entry"
1101	1104	);
1102	1105
…	…
1109	1112	$dmn_php_e,
1110	1113	$dmn_entry,
1111		$php_entry
	1114	$php_entry,
	1115	"gen_httpd_dmn_group_entry"
1112	1116	);
1113	1117
…	…
1122	1126	$dmn_e,
1123	1127	$dg_entry,
1124		$dmn_group_entry
	1128	$dmn_group_entry,
	1129	"gen_httpd_dmn_group_entry"
1125	1130	);
1126	1131
…	…
1352	1357	$vh_e,
1353	1358	$working,
1354		$repl
	1359	$repl,
	1360	"dmn_add_httpd_cfg_data"
1355	1361	);
1356	1362
…	…
1428	1434	#
1429	1435
1430		($rs, $vh_entry_contents) = repl_tag($dg_b, $dg_e, $vh_entry_contents, $dg_entry_val);
	1436	($rs, $vh_entry_contents) = repl_tag($dg_b, $dg_e, $vh_entry_contents, $dg_entry_val, "dmn_add_httpd_cfg_data");
1431	1437
1432	1438	return $rs if ($rs != 0);
…	…
1440	1446	$vh_e_val,
1441	1447	$working,
1442		$vh_entry_contents
	1448	$vh_entry_contents,
	1449	"dmn_add_httpd_cfg_data"
1443	1450	);
1444	1451
…	…
1453	1460	if ($rs == 0) { # Yes, We have some ! We'll replace it;
1454	1461
1455		($rs, $sys) = repl_tag($cfg_b, $cfg_e, $sys, $working);
	1462	($rs, $sys) = repl_tag($cfg_b, $cfg_e, $sys, $working, "dmn_add_httpd_cfg_data");
1456	1463
1457	1464	return $rs if ($rs != 0);
…	…
1697	1704	$vh_e,
1698	1705	$working,
1699		$repl
	1706	$repl,
	1707	"dmn_del_httpd_cfg_data"
1700	1708	);
1701	1709
…	…
1760	1768	$vh_e_val,
1761	1769	$working,
1762		$vh_entry_contents
	1770	$vh_entry_contents,
	1771	"dmn_del_httpd_cfg_data"
1763	1772	);
1764	1773
…	…
1773	1782	if ($rs == 0) { # Yes, We have some ! We'll replace it;
1774	1783
1775		($rs, $sys) = repl_tag($cfg_b, $cfg_e, $sys, $working);
	1784	($rs, $sys) = repl_tag($cfg_b, $cfg_e, $sys, $working, "dmn_del_httpd_cfg_data");
1776	1785
1777	1786	return $rs if ($rs != 0);
…	…
3242	3251	$dmn_custom_e,
3243	3252	$working,
3244		$dmn_custom_task
	3253	$dmn_custom_task,
	3254	"dmn_add_crontab_data"
3245	3255	);
3246	3256
…	…
3583	3593	$dmn_bk_e,
3584	3594	$working,
3585		$dmn_bk_task
	3595	$dmn_bk_task,
	3596	"dmn_add_bkp_crontab_data"
3586	3597	);
3587	3598
…	…
4142	4153	$dmn_awstats_e,
4143	4154	$working,
4144		$dmn_awstats_task
	4155	$dmn_awstats_task,
	4156	"dmn_add_awstats_cron"
4145	4157	);
4146	4158

trunk/engine/ispcp-sub-mngr

r919	r1012
280	280	my $db_sub_entry_val = "$db_sub_entry_b_val$db_sub_entry$db_sub_entry_e_val\n$db_sub_entry_b$db_sub_entry_e";
281	281
282		($rs, $working) = repl_tag($db_sub_entry_b, $db_sub_entry_e, $working, $db_sub_entry_val);
	282	($rs, $working) = repl_tag($db_sub_entry_b, $db_sub_entry_e, $working, $db_sub_entry_val, "sub_add_named_cfg_data");
283	283
284	284	return $rs if ($rs != 0);
…	…
301	301	my $db_time_val = "$db_time_b\t\t\t $time2\t\n$db_time_e";
302	302
303		($rs, $working) = repl_tag($db_time_b, $db_time_e, $working, $db_time_val);
	303	($rs, $working) = repl_tag($db_time_b, $db_time_e, $working, $db_time_val, "sub_add_named_cfg_data");
304	304
305	305	return $rs if ($rs != 0);
…	…
496	496	my $db_time_val = "$db_time_b\t\t\t $time2\t\n$db_time_e";
497	497
498		($rs, $working) = repl_tag($db_time_b, $db_time_e, $working, $db_time_val);
	498	($rs, $working) = repl_tag($db_time_b, $db_time_e, $working, $db_time_val, "sub_del_named_cfg_data");
499	499
500	500	return $rs if ($rs != 0);
…	…
774	774	$sub_cgi_e,
775	775	$sub_entry,
776		$cgi_entry
	776	$cgi_entry,
	777	"gen_httpd_sub_group_entry"
777	778	);
778	779
…	…
799	800	$sub_php2_e,
800	801	$sub_entry,
801		$php2_entry
	802	$php2_entry,
	803	"gen_httpd_sub_group_entry"
802	804	);
803	805
…	…
810	812	$sub_php_e,
811	813	$sub_entry,
812		$php_entry
	814	$php_entry,
	815	"gen_httpd_sub_group_entry"
813	816	);
814	817
…	…
1041	1044	#
1042	1045
1043		($rs, $vh_entry_working) = repl_tag($dg_b_val, $dg_e_val, $vh_entry_working, $dg_entry_working);
	1046	($rs, $vh_entry_working) = repl_tag($dg_b_val, $dg_e_val, $vh_entry_working, $dg_entry_working, "sub_add_httpd_cfg_data");
1044	1047
1045	1048	return $rs if ($rs != 0);
…	…
1049	1052	$vh_e_val,
1050	1053	$working,
1051		$vh_entry_working
	1054	$vh_entry_working,
	1055	"sub_add_httpd_cfg_data"
1052	1056	);
1053	1057
…	…
1062	1066	if ($rs == 0) {
1063	1067
1064		($rs, $sys) = repl_tag($cfg_b, $cfg_e, $sys, $working);
	1068	($rs, $sys) = repl_tag($cfg_b, $cfg_e, $sys, $working, "sub_add_httpd_cfg_data");
1065	1069
1066	1070	return $rs if ($rs != 0);
…	…
1318	1322	#
1319	1323
1320		($rs, $vh_entry_working) = repl_tag($dg_b_val, $dg_e_val, $vh_entry_working, $dg_entry_working);
	1324	($rs, $vh_entry_working) = repl_tag($dg_b_val, $dg_e_val, $vh_entry_working, $dg_entry_working, "sub_del_httpd_cfg_data");
1321	1325
1322	1326	return $rs if ($rs != 0);
…	…
1326	1330	$vh_e_val,
1327	1331	$working,
1328		$vh_entry_working
	1332	$vh_entry_working,
	1333	"sub_del_httpd_cfg_data"
1329	1334	);
1330	1335
…	…
1339	1344	if ($rs == 0) {
1340	1345
1341		($rs, $sys) = repl_tag($cfg_b, $cfg_e, $sys, $working);
	1346	($rs, $sys) = repl_tag($cfg_b, $cfg_e, $sys, $working, "sub_del_httpd_cfg_data");
1342	1347
1343	1348	return $rs if ($rs != 0);

trunk/engine/ispcp_common_methods.pl

r997	r1012
1239	1239	sub repl_tag {
1240	1240
1241		my ($bt, $et, $src, $rwith) = @_;
	1241	my ($bt, $et, $src, $rwith, $function) = @_;
	1242
	1243	if (!defined($function)) {
	1244	$function = "not defined function"
	1245	}
1242	1246
1243	1247	push_el(\@main::el, 'repl_tag()', "Starting...");
1244	1248
1245		if (!defined ($rwith)) {
1246
1247		push_el(\@main::el, 'repl_tag()', "ERROR: Undefined ~~rwith~~!");
	1249	if (!defined($rwith)) {
	1250
	1251	push_el(\@main::el, 'repl_tag()', "ERROR: Undefined template replacement data in ".$function."!");
1248	1252
1249	1253	return (-1, '');
…	…
1303	1307	}
1304	1308
1305		($rs, $rdata) = repl_tag($bt, $et, $src, $rwith);
	1309	($rs, $rdata) = repl_tag($bt, $et, $src, $rwith, "add_tag: ($adata)");
1306	1310
1307	1311	return (-1, '') if ($rs != 0);
…	…
1322	1326	return ($rs, '') if ($rs != 0);
1323	1327
1324		($rs, $rdata) = repl_tag($bt, $et, $src, '');
	1328	($rs, $rdata) = repl_tag($bt, $et, $src, '', "del_tag");
1325	1329
1326	1330	return (-1, '') if ($rs != 0);
…	…
1360	1364	$result = $rdata;
1361	1365
1362		($rs, $rdata) = repl_tag($var, $var, $rdata, $rwith);
	1366	($rs, $rdata) = repl_tag($var, $var, $rdata, $rwith, "repl_var: $var");
1363	1367
1364	1368	return -1 if ($rs != 0 && $rs != -4);

trunk/engine/setup/ispcp-setup-methods.pl

r1008	r1012
838	838	my $entry_repl = "$entry_b_val$entry_val$entry_e_val\n$entry_b$entry_e";
839	839
840		($rs, $working) = repl_tag($entry_b, $entry_e, $working, $entry_repl);
	840	($rs, $working) = repl_tag($entry_b, $entry_e, $working, $entry_repl, "add_named_cfg_data");
841	841	return $rs if ($rs != 0);
842	842
…	…
864	864
865	865	if ($rs == 0) { # YES ! Data is here ! /in production config file/;
866		($rs, $sys) = repl_tag($dta_b, $dta_e, $sys, $working);
	866	($rs, $sys) = repl_tag($dta_b, $dta_e, $sys, $working, "add_named_cfg_data");
867	867	return $rs if ($rs != 0);
868	868	}
…	…
1310	1310	if (-f "/etc/logrotate.d/".$apache_file) {
1311	1311	$file = "/etc/logrotate.d/".$apache_file;
1312		print STDOUT "$file \n";
	1312	#print STDOUT "$file \n";
1313	1313
1314	1314	# get file
…	…
1379	1379	'{MTA_HOSTNAME}' => $main::cfg{'SERVER_HOSTNAME'},
1380	1380	'{MTA_LOCAL_DOMAIN}' => "$main::cfg{'SERVER_HOSTNAME'}.local",
1381		'{MTA_VERSION}' => $main::cfg{'VersionH'},
1382		'{MTA_HOST_TYPE}' => $main::cfg{'Version'},
	1381	'{MTA_VERSION}' => $main::cfg{'Version'},
1383	1382	'{MTA_TRANSPORT_HASH}' => $main::cfg{'MTA_TRANSPORT_HASH'},
1384	1383	'{MTA_LOCAL_MAIL_DIR}' => $main::cfg{'MTA_LOCAL_MAIL_DIR'},

Development

Navigation

Changeset 1012

Legend:

Download in other formats: