Development

Navigation

← Previous Changeset
Next Changeset →

Changeset 1145

Timestamp:

05/10/2008 06:50:39 PM (2 months ago)

Author:

rats

Message:

* Fixed #1240: dmn_entry.tpl - missing "("
* Fixed #1215: (Fedora) POP/IMAP traffic is not added in domain statistics with courier and * * Fixed #1218: (Fedora) Fedora config
* Fixed #1239: Two small graphical glitches in GUI

Files:

trunk/CHANGELOG (modified) (1 diff)
trunk/configs/centos/apache/parts/dmn_entry.tpl (modified) (1 diff)
trunk/configs/fedora/apache/parts/dmn_entry.tpl (modified) (1 diff)
trunk/configs/fedora/ispcp.conf (modified) (4 diffs)
trunk/configs/fedora/proftpd/proftpd.conf (modified) (1 diff)
trunk/configs/freebsd/apache/parts/dmn_entry.tpl (modified) (1 diff)
trunk/configs/gentoo/apache/parts/dmn_entry.tpl (modified) (1 diff)
trunk/configs/openbsd/apache/parts/dmn_entry.tpl (modified) (1 diff)
trunk/configs/opensuse/apache/parts/dmn_entry.tpl (modified) (1 diff)
trunk/configs/redhat/apache/parts/dmn_entry.tpl (modified) (1 diff)
trunk/configs/ubuntu/apache/parts/dmn_entry.tpl (modified) (1 diff)
trunk/docs/Fedora/INSTALL (modified) (2 diffs)
trunk/engine/traffic/ispcp-vrl-traff (modified) (1 diff)
trunk/gui/include/vfs.php (modified) (1 diff)
trunk/gui/themes/omega_original/client/edit_mail_acc.tpl (modified) (1 diff)
trunk/language-files/languages/german_germany (modified) (1 diff)
trunk/language-files/po/de_DE.po (modified) (1 diff)

Legend:

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

trunk/CHANGELOG

r1141	r1145
1	1	ispCP ω 1.0.0 Changelog
2	2	~~~~~~~~~~~~~~~~~~~~~~~~~~~~
	3
	4	2008-05-10 Benedikt Heintel
	5	- CONFIGS:
	6	* Fixed #1240: dmn_entry.tpl - missing "("
	7	- DISTS:
	8	* Fixed #1215: (Fedora) POP/IMAP traffic is not added in domain statistics with courier and fedora core 8
	9	* Fixed #1218: (Fedora) Fedora config
	10	- GUI:
	11	* Added Patch by Thomas Wacker
	12	* Fixed #1239: Two small graphical glitches in GUI
	13	- LANGUAGES:
	14	* Reogranised
	15	* Added Catalan
	16	* Changed Chinese
3	17
4	18	2008-05-09 Benedikt Heintel

trunk/configs/centos/apache/parts/dmn_entry.tpl

r1133	r1145
21	21	RedirectMatch permanent ^/ftp([\/]?) http://{BASE_SERVER_VHOST}/ftp/
22	22	RedirectMatch permanent ^/pma([\/]?) http://{BASE_SERVER_VHOST}/pma/
23		RedirectMatch permanent ^/webmail~~[\/]?)~~ http://{BASE_SERVER_VHOST}/webmail/
	23	RedirectMatch permanent ^/webmail([\/]?) http://{BASE_SERVER_VHOST}/webmail/
24	24
25	25	ErrorDocument 401 /errors/401.html

trunk/configs/fedora/apache/parts/dmn_entry.tpl

r1133	r1145
21	21	RedirectMatch permanent ^/ftp([\/]?) http://{BASE_SERVER_VHOST}/ftp/
22	22	RedirectMatch permanent ^/pma([\/]?) http://{BASE_SERVER_VHOST}/pma/
23		RedirectMatch permanent ^/webmail~~[\/]?)~~ http://{BASE_SERVER_VHOST}/webmail/
	23	RedirectMatch permanent ^/webmail([\/]?) http://{BASE_SERVER_VHOST}/webmail/
24	24
25	25	ErrorDocument 401 /errors/401.html

trunk/configs/fedora/ispcp.conf

r1089	r1145
171	171	AWSTATS_MODE = 0
172	172
173		AWSTATS_CACHE_DIR = /var/~~cache~~/awstats
	173	AWSTATS_CACHE_DIR = /var/lib/awstats
174	174
175	175	AWSTATS_CONFIG_DIR = /etc/awstats
176	176
177		AWSTATS_ENGINE_DIR = /usr/~~lib/cgi-bin~~
178
179		AWSTATS_WEB_DIR = /usr/share/awstats
180
181		AWSTATS_ROOT_DIR = /~~var/www/ispcp/engine/awstats~~
	177	AWSTATS_ENGINE_DIR = /usr/share/awstats
	178
	179	AWSTATS_WEB_DIR = /usr/share/awstats/wwwroot/cgi-bin
	180
	181	AWSTATS_ROOT_DIR = /usr/share/awstats/wwwroot
182	182
183	183	#
…	…
203	203	APACHE_SITES_DIR = /etc/httpd/vhosts
204	204
205		APACHE_CUSTOM_SITES_DIR = /etc/httpd/vhosts
	205	APACHE_CUSTOM_SITES_CONFIG_DIR = /etc/httpd/vhosts
206	206
207	207	APACHE_SUEXEC_USER_PREF = vu
…	…
291	291	#
292	292
293		# Either no or path to the amavis-daemon (usually: /etc/init.d/amavis)
	293	# Either no or path to the amavis-daemon (usually: /etc/rc.d/init.d/amavis)
294	294	CMD_AMAVIS = no
295	295
296		CMD_AUTHD = /etc/init.d/courier-authlib
297
298		CMD_FTPD = /etc/init.d/proftpd
	296	CMD_AUTHD = /etc/rc.d/init.d/courier-authlib
	297
	298	CMD_FTPD = /etc/rc.d/init.d/proftpd
299	299
300	300	CMD_HTTPD = /usr/sbin/apachectl
301	301
302		CMD_IMAP = /etc/init.d/courier-imap
303
304		CMD_IMAP_SSL = /etc/init.d/courier-imap
305
306		CMD_MTA = /etc/init.d/postfix
307
308		CMD_NAMED = /etc/init.d/named
309
310		CMD_POP = /etc/init.d/courier-imap
311
312		CMD_POP_SSL = /etc/init.d/courier-imap
313
314		CMD_ISPCPD = /etc/init.d/ispcp_daemon
315
316		CMD_ISPCPN = /etc/init.d/ispcp_network
	302	CMD_IMAP = /etc/rc.d/init.d/courier-imap
	303
	304	CMD_IMAP_SSL = /etc/rc.d/init.d/courier-imap
	305
	306	CMD_MTA = /etc/rc.d/init.d/postfix
	307
	308	CMD_NAMED = /etc/rc.d/init.d/named
	309
	310	CMD_POP = /etc/rc.d/init.d/courier-imap
	311
	312	CMD_POP_SSL = /etc/rc.d/init.d/courier-imap
	313
	314	CMD_ISPCPD = /etc/rc.d/init.d/ispcp_daemon
	315
	316	CMD_ISPCPN = /etc/rc.d/init.d/ispcp_network
317	317
318	318	#
…	…
324	324	TRAFF_LOG_DIR = /var/log
325	325
326		FTP_TRAFF_LOG = ftp_traff.log
327
328		MAIL_TRAFF_LOG = mail.log
	326	FTP_TRAFF_LOG = /proftpd/ftp_traff.log
	327
	328	MAIL_TRAFF_LOG = maillog
329	329
330	330	TRAFF_ROOT_DIR = /var/www/ispcp/engine/traffic

trunk/configs/fedora/proftpd/proftpd.conf

r1102	r1145
19	19	################################################################################
20	20	# Includes DSO modules (this is mandatory in proftpd 1.3)
21		#Include /etc/proftpd/modules.conf
	21	Include /etc/proftpd/modules.conf
22	22
23	23	# Set off to disable IPv6 support which is annoying on IPv4 only boxes.

trunk/configs/freebsd/apache/parts/dmn_entry.tpl

r1133	r1145
21	21	RedirectMatch permanent ^/ftp([\/]?) http://{BASE_SERVER_VHOST}/ftp/
22	22	RedirectMatch permanent ^/pma([\/]?) http://{BASE_SERVER_VHOST}/pma/
23		RedirectMatch permanent ^/webmail~~[\/]?)~~ http://{BASE_SERVER_VHOST}/webmail/
	23	RedirectMatch permanent ^/webmail([\/]?) http://{BASE_SERVER_VHOST}/webmail/
24	24
25	25	ErrorDocument 401 /errors/401.html

trunk/configs/gentoo/apache/parts/dmn_entry.tpl

r1133	r1145
21	21	RedirectMatch permanent ^/ftp([\/]?) http://{BASE_SERVER_VHOST}/ftp/
22	22	RedirectMatch permanent ^/pma([\/]?) http://{BASE_SERVER_VHOST}/pma/
23		RedirectMatch permanent ^/webmail~~[\/]?)~~ http://{BASE_SERVER_VHOST}/webmail/
	23	RedirectMatch permanent ^/webmail([\/]?) http://{BASE_SERVER_VHOST}/webmail/
24	24
25	25	ErrorDocument 401 /errors/401.html

trunk/configs/openbsd/apache/parts/dmn_entry.tpl

r1133	r1145
21	21	RedirectMatch permanent ^/ftp([\/]?) http://{BASE_SERVER_VHOST}/ftp/
22	22	RedirectMatch permanent ^/pma([\/]?) http://{BASE_SERVER_VHOST}/pma/
23		RedirectMatch permanent ^/webmail~~[\/]?)~~ http://{BASE_SERVER_VHOST}/webmail/
	23	RedirectMatch permanent ^/webmail([\/]?) http://{BASE_SERVER_VHOST}/webmail/
24	24
25	25	ErrorDocument 401 /errors/401.html

trunk/configs/opensuse/apache/parts/dmn_entry.tpl

r1133	r1145
21	21	RedirectMatch permanent ^/ftp([\/]?) http://{BASE_SERVER_VHOST}/ftp/
22	22	RedirectMatch permanent ^/pma([\/]?) http://{BASE_SERVER_VHOST}/pma/
23		RedirectMatch permanent ^/webmail~~[\/]?)~~ http://{BASE_SERVER_VHOST}/webmail/
	23	RedirectMatch permanent ^/webmail([\/]?) http://{BASE_SERVER_VHOST}/webmail/
24	24
25	25	ErrorDocument 401 /errors/401.html

trunk/configs/redhat/apache/parts/dmn_entry.tpl

r1133	r1145
21	21	RedirectMatch permanent ^/ftp([\/]?) http://{BASE_SERVER_VHOST}/ftp/
22	22	RedirectMatch permanent ^/pma([\/]?) http://{BASE_SERVER_VHOST}/pma/
23		RedirectMatch permanent ^/webmail~~[\/]?)~~ http://{BASE_SERVER_VHOST}/webmail/
	23	RedirectMatch permanent ^/webmail([\/]?) http://{BASE_SERVER_VHOST}/webmail/
24	24
25	25	ErrorDocument 401 /errors/401.html

trunk/configs/ubuntu/apache/parts/dmn_entry.tpl

r1133	r1145
21	21	RedirectMatch permanent ^/ftp([\/]?) http://{BASE_SERVER_VHOST}/ftp/
22	22	RedirectMatch permanent ^/pma([\/]?) http://{BASE_SERVER_VHOST}/pma/
23		RedirectMatch permanent ^/webmail~~[\/]?)~~ http://{BASE_SERVER_VHOST}/webmail/
	23	RedirectMatch permanent ^/webmail([\/]?) http://{BASE_SERVER_VHOST}/webmail/
24	24
25	25	ErrorDocument 401 /errors/401.html

trunk/docs/Fedora/INSTALL

r1095	r1145
92	92	6. Copy all the directories into your system (you may make backups)
93	93	# cp -RLf /tmp/ispcp/* /
	94	# cp -Rv /tmp/ispcp/etc/init.d /etc/rc.d/
	95	# ln -s /etc/rc.d/init.d /etc/init.d
	96
	97	# mkdir /var/mail/virtual
94	98
95	99	7. Bind setup
96	100	# mv /var/named/data /var/named/data2
97		# ln -s /var/named/chroot/var/named/data /var/named/data
	101	# ln -s /var/named/chroot/var/named/data /var/named/dat
98	102
99	103	# mkdir /var/www/scoreboards
	104
	105	* create sasl2 database:
100	106	# touch /etc/sasldb2
101	107
…	…
134	140
135	141	13. Modify some system values:
136
137		* create sasl2 database:
138		# touch /etc/sasldb2
	142	# chmod 777 /var/www/ispcp/gui/phptmp
139	143
140	144	* Install Daemon:

trunk/engine/traffic/ispcp-vrl-traff

r1068	r1145
500	500	# POP3
501	501	$rs = sys_command("$cat $rlog\|$grep 'courierpop3login'\|$grep 'user='\|$grep 'top='\|$grep -v 'ip=\\[::ffff:127.0.0.1\\]'\|$awk '{print \$7,\$9,substr(\$10,1,length(\$10)-1);}' 1>$pop3_log");
502
	502	return $rs if ($rs != 0);
	503	// for Fedora
	504	$rs = sys_command("$cat $rlog\|$grep 'pop3d'\|$grep 'user='\|$grep 'top='\|$grep -v 'ip=\\[::ffff:127.0.0.1\\]'\|$awk '{print \$7,\$10,substr(\$11,1,length(\$11)-1);}' 1>$pop3_log");
503	505	return $rs if ($rs != 0);
504	506

trunk/gui/include/vfs.php

r1076	r1145
208	208	// 'localhost' for testing purposes. I have to study if a better
209	209	// $this->_domain would work on all situations
210		$this->_handle = @ftp_~~ssl_~~connect('localhost');
	210	$this->_handle = @ftp_connect('localhost');
211	211	if (!is_resource($this->_handle)) {
212		$this->_handle = @ftp_connect('localhost');
213		if (!is_resource($this->_handle)) {
214		$this->close();
215		return false;
216		}
	212	$this->close();
	213	return false;
217	214	}
218	215	// Perform actual login

trunk/gui/themes/omega_original/client/edit_mail_acc.tpl

r1141	r1145
50	50	<table width="100%" border="0" cellspacing="0" cellpadding="0" height="100%" style="border-collapse: collapse;padding:0;margin:0;">
51	51	<tr>
52		<td align="left" valign="top" style="vertical-align: top; width: 195px; height: 56px;">
53		<img src="{THEME_COLOR_PATH}/images/top/top_left.jpg" border="0">
54		</td>
55		<td style="height: 56px; width:100%; background-image: url({THEME_COLOR_PATH}/images/top/top_bg.jpg)">
56		<img src="{THEME_COLOR_PATH}/images/top/top_left_bg.jpg" border="0">
57		</td>
58		<td style="width: 73px; height: 56px;">
59		<img src="{THEME_COLOR_PATH}/images/top/top_right.jpg" border="0">
60		</td>
	52	<td align="left" valign="top" style="vertical-align: top; width: 195px; height: 56px;"><img src="{THEME_COLOR_PATH}/images/top/top_left.jpg" border="0"></td>
	53	<td style="height: 56px; width:100%; background-image: url({THEME_COLOR_PATH}/images/top/top_bg.jpg)"><img src="{THEME_COLOR_PATH}/images/top/top_left_bg.jpg" border="0"></td>
	54	<td style="width: 73px; height: 56px;"><img src="{THEME_COLOR_PATH}/images/top/top_right.jpg" border="0"></td>
61	55	</tr>
62	56	<tr>

trunk/language-files/languages/german_germany

r1142	r1145
760	760	Database list is empty! = Sie haben noch keine Datenbanken angelegt!
761	761	ispCP - Client/Manage SQL = ispCP - Kunde/Datenbankverwaltung
762		Manage SQL = Datenbank~~verwaltung~~
	762	Manage SQL = Datenbanken
763	763	Database Name and Users = Datenbanknamen und -benutzer
764	764	PhpMyAdmin = phpMyAdmin

trunk/language-files/po/de_DE.po

r1142	r1145
2470	2470
2471	2471	msgid "Manage SQL"
2472		msgstr "Datenbank~~verwaltung~~"
	2472	msgstr "Datenbanken"
2473	2473
2474	2474	msgid "Database Name and Users"

Development

Navigation

Changeset 1145

Legend:

Download in other formats: