Development

Navigation

← Previous Changeset
Next Changeset →

Changeset 755

Timestamp:

08/20/2007 08:35:09 AM (11 months ago)

Author:

gnif

Message:

SETUP
- Added initial supprot for SSL (not complete yet, probarbly broken)
TOOLS
- Added ispcp-make_cert.sh for SSL certificate generation
ENGINE
- Fixed all SELECT * queries
- Cleaned up long SELECT queries so they are a bit easier to read.

Files:

branches/ssl-addon/trunk/engine/backup/ispcp-backup-all (modified) (2 diffs)
branches/ssl-addon/trunk/engine/ispcp-als-mngr (modified) (2 diffs)
branches/ssl-addon/trunk/engine/ispcp-htuser-mngr (modified) (1 diff)
branches/ssl-addon/trunk/engine/ispcp-mbox-mngr (modified) (1 diff)
branches/ssl-addon/trunk/engine/ispcp-serv-mngr (modified) (1 diff)
branches/ssl-addon/trunk/engine/ispcp-sub-mngr (modified) (2 diffs)
branches/ssl-addon/trunk/engine/messager/ispcp-arpl-msgr (modified) (1 diff)
branches/ssl-addon/trunk/engine/setup/ispcp-setup (modified) (2 diffs)
branches/ssl-addon/trunk/engine/tools/ispcp-httpd-logs-mngr (modified) (2 diffs)
branches/ssl-addon/trunk/engine/traffic/ispcp-srv-traff (modified) (1 diff)
branches/ssl-addon/trunk/engine/traffic/ispcp-vrl-traff (modified) (1 diff)
branches/ssl-addon/trunk/engine/traffic/ispcp-vrl-traff-SUSE (modified) (1 diff)
branches/ssl-addon/trunk/engine/traffic/ispcp-vrl-traff-correction (modified) (1 diff)
branches/ssl-addon/trunk/tools/ssl (added)
branches/ssl-addon/trunk/tools/ssl/ispcp-make_cert.sh (added)

Legend:

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

branches/ssl-addon/trunk/engine/backup/ispcp-backup-all

r743	r755
156	156	push_el(\@main::el, 'backup_all_mail_task()', 'Starting...');
157	157
158		$sql = "select admin_name, email from admin where created_by = 0";
	158	$sql = "
	159	SELECT
	160	admin_name,
	161	email
	162	FROM
	163	admin
	164	WHERE
	165	created_by = 0
	166	";
159	167
160	168	($rs, $rdata) = doSQL($sql);
…	…
226	234
227	235
228		$sql = "select t1.domain_id, t1.domain_name, t1.domain_status, t1.domain_uid, t1.domain_gid, t2.admin_name, t2.email from domain as t1, admin as t2 where t1.domain_status = 'ok' and t1.domain_admin_id = t2.admin_id order by t1.domain_id";
	236	$sql = "
	237	SELECT
	238	t1.domain_id,
	239	t1.domain_name,
	240	t1.domain_status,
	241	t1.domain_uid,
	242	t1.domain_gid,
	243	t2.admin_name,
	244	t2.email
	245	FROM
	246	domain AS t1,
	247	admin AS t2
	248	WHERE
	249	t1.domain_status = 'ok'
	250	AND t1.domain_admin_id = t2.admin_id
	251	ORDER BY
	252	t1.domain_id
	253	";
229	254
230	255	($rs, $rdata) = doSQL($sql);

branches/ssl-addon/trunk/engine/ispcp-als-mngr

r751	r755
76	76	#
77	77
78		my $sql = "select * from domain;";
	78	my $sql = "
	79	SELECT
	80	domain_id,
	81	domain_name,
	82	domain_gid,
	83	domain_uid,
	84	domain_admin_id,
	85	domain_created_id,
	86	domain_created,
	87	domain_last_modified,
	88	domain_mailacc_limit,
	89	domain_ftpacc_limit,
	90	domain_traffic_limit,
	91	domain_sqld_limit,
	92	domain_sqlu_limit,
	93	domain_status,
	94	domain_alias_limit,
	95	domain_subd_limit,
	96	domain_ip_id,
	97	domain_disk_limit,
	98	domain_disk_usage,
	99	domain_php,
	100	domain_cgi
	101	FROM
	102	domain
	103	";
79	104
80	105	($rs, $rdata) = doSQL($sql);
…	…
2485	2510	push_el(\@main::el, 'als_mngr_engine()', 'Starting...');
2486	2511
2487		my $sql = "SELECT t1.alias_id, t1.domain_id, t1.alias_name, t1.alias_status, t1.alias_mount,
2488		t1.alias_ip_id, t1.url_forward, t2.domain_id, t2.domain_name, t2.domain_gid, t2.domain_uid,
2489		t2.domain_admin_id, t2.domain_created_id, t2.domain_created, t2.domain_last_modified,
2490		t2.domain_mailacc_limit, t2.domain_ftpacc_limit, t2.domain_traffic_limit, t2.domain_sqld_limit,
2491		t2.domain_sqlu_limit, t2.domain_status, t2.domain_alias_limit, t2.domain_subd_limit,
2492		t2.domain_ip_id, t2.domain_disk_limit, t2.domain_disk_usage, t2.domain_php, t2.domain_cgi
2493		FROM domain_aliasses AS t1, domain AS t2
2494		WHERE t2.domain_id = t1.domain_id AND t1.alias_id = $main::als_task_id";
	2512	my $sql = "
	2513	SELECT
	2514	t1.alias_id,
	2515	t1.domain_id,
	2516	t1.alias_name,
	2517	t1.alias_status,
	2518	t1.alias_mount,
	2519	t1.alias_ip_id,
	2520	t1.url_forward,
	2521	t2.domain_id,
	2522	t2.domain_name,
	2523	t2.domain_gid,
	2524	t2.domain_uid,
	2525	t2.domain_admin_id,
	2526	t2.domain_last_modified,
	2527	t2.domain_mailacc_limit,
	2528	t2.domain_ftpacc_limit,
	2529	t2.domain_sqlu_limit,
	2530	t2.domain_status,
	2531	t2.domain_alias_limit,
	2532	t2.domain_subd_limit,
	2533	t2.domain_ip_id,
	2534	t2.domain_disk_limit,
	2535	t2.domain_disk_usage,
	2536	t2.domain_php,
	2537	t2.domain_cgi
	2538	FROM
	2539	domain_aliasses AS t1,
	2540	domain AS t2
	2541	WHERE
	2542	t2.domain_id = t1.domain_id
	2543	AND t1.alias_id = $main::als_task_id
	2544	";
2495	2545
2496	2546	my $sql2 = undef;

branches/ssl-addon/trunk/engine/ispcp-htuser-mngr

r570	r755
76	76	#
77	77
78		my $sql = "select * from domain;";
	78	my $sql = "
	79	SELECT
	80	domain_id,
	81	domain_name,
	82	domain_gid,
	83	domain_uid,
	84	domain_admin_id,
	85	domain_created_id,
	86	domain_created,
	87	domain_last_modified,
	88	domain_mailacc_limit,
	89	domain_ftpacc_limit,
	90	domain_traffic_limit,
	91	domain_sqld_limit,
	92	domain_sqlu_limit,
	93	domain_status,
	94	domain_alias_limit,
	95	domain_subd_limit,
	96	domain_ip_id,
	97	domain_disk_limit,
	98	domain_disk_usage,
	99	domain_php,
	100	domain_cgi
	101	FROM
	102	domain
	103	";
79	104
80	105	($rs, $rdata) = doSQL($sql);

branches/ssl-addon/trunk/engine/ispcp-mbox-mngr

r745	r755
187	187	#
188	188
189		my $sql = "select * from mail_users;";
	189	my $sql = "
	190	SELECT
	191	mail_id,
	192	mail_acc,
	193	mail_pass,
	194	mail_forward,
	195	domain_id,
	196	mail_type,
	197	sub_id,
	198	status,
	199	mail_auto_respond,
	200	quota,
	201	mail_addr
	202	FROM
	203	mail_users
	204	";
190	205
191	206	($rs, $rdata) = doSQL($sql);

branches/ssl-addon/trunk/engine/ispcp-serv-mngr

r595	r755
83	83	#
84	84
85		my $sql = "select * from domain;";
	85	my $sql = "
	86	SELECT
	87	domain_id,
	88	domain_name,
	89	domain_gid,
	90	domain_uid,
	91	domain_admin_id,
	92	domain_created_id,
	93	domain_created,
	94	domain_last_modified,
	95	domain_mailacc_limit,
	96	domain_ftpacc_limit,
	97	domain_traffic_limit,
	98	domain_sqld_limit,
	99	domain_sqlu_limit,
	100	domain_status,
	101	domain_alias_limit,
	102	domain_subd_limit,
	103	domain_ip_id,
	104	domain_disk_limit,
	105	domain_disk_usage,
	106	domain_php,
	107	domain_cgi
	108	FROM
	109	domain
	110	";
86	111
87	112	($rs, $rdata) = doSQL($sql);

branches/ssl-addon/trunk/engine/ispcp-sub-mngr

r751	r755
85	85	#
86	86
87		my $sql = "select * from subdomain;";
	87	my $sql = "
	88	SELECT
	89	subdomain_id,
	90	domain_id,
	91	subdomain_name,
	92	subdomain_mount,
	93	subdomain_status
	94	FROM
	95	subdomain
	96	";
88	97
89	98	($rs, $rdata) = doSQL($sql);
…	…
2135	2144	push_el(\@main::el, 'sub_mngr_engine()', 'Starting...');
2136	2145
2137		my $sql = "SELECT t1.subdomain_id, t1.domain_id, t1.subdomain_name, t1.subdomain_mount, t1.subdomain_status,
2138		t2.domain_id, t2.domain_name, t2.domain_gid, t2.domain_uid, t2.domain_admin_id, t2.domain_created_id, t2.domain_created,
2139		t2.domain_last_modified, t2.domain_mailacc_limit, t2.domain_ftpacc_limit, t2.domain_traffic_limit, t2.domain_sqld_limit,
2140		t2.domain_sqlu_limit, t2.domain_status, t2.domain_alias_limit, t2.domain_subd_limit, t2.domain_ip_id, t2.domain_disk_limit,
2141		t2.domain_disk_usage, t2.domain_php, t2.domain_cgi, t3.ip_number FROM subdomain as t1, domain as t2, server_ips as t3
2142		WHERE t1.domain_id = t2.domain_id AND t2.domain_ip_id = t3.ip_id AND t1.subdomain_id = $main::sub_task_id";
2143
	2146	my $sql = "
	2147	SELECT
	2148	t1.subdomain_id,
	2149	t1.domain_id,
	2150	t1.subdomain_name,
	2151	t1.subdomain_mount,
	2152	t1.subdomain_status,
	2153	t2.domain_id,
	2154	t2.domain_name,
	2155	t2.domain_gid,
	2156	t2.domain_uid,
	2157	t2.domain_admin_id,
	2158	t2.domain_created_id,
	2159	t2.domain_created,
	2160	t2.domain_last_modified,
	2161	t2.domain_mailacc_limit,
	2162	t2.domain_ftpacc_limit,
	2163	t2.domain_traffic_limit,
	2164	t2.domain_sqld_limit,
	2165	t2.domain_sqlu_limit,
	2166	t2.domain_status,
	2167	t2.domain_alias_limit,
	2168	t2.domain_subd_limit,
	2169	t2.domain_ip_id,
	2170	t2.domain_disk_limit,
	2171	t2.domain_disk_usage,
	2172	t2.domain_php,
	2173	t2.domain_cgi,
	2174	t3.ip_number
	2175	FROM
	2176	subdomain AS t1,
	2177	domain AS t2,
	2178	server_ips AS t3
	2179	WHERE
	2180	t1.domain_id = t2.domain_id
	2181	AND t2.domain_ip_id = t3.ip_id
	2182	AND t1.subdomain_id = $main::sub_task_id
	2183	";
2144	2184
2145	2185	($rs, $rows) = doSQL($sql);

branches/ssl-addon/trunk/engine/messager/ispcp-arpl-msgr

r595	r755
596	596	#
597	597
598		my $sql = "select * from domain;";
	598	my $sql = "
	599	SELECT
	600	domain_id,
	601	domain_name,
	602	domain_gid,
	603	domain_uid,
	604	domain_admin_id,
	605	domain_created_id,
	606	domain_created,
	607	domain_last_modified,
	608	domain_mailacc_limit,
	609	domain_ftpacc_limit,
	610	domain_traffic_limit,
	611	domain_sqld_limit,
	612	domain_sqlu_limit,
	613	domain_status,
	614	domain_alias_limit,
	615	domain_ip_id,
	616	domain_disk_limit,
	617	domain_disk_usage,
	618	domain_php,
	619	domain_cgi
	620	FROM
	621	domain
	622	";
599	623
600	624	($rs, $rdata) = doSQL($sql);

branches/ssl-addon/trunk/engine/setup/ispcp-setup

r751	r755
2294	2294
2295	2295	#
2296		# start fastcgi, suexec ~~and rewrite mod~~
	2296	# start fastcgi, suexec, rewrite mod and ssl
2297	2297	#
2298	2298
…	…
2304	2304	sys_command_rs("/usr/sbin/a2enmod fastcgi_ispcp &> /tmp/ispcp-setup-services.log");
2305	2305	sys_command_rs("/usr/sbin/a2enmod suexec &> /tmp/ispcp-setup-services.log");
	2306	sys_command_rs("/usr/sbin/a2enmod suexec &> /tmp/ispcp-setup-services.log");
2306	2307
2307	2308	if ($main::cfg{'AWSTATS_ACTIVE'} eq 'yes') {
2308	2309	sys_command_rs("/usr/sbin/a2enmod proxy &> /tmp/ispcp-setup-services.log");
	2310	}
	2311
	2312	if ( -e "/usr/bin/openssl" ) {
	2313	sys_command_rs("/usr/sbin/a2enmod ssl &> /tmp/ispcp-setup-services.log");
	2314	sys_command_rs("/usr/sbin/ispcp-make_cert.sh &> /tmp/ispcp-setup-services.log");
	2315	sys_command_rs("mv ssl.key $main::cfg{'ROOT_DIR'}/ssl.key");
2309	2316	}
2310	2317

branches/ssl-addon/trunk/engine/tools/ispcp-httpd-logs-mngr

r595	r755
68	68	#
69	69
70		my $sql = "select * from domain;";
	70	my $sql = "
	71	SELECT
	72	domain_id,
	73	domain_name,
	74	domain_gid,
	75	domain_uid,
	76	domain_admin_id,
	77	domain_created_id,
	78	domain_created,
	79	domain_last_modified,
	80	domain_mailacc_limit,
	81	domain_ftpacc_limit,
	82	domain_traffic_limit,
	83	domain_sqld_limit,
	84	domain_sqlu_limit,
	85	domain_status,
	86	domain_alias_limit,
	87	domain_ip_id,
	88	domain_disk_limit,
	89	domain_disk_usage,
	90	domain_php,
	91	domain_cgi
	92	FROM
	93	domain
	94	";
71	95
72	96	($rs, $rdata) = doSQL($sql);
…	…
220	244	push_el(\@main::el, 'copy_alias_logs()', 'Starting...');
221	245
222		my $sql = "select t1., t2. from domain_aliasses as t1, domain as t2 where t1.domain_id = t2.domain_id and t1.alias_status = 'ok'";
	246	my $sql = "
	247	SELECT
	248	t1.alias_id,
	249	t1.domain_id,
	250	t1.alias_name,
	251	t1.alias_status,
	252	t1.alias_mount,
	253	t1.alias_ip_id,
	254	t1.url_forward,
	255	t2.domain_id,
	256	t2.domain_name,
	257	t2.domain_gid,
	258	t2.domain_uid,
	259	t2.domain_admin_id,
	260	t2.domain_created_id,
	261	t2.domain_created,
	262	t2.domain_last_modified,
	263	t2.domain_mailacc_limit,
	264	t2.domain_ftpacc_limit,
	265	t2.domain_traffic_limit,
	266	t2.domain_sqld_limit,
	267	t2.domain_sqlu_limit,
	268	t2.domain_status,
	269	t2.domain_alias_limit,
	270	t2.domain_ip_id,
	271	t2.domain_disk_limit,
	272	t2.domain_disk_usage,
	273	t2.domain_php,
	274	t2.domain_cgi
	275	FROM
	276	domain_aliasses AS t1,
	277	domain AS t2
	278	WHERE
	279	t1.domain_id = t2.domain_id
	280	AND t1.alias_status = 'ok'
	281	";
223	282
224	283	($rs, $rows) = doSQL($sql);

branches/ssl-addon/trunk/engine/traffic/ispcp-srv-traff

r652	r755
65	65	#
66	66
67		my $sql = "select * from domain;";
	67	my $sql = "
	68	SELECT
	69	domain_id,
	70	domain_name,
	71	domain_gid,
	72	domain_uid,
	73	domain_admin_id,
	74	domain_created_id,
	75	domain_created,
	76	domain_last_modified,
	77	domain_mailacc_limit,
	78	domain_ftpacc_limit,
	79	domain_traffic_limit,
	80	domain_sqld_limit,
	81	domain_sqlu_limit,
	82	domain_status,
	83	domain_alias_limit,
	84	domain_ip_id,
	85	domain_disk_limit,
	86	domain_disk_usage,
	87	domain_php,
	88	domain_cgi
	89	FROM
	90	domain
	91	";
68	92
69	93	($rs, $rdata) = doSQL($sql);

branches/ssl-addon/trunk/engine/traffic/ispcp-vrl-traff

r595	r755
722	722	#
723	723
724		my $sql = "select * from domain;";
	724	my $sql = "
	725	SELECT
	726	domain_id,
	727	domain_name,
	728	domain_gid,
	729	domain_uid,
	730	domain_admin_id,
	731	domain_created_id,
	732	domain_created,
	733	domain_last_modified,
	734	domain_mailacc_limit,
	735	domain_ftpacc_limit,
	736	domain_traffic_limit,
	737	domain_sqld_limit,
	738	domain_sqlu_limit,
	739	domain_status,
	740	domain_alias_limit,
	741	domain_ip_id,
	742	domain_disk_limit,
	743	domain_disk_usage,
	744	domain_php,
	745	domain_cgi
	746	FROM
	747	domain
	748	";
725	749
726	750	($rs, $rdata) = doSQL($sql);

branches/ssl-addon/trunk/engine/traffic/ispcp-vrl-traff-SUSE

r595	r755
719	719	#
720	720
721		my $sql = "select * from domain;";
	721	my $sql = "
	722	SELECT
	723	domain_id,
	724	domain_name,
	725	domain_gid,
	726	domain_uid,
	727	domain_admin_id,
	728	domain_created_id,
	729	domain_created,
	730	domain_last_modified,
	731	domain_mailacc_limit,
	732	domain_ftpacc_limit,
	733	domain_traffic_limit,
	734	domain_sqld_limit,
	735	domain_sqlu_limit,
	736	domain_status,
	737	domain_alias_limit,
	738	domain_ip_id,
	739	domain_disk_limit,
	740	domain_disk_usage,
	741	domain_php,
	742	domain_cgi
	743	FROM
	744	domain
	745	";
722	746
723	747	($rs, $rdata) = doSQL($sql);

branches/ssl-addon/trunk/engine/traffic/ispcp-vrl-traff-correction

r595	r755
65	65	#
66	66
67		my $sql = "select * from domain;";
	67	my $sql = "
	68	SELECT
	69	domain_id,
	70	domain_name,
	71	domain_gid,
	72	domain_uid,
	73	domain_admin_id,
	74	domain_created_id,
	75	domain_created,
	76	domain_last_modified,
	77	domain_mailacc_limit,
	78	domain_ftpacc_limit,
	79	domain_traffic_limit,
	80	domain_sqld_limit,
	81	domain_sqlu_limit,
	82	domain_status,
	83	domain_alias_limit,
	84	domain_ip_id,
	85	domain_disk_limit,
	86	domain_disk_usage,
	87	domain_php,
	88	domain_cgi
	89	FROM
	90	domain
	91	";
68	92
69	93	($rs, $rdata) = doSQL($sql);

Development

Navigation

Changeset 755

Legend:

Download in other formats: