Development

Navigation

← Previous Changeset
Next Changeset →

Changeset 1089

Timestamp:

03/31/08 10:49:45 (6 months ago)

Author:

rats

Message:

* Fixed Partly #1080: active web folders should not be deletable by customer (for main domain)
* Changed: Config File Structure
* Fixed #1136: Overwriting fcgi config during update RC3->RC4
* Fixed #1148: DNS serial is not updated more than once a day when changing sub domains

Files:

trunk/CHANGELOG (modified) (1 diff)
trunk/Makefile.suse (modified) (1 diff)
trunk/configs/BSDmakefile (modified) (1 diff)
trunk/configs/Makefile (modified) (1 diff)
trunk/configs/centos (copied) (copied from trunk/configs/dists/centos)
trunk/configs/centos/ispcp.conf (modified) (1 diff)
trunk/configs/debian (added)
trunk/configs/debian/Makefile (copied) (copied from trunk/configs/Makefile) (3 diffs)
trunk/configs/debian/apache (moved) (moved from trunk/configs/apache)
trunk/configs/debian/awstats (moved) (moved from trunk/configs/awstats)
trunk/configs/debian/bind (moved) (moved from trunk/configs/bind)
trunk/configs/debian/courier (moved) (moved from trunk/configs/courier)
trunk/configs/debian/cron.d (moved) (moved from trunk/configs/cron.d)
trunk/configs/debian/database (moved) (moved from trunk/configs/database)
trunk/configs/debian/fcgi (moved) (moved from trunk/configs/fcgi)
trunk/configs/debian/init.d (moved) (moved from trunk/configs/init.d)
trunk/configs/debian/ispcp.conf (moved) (moved from trunk/configs/ispcp.conf) (1 diff)
trunk/configs/debian/logrotate (moved) (moved from trunk/configs/logrotate)
trunk/configs/debian/postfix (moved) (moved from trunk/configs/postfix)
trunk/configs/debian/proftpd (moved) (moved from trunk/configs/proftpd)
trunk/configs/debian/proftpd/proftpd.conf (modified) (2 diffs)
trunk/configs/debian/proftpd/proftpd1.3.conf (modified) (2 diffs)
trunk/configs/dists (deleted)
trunk/configs/fedora (copied) (copied from trunk/configs/dists/fedora)
trunk/configs/fedora/Makefile (modified) (3 diffs)
trunk/configs/fedora/ispcp.conf (modified) (1 diff)
trunk/configs/freebsd (copied) (copied from trunk/configs/dists/freebsd)
trunk/configs/freebsd/ispcp.conf (modified) (1 diff)
trunk/configs/gentoo (copied) (copied from trunk/configs/dists/gentoo)
trunk/configs/gentoo/ispcp.conf (modified) (1 diff)
trunk/configs/openbsd (copied) (copied from trunk/configs/dists/openbsd)
trunk/configs/openbsd/ispcp.conf (modified) (1 diff)
trunk/configs/opensuse (copied) (copied from trunk/configs/dists/opensuse)
trunk/configs/opensuse/ispcp.conf (modified) (1 diff)
trunk/configs/redhat (copied) (copied from trunk/configs/dists/redhat)
trunk/configs/redhat/ispcp.conf (modified) (1 diff)
trunk/configs/ubuntu (copied) (copied from trunk/configs/dists/ubuntu)
trunk/configs/ubuntu/ispcp.conf (modified) (1 diff)
trunk/engine/ispcp-als-mngr (modified) (1 diff)
trunk/engine/ispcp-dmn-mngr (modified) (3 diffs)
trunk/engine/ispcp-sub-mngr (modified) (3 diffs)
trunk/engine/setup/ispcp-setup-methods.pl (modified) (2 diffs)

Legend:

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

trunk/CHANGELOG

r1088	r1089
1	1	ispCP ω 1.0.0 Changelog
2	2	~~~~~~~~~~~~~~~~~~~~~~~~~~~~
	3
	4	2008-03-31 Benedikt Heintel
	5	- CONFIGS:
	6	* Fixed Partly #1080: active web folders should not be deletable by customer (for main domain)
	7	* Changed: Config File Structure
	8	- ENGINE:
	9	* Fixed #1136: Overwriting fcgi config during update RC3->RC4
	10	* Fixed #1148: DNS serial is not updated more than once a day when changing sub domains
3	11
4	12	2008-03-29 Jochen Manz

trunk/Makefile.suse

r1050 r1089

35 35 endif
36 36
37 HOST_OS=suse
37 HOST_OS=opensuse
38 38
39 39 ROOT_CONF=$(INST_PREF)/etc

trunk/configs/BSDmakefile

r1050	r1089
36	36
37	37	install:
38		cd ~~dists/~~$(HOST_OS) && $(MAKE) install
	38	cd $(HOST_OS) && $(MAKE) install
39	39
40	40	uninstall:
41		cd ~~dists/~~$(HOST_OS) && $(MAKE) uninstall
	41	cd $(HOST_OS) && $(MAKE) uninstall

trunk/configs/Makefile

r1059	r1089
32	32
33	33	install:
34
35		if test $(HOST_OS) = debian ; then \
36		cp ./ispcp.conf $(SYSTEM_CONF) ; \
37		(cd ./apache && $(MAKE) install &); \
38		(cd ./awstats && $(MAKE) install &); \
39		(cd ./bind && $(MAKE) install &); \
40		(cd ./cron.d && $(MAKE) install &); \
41		(cd ./database && $(MAKE) install &); \
42		(cd ./fcgi && $(MAKE) install &); \
43		(cd ./init.d && $(MAKE) install &); \
44		(cd ./postfix && $(MAKE) install &); \
45		(cd ./courier && $(MAKE) install &); \
46		(cd ./proftpd && $(MAKE) install &); \
47		(cd ./logrotate && $(MAKE) install); \
48		elif test $(HOST_OS) = centos ; then \
49		cd ./dists/centos && $(MAKE) install ; \
50		elif test $(HOST_OS) = fedora ; then \
51		cd ./dists/fedora && $(MAKE) install ; \
52		elif test $(HOST_OS) = gentoo ; then \
53		cd ./dists/gentoo && $(MAKE) install ; \
54		elif test $(HOST_OS) = redhat ; then \
55		cd ./dists/redhat && $(MAKE) install ; \
56		elif test $(HOST_OS) = suse ; then \
57		cd ./dists/opensuse && $(MAKE) install ; \
58		elif test $(HOST_OS) = opensuse ; then \
59		cd ./dists/opensuse && $(MAKE) install ; \
60		elif test $(HOST_OS) = ubuntu ; then \
61		cd ./dists/ubuntu && $(MAKE) install ; \
62		fi
	34	cd $(HOST_OS) && $(MAKE) install
63	35
64	36	uninstall:
65
66		if test $(HOST_OS) = debian ; then \
67		rm -rf $(SYSTEM_CONF)/ispcp.conf ; \
68		(cd ./apache && $(MAKE) uninstall &); \
69		(cd ./awstats && $(MAKE) uninstall &); \
70		(cd ./bind && $(MAKE) uninstall &); \
71		(cd ./cron.d && $(MAKE) uninstall &); \
72		(cd ./database && $(MAKE) uninstall &); \
73		(cd ./init.d && $(MAKE) uninstall &); \
74		(cd ./postfix && $(MAKE) uninstall &); \
75		(cd ./courier && $(MAKE) uninstall &); \
76		(cd ./proftpd && $(MAKE) uninstall &); \
77		(cd ./logrotate && $(MAKE) uninstall &); \
78		elif test $(HOST_OS) = centos ; then \
79		cd ./dists/centos && $(MAKE) uninstall ; \
80		elif test $(HOST_OS) = fedora ; then \
81		cd ./dists/fedora && $(MAKE) uninstall ; \
82		elif test $(HOST_OS) = gentoo ; then \
83		cd ./dists/gentoo && $(MAKE) uninstall ; \
84		elif test $(HOST_OS) = redhat ; then \
85		cd ./dists/redhat && $(MAKE) uninstall ; \
86		elif test $(HOST_OS) = suse ; then \
87		cd ./dists/opensuse && $(MAKE) uninstall ; \
88		elif test $(HOST_OS) = opensuse ; then \
89		cd ./dists/opensuse && $(MAKE) uninstall ; \
90		elif test $(HOST_OS) = ubuntu ; then \
91		cd ./dists/ubuntu && $(MAKE) uninstall ; \
92		fi
	37	cd $(HOST_OS) && $(MAKE) uninstall

trunk/configs/centos/ispcp.conf

r1068 r1089

9 9 #
10 10
11 BuildDate = 20080318
11 BuildDate = 20080331
12 12
13 13 Version = 1.0.0 RC5 OMEGA

trunk/configs/debian/Makefile

r1059	r1089
32	32
33	33	install:
34
35	34	if test $(HOST_OS) = debian ; then \
36	35	cp ./ispcp.conf $(SYSTEM_CONF) ; \
…	…
46	45	(cd ./proftpd && $(MAKE) install &); \
47	46	(cd ./logrotate && $(MAKE) install); \
48		~~elif test $(HOST_OS) = centos ; then \~~
49		~~cd ./dists/centos && $(MAKE) install ; \~~
50		~~elif test $(HOST_OS) = fedora ; then \~~
51		~~cd ./dists/fedora && $(MAKE) install ; \~~
52		~~elif test $(HOST_OS) = gentoo ; then \~~
53		~~cd ./dists/gentoo && $(MAKE) install ; \~~
54		~~elif test $(HOST_OS) = redhat ; then \~~
55		~~cd ./dists/redhat && $(MAKE) install ; \~~
56		~~elif test $(HOST_OS) = suse ; then \~~
57		~~cd ./dists/opensuse && $(MAKE) install ; \~~
58		~~elif test $(HOST_OS) = opensuse ; then \~~
59		~~cd ./dists/opensuse && $(MAKE) install ; \~~
60		~~elif test $(HOST_OS) = ubuntu ; then \~~
61		~~cd ./dists/ubuntu && $(MAKE) install ; \~~
62	47	fi
63	48
64	49	uninstall:
65
66	50	if test $(HOST_OS) = debian ; then \
67	51	rm -rf $(SYSTEM_CONF)/ispcp.conf ; \
…	…
76	60	(cd ./proftpd && $(MAKE) uninstall &); \
77	61	(cd ./logrotate && $(MAKE) uninstall &); \
78		~~elif test $(HOST_OS) = centos ; then \~~
79		~~cd ./dists/centos && $(MAKE) uninstall ; \~~
80		~~elif test $(HOST_OS) = fedora ; then \~~
81		~~cd ./dists/fedora && $(MAKE) uninstall ; \~~
82		~~elif test $(HOST_OS) = gentoo ; then \~~
83		~~cd ./dists/gentoo && $(MAKE) uninstall ; \~~
84		~~elif test $(HOST_OS) = redhat ; then \~~
85		~~cd ./dists/redhat && $(MAKE) uninstall ; \~~
86		~~elif test $(HOST_OS) = suse ; then \~~
87		~~cd ./dists/opensuse && $(MAKE) uninstall ; \~~
88		~~elif test $(HOST_OS) = opensuse ; then \~~
89		~~cd ./dists/opensuse && $(MAKE) uninstall ; \~~
90		~~elif test $(HOST_OS) = ubuntu ; then \~~
91		~~cd ./dists/ubuntu && $(MAKE) uninstall ; \~~
92	62	fi

trunk/configs/debian/ispcp.conf

r1068 r1089

9 9 #
10 10
11 BuildDate = 20080318
11 BuildDate = 20080331
12 12
13 13 Version = 1.0.0 RC5 OMEGA

trunk/configs/debian/proftpd/proftpd.conf

r1059	r1089
79	79
80	80	# Normally, we want files to be overwriteable.
81
82	81	<Directory /*>
83	82	# Umask 022 is a good standard umask to prevent new files and dirs
…	…
87	86	AllowOverwrite on
88	87	HideNoAccess on
	88	</Directory>
	89
	90	# But not to overwrite ispCP Standard directories.
	91	<Directory ~/>
	92	PathDenyFilter "^/(backups\|cgi-bin\|htdocs\|errors\|logs\|phptmp\|statistics)/?$"
89	93	</Directory>
90	94

trunk/configs/debian/proftpd/proftpd1.3.conf

r1059	r1089
79	79
80	80	# Normally, we want files to be overwriteable.
81
82	81	<Directory /*>
83	82	# Umask 022 is a good standard umask to prevent new files and dirs
…	…
87	86	AllowOverwrite on
88	87	HideNoAccess on
	88	</Directory>
	89
	90	# But not to overwrite ispCP Standard directories.
	91	<Directory ~/>
	92	PathDenyFilter "^/(backups\|cgi-bin\|htdocs\|errors\|logs\|phptmp\|statistics)/?$"
89	93	</Directory>
90	94

trunk/configs/fedora/Makefile

r1059	r1089
32	32
33	33	install:
34
35	34	if test $(HOST_OS) = fedora ; then \
36	35	cp ./ispcp.conf $(SYSTEM_CONF) ; \
…	…
49	48
50	49	uninstall:
51
52	50	if test $(HOST_OS) = fedora ; then \
53	51	rm -rf $(SYSTEM_CONF)/ispcp.conf ; \
…	…
62	60	(cd ./proftpd && $(MAKE) uninstall &); \
63	61	(cd ./logrotate && $(MAKE) uninstall &); \
64
65	62	fi

trunk/configs/fedora/ispcp.conf

r1068 r1089

9 9 #
10 10
11 BuildDate = 20080318
11 BuildDate = 20080331
12 12
13 13 Version = 1.0.0 RC5 OMEGA
trunk/configs/freebsd/ispcp.conf

r1073 r1089

9 9 #
10 10
11 BuildDate = 20080318
11 BuildDate = 20080331
12 12
13 13 Version = 1.0.0 RC5 OMEGA
trunk/configs/gentoo/ispcp.conf

r1068 r1089

9 9 #
10 10
11 BuildDate = 20080318
11 BuildDate = 20080331
12 12
13 13 Version = 1.0.0 RC5 OMEGA
trunk/configs/openbsd/ispcp.conf

r1068 r1089

9 9 #
10 10
11 BuildDate = 20080318
11 BuildDate = 20080331
12 12
13 13 Version = 1.0.0 RC5 OMEGA
trunk/configs/opensuse/ispcp.conf

r1071 r1089

9 9 #
10 10
11 BuildDate = 20080318
11 BuildDate = 20080331
12 12
13 13 Version = 1.0.0 RC5 OMEGA
trunk/configs/redhat/ispcp.conf

r1068 r1089

9 9 #
10 10
11 BuildDate = 20080318
11 BuildDate = 20080331
12 12
13 13 Version = 1.0.0 RC5 OMEGA
trunk/configs/ubuntu/ispcp.conf

r1068 r1089

9 9 #
10 10
11 BuildDate = 20080318
11 BuildDate = 20080331
12 12
13 13 Version = 1.0.0 RC5 OMEGA

trunk/engine/ispcp-als-mngr

r1068	r1089
605	605	return $rs if ($rs != 0);
606	606
	607	my $seq = 0;
607	608
608	609	#
609		# RFC 1912 ~~template fix by Puuhis ;)~~
	610	# RFC 1912
610	611	#
611	612
612	613	my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
613	614
614		my $time2 = sprintf "%4d%02d%02d00",$year+1900,$mon+1,$mday;
	615	my $time2 = sprintf "%4d%02d%02d00",$year+1900,$mon+1,$mday,$seq;
615	616
616	617	#

trunk/engine/ispcp-dmn-mngr

r1081	r1089
587	587	return $rs if ($rs != 0);
588	588
	589	my $seq = 0;
	590
589	591	#
590	592	# RFC 1912
…	…
593	595	my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
594	596
595		my $time2 = sprintf "%4d%02d%02d00",$year+1900,$mon+1,$mday;
	597	my $time2 = sprintf "%4d%02d%02d00",$year+1900,$mon+1,$mday,$seq;
596	598
597	599	#
…	…
2384	2386	# php.ini for the domain
2385	2387	#
2386		my $ini_tpl = undef;
2387		my $ini_cfg_dir = "$main::cfg{'CONF_DIR'}/fcgi/parts/php4";
2388
2389		($rs, $ini_tpl) = get_tpl($ini_cfg_dir, 'php.ini');
2390		return $rs if ($rs != 0);
2391
2392		my %tag_hash = (
2393		'{PEAR_DIR}' => $pear_dir,
2394		'{WWW_DIR}' => $www_dir,
2395		'{DMN_NAME}' => $dmn_name
2396		);
2397
2398		($rs, $cfg) = prep_tpl(\%tag_hash, $ini_tpl);
2399		return $rs if ($rs != 0);
2400
2401		($rs, $rdata) = store_file("$starter_dir/$dmn_name/php4/php.ini", $cfg, $sys_user, $sys_group, 0640);
2402		return $rs if ($rs != 0);
2403
2404
2405		$ini_tpl = '';
2406		$ini_cfg_dir = "$main::cfg{'CONF_DIR'}/fcgi/parts/php5";
2407
2408		($rs, $ini_tpl) = get_tpl($ini_cfg_dir, 'php.ini');
2409		return $rs if ($rs != 0);
2410
2411		%tag_hash = (
2412		'{PEAR_DIR}' => $pear_dir,
2413		'{WWW_DIR}' => $www_dir,
2414		'{DMN_NAME}' => $dmn_name
2415		);
2416
2417		($rs, $cfg) = prep_tpl(\%tag_hash, $ini_tpl);
2418		return $rs if ($rs != 0);
2419
2420		($rs, $rdata) = store_file("$starter_dir/$dmn_name/php5/php.ini", $cfg, $sys_user, $sys_group, 0640);
2421		return $rs if ($rs != 0);
	2388	if (! (-e "$starter_dir/$dmn_name/php4/php.ini")) {
	2389	my $ini_tpl = undef;
	2390	my $ini_cfg_dir = "$main::cfg{'CONF_DIR'}/fcgi/parts/php4";
	2391
	2392	($rs, $ini_tpl) = get_tpl($ini_cfg_dir, 'php.ini');
	2393	return $rs if ($rs != 0);
	2394
	2395	my %tag_hash = (
	2396	'{PEAR_DIR}' => $pear_dir,
	2397	'{WWW_DIR}' => $www_dir,
	2398	'{DMN_NAME}' => $dmn_name
	2399	);
	2400
	2401	($rs, $cfg) = prep_tpl(\%tag_hash, $ini_tpl);
	2402	return $rs if ($rs != 0);
	2403
	2404	($rs, $rdata) = store_file("$starter_dir/$dmn_name/php4/php.ini", $cfg, $sys_user, $sys_group, 0640);
	2405	return $rs if ($rs != 0);
	2406	}
	2407	if (! (-e "$starter_dir/$dmn_name/php5/php.ini")) {
	2408	$ini_tpl = '';
	2409	$ini_cfg_dir = "$main::cfg{'CONF_DIR'}/fcgi/parts/php5";
	2410
	2411	($rs, $ini_tpl) = get_tpl($ini_cfg_dir, 'php.ini');
	2412	return $rs if ($rs != 0);
	2413
	2414	%tag_hash = (
	2415	'{PEAR_DIR}' => $pear_dir,
	2416	'{WWW_DIR}' => $www_dir,
	2417	'{DMN_NAME}' => $dmn_name
	2418	);
	2419
	2420	($rs, $cfg) = prep_tpl(\%tag_hash, $ini_tpl);
	2421	return $rs if ($rs != 0);
	2422
	2423	($rs, $rdata) = store_file("$starter_dir/$dmn_name/php5/php.ini", $cfg, $sys_user, $sys_group, 0640);
	2424	return $rs if ($rs != 0);
	2425	}
2422	2426
2423	2427	#

trunk/engine/ispcp-sub-mngr

r1026	r1089
4	4	# Copyright (c) 2001-2006 by moleSoftware GmbH
5	5	# http://www.molesoftware.com
6		# Copyright (c) 2006-2007 by isp Control Panel
	6	# Copyright (c) 2006-2008 by isp Control Panel
7	7	# http://isp-control.net
8	8	#
…	…
292	292	return $rs if ($rs != 0);
293	293
294		#
295		# Timestamp fix for DNS - Data
296		#
	294	my @rdata2 = split(/\n/, $rdata);
	295	my $seq = $rdata2[1];
	296
	297	$seq =~ s/^\s+//;
	298	$seq =~ s/\s+$//;
	299	$seq = substr($seq, -2);
	300	$seq = int($seq) + 1;
	301
	302	#
	303	# RFC 1912
	304	#
297	305
298	306	my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
299		my $time2 = sprintf "%4d%02d%02d01",$year+1900,$mon+1,$mday;
	307	my $time2 = sprintf "%4d%02d%02d01",$year+1900,$mon+1,$mday,$seq;
300	308
301	309	my $db_time_val = "$db_time_b\t\t\t $time2\t\n$db_time_e";
…	…
487	495	return $rs if ($rs != 0);
488	496
489		#
490		# Timestamp fix for DNS - Data
491		#
	497	my @rdata2 = split(/\n/, $rdata);
	498	my $seq = $rdata2[1];
	499
	500	$seq =~ s/^\s+//;
	501	$seq =~ s/\s+$//;
	502	$seq = substr($seq, -2);
	503	$seq = int($seq) + 1;
	504
	505	#
	506	# RFC 1912
	507	#
492	508
493	509	my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
494		my $time2 = sprintf "%4d%02d%02d01",$year+1900,$mon+1,$mday;
	510	my $time2 = sprintf "%4d%02d%02d01",$year+1900,$mon+1,$mday,$seq;
495	511
496	512	my $db_time_val = "$db_time_b\t\t\t $time2\t\n$db_time_e";

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

r1072	r1089
939	939	return $rs if ($rs != 0);
940	940
	941	my $seq = 0;
	942
941	943	#
942	944	# RFC 1912
…	…
944	946
945	947	my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
946		my $time2 = sprintf "%4d%02d%02d00",$year+1900,$mon+1,$mday;
	948	my $time2 = sprintf "%4d%02d%02d00",$year+1900,$mon+1,$mday,$seq;
947	949
948	950	#

Development

Navigation

Changeset 1089

Legend:

Download in other formats: