Development

Navigation

← Previous Changeset
Next Changeset →

Changeset 303

Timestamp:

02/07/07 19:30:10 (2 years ago)

Author:

nuxwin

Message:

- CONFIGS:

Fixed #48

- SETUP:

Fixed #48

- GUI:

Fixed #48

Files:

trunk/CHANGELOG (modified) (2 diffs)
trunk/configs/apache/fastcgi.conf (modified) (2 diffs)
trunk/configs/apache/fastcgi.conf.bak (added)
trunk/configs/fcgi/parts/master (added)
trunk/configs/fcgi/parts/master/php4 (added)
trunk/configs/fcgi/parts/master/php4-fcgi-starter.tpl (added)
trunk/configs/fcgi/parts/master/php4/php.ini (added)
trunk/configs/fcgi/parts/master/php5 (added)
trunk/configs/fcgi/parts/master/php5-fcgi-starter.tpl (added)
trunk/configs/fcgi/parts/master/php5/php.ini (added)
trunk/engine/setup/set-gui-permissions.sh (modified) (1 diff)
trunk/engine/setup/vhcs2-setup (modified) (6 diffs)
trunk/gui/Makefile (modified) (1 diff)
trunk/gui/phptmp (added)

Legend:

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

trunk/CHANGELOG

r302	r303
1	1	VHCS 2.4.8 ω Omega Changelog
2	2	~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3		___________________________________________________________________
4		/ @TODO: \
5		\| - FastCGI: \|
6		\| * Copy files on update \|
7		\| * apache: check if stats are working with FastCGI \|
8		\| \|
9		\| * Fixed path default-vhcs php.ini \|
10		\| * Fixed name php.ini fot fcgi and other \|
11		\| \|
12		\| - AWStats: \|
13		\| * apache: set statsdir if awstats is enabled \|
14		\| * gui: disable stats-alias in client menu \|
15		\___________________________________________________________________/
	3	_________________________________________________________________
	4	/ @TODO: \
	5	\| - FastCGI: \|
	6	\| * Copy files on update \|
	7	\| * apache: check if stats are working with FastCGI \|
	8	\| \|
	9	\| * Finish fastcgi.conf file \|
	10	\| * Edit vhcs2.dmn.mngr for fcgi \|
	11	\| \|
	12	\| \|
	13	\| - AWStats: \|
	14	\| * apache: set statsdir if awstats is enabled \|
	15	\| * gui: disable stats-alias in client menu \|
	16	\_________________________________________________________________/
	17
	18	2007.02.07 Laurent DECLERCQ
	19	- CONFIGS:
	20	Fixed #48 :
	21	=> Edit fastcgi.conf (NO FINISH)
	22	- Rename fastcgi.conf in fastcgi.conf.bak
	23	- Create new fastcgi.conf (testing file)
	24
	25	=> Edit httpd.conf and vhcs2_base.tpl :
	26	- Remove Handler "default-vhcs"
	27
	28	=> Create new directory "master" for the files of configuration (fascgi) of the user master.
	29	=> Copy and move "php4-fcgi-starter" and "php5-fcgi-starter" in "master" directory for the master user
	30	=> Create "php4" and "php5" directory in master "directory" for master user
	31	=> Copy and move "php4.ini" in "php4" in "php4" directory for master user
	32	=> Copy and move "php5.ini" in "php4" in "php5" directory for master user
	33	=> Rename "php4.ini" "and php5.ini" in "php.ini" for master user
	34	=> Edit "php.ini" files for master user :
	35	- Fixed "open_basedir" path for master user
	36	- Fixed "upload_dir" path for master user
	37	- Fixed 'session_dir" path for master user
	38	=> Copy, move "php4-fcgi-starter" and "php5-fcgi-starter" in "master" directory for the master user
	39
	40	- SETUP:
	41	Fixed #48 :
	42	=> Edit makefile :
	43	- Added "phptmp" directory
	44	=> Edit "vhcs2.setup" script :
	45	- Fixed path for the new tpl directory "master"
	46	- Changed path and rename "php4.ini" in "php.ini" (for master user)
	47	- Changed path and rename "php5.ini" in "php.ini" (for master user)
	48	- Changed path for "php4-fcgi-starter" and "php5-fcgi-starter" (for master user)
	49	- Added "CONF_DIR" for php.ini
	50	=> Edit set-gui-permissions script :
	51	- Added chmod "0755" for the GUI "phptmp" directory
	52	- GUI:
	53	Fixed #48 :
	54	=> Create new directory for the tmp_dir and the upload_dir --> "phptmp" for the master user
16	55
17	56	2007-02-06 Laurent DECLERCQ
18	57	- CONFIGS:
19		~~- Edit "httpd.conf" and "vhcs2.base.tpl"~~
20		=> added Handler "default-vhcs" (for vhcs working)
	58	=> Edit "httpd.conf" and "vhcs2.base.tpl" :
	59	- added Handler "default-vhcs" (for vhcs working)
21	60
22	61	2007-02-06 Benedikt Heintel
…	…
38	77	=> Chinese, Thai and Russian have to be re-translated!
39	78	- SETUP:
40		added "a2enmod rewirte" for nativ mod_rewrite support
	79	- added "a2enmod rewirte" for nativ mod_rewrite support
41	80
42	81

trunk/configs/apache/fastcgi.conf

r268	r303
1	1	#
2	2	# @TODO: Test, if the php4.ini, php5.ini and master would work
3		#
	3	# - Location PHP4
	4	# - PHP5 Support
4	5
5	6	<IfModule mod_fastcgi.c>
…	…
9	10	FastCgiConfig -minProcesses 1 -maxProcesses 10 -singleThreshold 100 -killInterval 300 -autoUpdate -idle-timeout 240 -pass-header HTTP_AUTHORIZATION
10	11
11		FastCgiServer ~~{PHP_STARTER_DIR}/master/php4-fcgi-starter -user {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_UID} -group {APACHE_SUEXEC_USER_PREF}{APACHE_SUEXEC_MIN_GID}~~
	12	FastCgiServer /var/www/fcgi/master/php4-fcgi-starter -user vu2000 -group vu2000
12	13
13		Action php4-fcgi-starter /php4/php4-fcgi-starter
14		Action php5-fcgi-starter /php5/php5-fcgi-starter
	14	Action php4-fcgi-starter /php4-fcgi-starter/php4-fcgi-starter
15	15
16	16	# For PHP4 support
17		<Location /php4/>
18		Options +ExecCGI
19		SetHandler php4-fcgi-starter
20		</Location>
21		AddType application/x-httpd-php4 .php .php3 .php4
	17	#<Location /php4/>
	18	# Options +ExecCGI
	19	# SetHandler php4-fcgi-starter
	20	#</Location>
22	21
23		# For PHP5 support
24		<Location /php5/>
25		Options +ExecCGI
26		SetHandler php5-fcgi-starter
27		</Location>
28		AddType application/x-httpd-php5 .php5
29
30		AddHandler php4-fastcgi .php .php4 .php3
31		AddHandler php5-fastcgi .php5
	22	AddType application/x-httpd-php4-fcgi-starter .php .php3 .php4
	23	AddHandler php4-fcgi-starter .php .php4 .php3
32	24
33	25	</IfModule>
	26
	27	<IfModule mod_fastcgi.c>
	28	ScriptAlias /php4-fcgi-starter/ /var/www/fcgi/master/
	29	<Directory "/var/www/fcgi/master">
	30	AllowOverride None
	31	Options +ExecCGI -MultiViews -Indexes
	32	Order allow,deny
	33	Allow from all
	34	</Directory>
	35	</IfModule>
	36

trunk/engine/setup/set-gui-permissions.sh

r154	r303
71	71	chmod 0755 $APACHE_WWW_DIR;
72	72	chown $APACHE_USER:$APACHE_GROUP $APACHE_WWW_DIR;
	73
	74	#
	75	# Set correct permission for phptmp gui directory
	76	#
	77
	78	i="$ROOT_DIR/gui/phptmp"
	79
	80	echo "0755 $APACHE_USER:$APACHE_GROUP [$i]";
	81
	82	chmod -R 0755 $i;
	83	chown -R $APACHE_USER:$APACHE_GROUP $i;

trunk/engine/setup/vhcs2-setup

r293	r303
1448	1448	$bk_dir = "$cfg_dir/backup";
1449	1449
1450		my $tpl_dir = "$cfg_dir/parts";
	1450	#my $tpl_dir = "$cfg_dir/parts";
	1451	my $tpl_dir = "$cfg_dir/parts/master";
	1452
1451	1453
1452	1454	## PHP4 Starter
…	…
1489	1491
1490	1492	## php4.ini
1491		($rs, $cfg_tpl) = get_tpl($tpl_dir, 'php4.ini');
	1493	#($rs, $cfg_tpl) = get_tpl($tpl_dir, '/php4.ini');
	1494	($rs, $cfg_tpl) = get_tpl($tpl_dir, '/php4/php.ini');
1492	1495	return $rs if ($rs != 0);
1493	1496
…	…
1495	1498	'{WWW_DIR}' => $main::cfg{'ROOT_DIR'},
1496	1499	'{DMN_NAME}' => "gui",
	1500	'{CONF_DIR}' => $main::cfg{'CONF_DIR'},
1497	1501	'{PEAR_DIR}' => $main::cfg{'PEAR_DIR'}
1498	1502	);
…	…
1501	1505	return $rs if ($rs != 0);
1502	1506
1503		$rs = store_file("$main::cfg{'PHP_STARTER_DIR'}/master/php4.ini", $cfg, "$main::cfg{'APACHE_SUEXEC_USER_PREF'}"."$main::cfg{'APACHE_SUEXEC_MIN_UID'}", "$main::cfg{'APACHE_SUEXEC_USER_PREF'}"."$main::cfg{'APACHE_SUEXEC_MIN_GID'}", 0644);
	1507	#$rs = store_file("$main::cfg{'PHP_STARTER_DIR'}/master/php4.ini", $cfg, "$main::cfg{'APACHE_SUEXEC_USER_PREF'}"."$main::cfg{'APACHE_SUEXEC_MIN_UID'}", "$main::cfg{'APACHE_SUEXEC_USER_PREF'}"."$main::cfg{'APACHE_SUEXEC_MIN_GID'}", 0644);
	1508	$rs = store_file("$main::cfg{'PHP_STARTER_DIR'}/master/php4/php.ini", $cfg, "$main::cfg{'APACHE_SUEXEC_USER_PREF'}"."$main::cfg{'APACHE_SUEXEC_MIN_UID'}", "$main::cfg{'APACHE_SUEXEC_USER_PREF'}"."$main::cfg{'APACHE_SUEXEC_MIN_GID'}", 0644);
	1509
1504	1510	return $rs if ($rs != 0);
1505	1511
1506	1512	## php5.ini
1507		($rs, $cfg_tpl) = get_tpl($tpl_dir, 'php5.ini');
	1513	#($rs, $cfg_tpl) = get_tpl($tpl_dir, 'php5.ini');
	1514	#($rs, $cfg_tpl) = get_tpl($tpl_dir, '/php5/php5.ini');
1508	1515	return $rs if ($rs != 0);
1509	1516
…	…
1511	1518	'{WWW_DIR}' => $main::cfg{'ROOT_DIR'},
1512	1519	'{DMN_NAME}' => "gui",
	1520	'{CONF_DIR}' => $main::cfg{'CONF_DIR'},
1513	1521	'{PEAR_DIR}' => $main::cfg{'PEAR_DIR'}
1514	1522	);
…	…
1517	1525	return $rs if ($rs != 0);
1518	1526
1519		$rs = store_file("$main::cfg{'PHP_STARTER_DIR'}/master/php5.ini", $cfg, "$main::cfg{'APACHE_SUEXEC_USER_PREF'}"."$main::cfg{'APACHE_SUEXEC_MIN_UID'}", "$main::cfg{'APACHE_SUEXEC_USER_PREF'}"."$main::cfg{'APACHE_SUEXEC_MIN_GID'}", 0644);
	1527	#$rs = store_file("$main::cfg{'PHP_STARTER_DIR'}/master/php5.ini", $cfg, "$main::cfg{'APACHE_SUEXEC_USER_PREF'}"."$main::cfg{'APACHE_SUEXEC_MIN_UID'}", "$main::cfg{'APACHE_SUEXEC_USER_PREF'}"."$main::cfg{'APACHE_SUEXEC_MIN_GID'}", 0644);
	1528	$rs = store_file("$main::cfg{'PHP_STARTER_DIR'}/master/php5/php.ini", $cfg, "$main::cfg{'APACHE_SUEXEC_USER_PREF'}"."$main::cfg{'APACHE_SUEXEC_MIN_UID'}", "$main::cfg{'APACHE_SUEXEC_USER_PREF'}"."$main::cfg{'APACHE_SUEXEC_MIN_GID'}", 0644);
	1529
1520	1530	return $rs if ($rs != 0);
1521	1531

trunk/gui/Makefile

r154 r303

52 52 cp -dR ./orderpanel $(SYSTEM_GUI_ROOT)
53 53
54 cp-dR ./phptmp $(SYSTEM_GUI_ROOT)
54 55
55 56 uninstall:

Development

Navigation

Changeset 303

Legend:

trunk/CHANGELOG

trunk/configs/apache/fastcgi.conf

trunk/engine/setup/set-gui-permissions.sh

trunk/engine/setup/vhcs2-setup

trunk/gui/Makefile

Download in other formats: