Development

Navigation

← Previous Changeset
Next Changeset →

Changeset 1056

Timestamp:

03/14/08 10:59:45 (7 months ago)

Author:

rats

Message:

fix minor configuration in dist FreeBSD and setup patch #1 & #2

Files:

trunk/BSDmakefile (modified) (3 diffs)
trunk/CHANGELOG (modified) (1 diff)
trunk/configs/dists/freebsd/apache/BSDmakefile (modified) (1 diff)
trunk/configs/dists/freebsd/cron.d/BSDmakefile (modified) (1 diff)
trunk/configs/dists/freebsd/ispcp.conf (modified) (10 diffs)
trunk/engine/BSDmakefile (modified) (1 diff)
trunk/engine/ispcp_common_code.pl (modified) (1 diff)
trunk/engine/setup/ispcp-setup-methods.pl (modified) (1 diff)
trunk/engine/setup/set-engine-permissions.sh (modified) (2 diffs)
trunk/engine/setup/set-gui-permissions.sh (modified) (1 diff)

Legend:

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

trunk/BSDmakefile

r1050	r1056
38	38
39	39	install:
	40
40	41	cd ./tools && $(MAKE) install
41	42	$(SYSTEM_MAKE_DIRS) $(SYSTEM_CONF)
…	…
51	52	cd ./gui && $(MAKE) install
52	53	cd ./keys && $(MAKE) install
	54
	55	# Patch some variable
	56	/usr/bin/sed s/"\/etc\/ispcp\/ispcp.conf"/"\/usr\/local\/etc\/ispcp\/ispcp.conf"/g ./engine/ispcp_common_code.pl > $(SYSTEM_ROOT)/engine/ispcp_common_code.pl
	57	/usr/bin/sed s/"\/apache\"\;"/"\/apache22\"\;"/g ./engine/setup/ispcp-setup-methods.pl > $(SYSTEM_ROOT)/engine/setup/ispcp-setup-methods.pl
	58
53	59	cd ${INST_PREF} && cp -R * /
54	60	rm -rf ${INST_PREF}
55	61
	62
56	63	uninstall:
	64
57	65	cd ./tools && $(MAKE) uninstall
58	66	cd ./configs && $(MAKE) uninstall
…	…
69	77	rm -rf ./*~
70	78
	79
71	80	clean:
72	81

trunk/CHANGELOG

r1050	r1056
6	6	* Fixed #1106: BSDmakefile Setup not copy some of its file
7	7	* Updated: a lot of Makefiles
	8	- DISTS:
	9	* Fixed #1107: (FreeBSD) fix minor configuration in dist FreeBSD and setup patch
	10	* Fixed #1108: (FreeBSD) fix minor configuration in dist FreeBSD and setup patch #2
8	11
9	12	2008-03-12 Christian Hernmarck

trunk/configs/dists/freebsd/apache/BSDmakefile

r1045	r1056
15	15	cp ./fastcgi.conf ./working/fastcgi_ispcp.conf
16	16	cp ./00_master.conf $(SYSTEM_CONF)/apache22
	17	cp ./01_awstats.conf $(SYSTEM_CONF)/apache22
17	18	cp ./httpd.conf $(SYSTEM_CONF)/apache22
18	19	cp -R ./backup $(SYSTEM_CONF)/apache22

trunk/configs/dists/freebsd/cron.d/BSDmakefile

r1009	r1056
	1	# ispCP ω (OMEGA) a Virtual Hosting Control Panel
	2	# Copyright (c) 2001-2006 by moleSoftware GmbH
	3	# http://www.molesoftware.com
	4	# Copyright (c) 2006-2008 by isp Control Panel
	5	# http://isp-control.net
	6	#
	7	#
	8	# License:
	9	# This program is free software; you can redistribute it and/or
	10	# modify it under the terms of the MPL Mozilla Public License
	11	# as published by the Free Software Foundation; either version 1.1
	12	# of the License, or (at your option) any later version.
	13	#
	14	# This program is distributed in the hope that it will be useful,
	15	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	16	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	17	# MPL Mozilla Public License for more details.
	18	#
	19	# You may have received a copy of the MPL Mozilla Public License
	20	# along with this program.
	21	#
	22	# An on-line copy of the MPL Mozilla Public License can be found
	23	# http://www.mozilla.org/MPL/MPL-1.1.html
	24	#
	25	#
	26	# The ispCP ω Home Page is at:
	27	#
	28	# http://isp-control.net
	29	#
1	30	.include <../../../../Makefile.fbsd>
2	31
3	32	install:
4	33
5		$(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/cron.d
6		cp ./ispcp.phptemp $(ROOT_CONF)/cron.d
	34	$(SYSTEM_MAKE_DIRS) $(SYSTEM_CONF)/cron.d
	35	cp ./ispcp $(SYSTEM_CONF)/cron.d
	36	cp ./ispcp.phptemp $(SYSTEM_CONF)/cron.d
	37	cp -R ./backup $(SYSTEM_CONF)/cron.d
	38	cp -R ./parts $(SYSTEM_CONF)/cron.d
	39	cp -R ./working $(SYSTEM_CONF)/cron.d
	40	cp $(SYSTEM_CONF)/cron.d/ispcp $(SYSTEM_CONF)/cron.d/working
7	41
8	42	uninstall:
9	43
10		rm -rf $(~~ROOT~~_CONF)/cron.d
	44	rm -rf $(SYSTEM_CONF)/cron.d

trunk/configs/dists/freebsd/ispcp.conf

r1037	r1056
118	118	LOG_DIR = /var/log/ispcp
119	119
120		PHP_STARTER_DIR = /usr/local/www/~~apache22/~~fcgi
121
122		ROOT_DIR = /usr/local/www/~~apache22/~~ispcp
	120	PHP_STARTER_DIR = /usr/local/www/fcgi
	121
	122	ROOT_DIR = /usr/local/www/ispcp
123	123
124	124	ROOT_USER = root
…	…
126	126	ROOT_GROUP = wheel
127	127
128		GUI_ROOT_DIR = /usr/local/www/~~apache22/~~ispcp/gui
129
130		APACHE_WWW_DIR = /usr/local/www/~~apache22/~~data
	128	GUI_ROOT_DIR = /usr/local/www/ispcp/gui
	129
	130	APACHE_WWW_DIR = /usr/local/www/data
131	131
132	132	SCOREBOARDS_DIR = /var/www/scoreboards
…	…
177	177	AWSTATS_ENGINE_DIR = /usr/lib/cgi-bin
178	178
179		AWSTATS_WEB_DIR = /usr/local/www/~~apache22/~~data/awstats
180
181		AWSTATS_ROOT_DIR = /usr/local/www/~~apache22/~~ispcp/engine/awstats
	179	AWSTATS_WEB_DIR = /usr/local/www/data/awstats
	180
	181	AWSTATS_ROOT_DIR = /usr/local/www/ispcp/engine/awstats
182	182
183	183	#
…	…
193	193	APACHE_CMD = /usr/local/sbin/httpd
194	194
195		APACHE_LOG_DIR = /usr/local/www/~~apache22/~~logs
196
197		APACHE_BACKUP_LOG_DIR = /usr/local/www/~~apache22/~~logs/backup
198
199		APACHE_USERS_LOG_DIR = /usr/local/www/~~apache22/~~logs/users
200
201		APACHE_MODS_DIR = /usr/local/etc/apache22/extra/
	195	APACHE_LOG_DIR = /usr/local/www/logs
	196
	197	APACHE_BACKUP_LOG_DIR = /usr/local/www/logs/backup
	198
	199	APACHE_USERS_LOG_DIR = /usr/local/www/logs/users
	200
	201	APACHE_MODS_DIR = /usr/local/etc/apache22/extra
202	202
203	203	APACHE_SITES_DIR = /usr/local/etc/apache22/Includes
204	204
205		APACHE_CUSTOM_SITES_CONFIG_DIR = /~~etc/apache~~2/ispcp
	205	APACHE_CUSTOM_SITES_CONFIG_DIR = /usr/local/etc/apache22/ispcp
206	206
207	207	APACHE_SUEXEC_USER_PREF = vu
…	…
251	251	MTA_MAILBOX_GID_NAME = postfix
252	252
253		MTA_SASLDB_FILE = /usr/local/etc/sasldb2
254
255		ETC_SASLDB_FILE = /usr/local/etc/sasldb2
	253	MTA_SASLDB_FILE = /usr/local/etc/courier-imap/sasldb2
	254
	255	ETC_SASLDB_FILE = /usr/local/etc/courier-imap/sasldb2
256	256
257	257	CMD_SASLDB_LISTUSERS2 = /usr/local/sbin/sasldblistusers2
…	…
269	269	COURIER_CONF_DIR = /usr/local/etc/courier-imap
270	270
271		AUTHLIB_CONF_DIR = ~~/usr/local/etc~~
	271	AUTHLIB_CONF_DIR = /usr/local/etc/authlib
272	272
273	273	CMD_MAKEUSERDB = /usr/local/sbin/makeuserdb
…	…
285	285	BACKUP_DOMAINS = yes
286	286
287		BACKUP_ROOT_DIR = /usr/local/www/~~apache22/~~ispcp/engine/backup
	287	BACKUP_ROOT_DIR = /usr/local/www/ispcp/engine/backup
288	288
289	289	CMD_CRONTAB = /usr/bin/crontab
…	…
332	332	PREV_TRAFF_LOG_MAX_SIZE = 10485760
333	333
334		TRAFF_ROOT_DIR = /usr/local/www/~~apache22/~~ispcp/engine/traffic
335
336		TOOLS_ROOT_DIR = /usr/local/www/~~apache22/~~ispcp/engine/tools
337
338		QUOTA_ROOT_DIR = /usr/local/www/~~apache22/~~ispcp/engine/quota
	334	TRAFF_ROOT_DIR = /usr/local/www/ispcp/engine/traffic
	335
	336	TOOLS_ROOT_DIR = /usr/local/www/ispcp/engine/tools
	337
	338	QUOTA_ROOT_DIR = /usr/local/www/ispcp/engine/quota
339	339
340	340	#
…	…
352	352	FTP_USERNAME_SEPARATOR = @
353	353
354		FTP_HOMEDIR = /usr/local/www/~~apache22/~~data
	354	FTP_HOMEDIR = /usr/local/www/data
355	355
356	356	IPS_LOGO_PATH = ../themes/user_logos
…	…
401	401	#
402	402
403		BACKUP_FILE_DIR = /usr/local/www/~~apache22/~~ispcp/backups
	403	BACKUP_FILE_DIR = /usr/local/www/ispcp/backups
404	404
405	405	#

trunk/engine/BSDmakefile

r1050	r1056
76	76
77	77	# keys needed for ispCP engine;
78		$(CMD_INSTALL) ./ispcp-db-keys.pl $(SYSTEM_ENGINE_ROOT)
	78	$(CMD_INSTALL) ./ispcp-db-keys.pl $(SYSTEM_ENGINE_ROOT)
79	79
80	80	# one more copy for auto replay system;
81		$(CMD_INSTALL) ./ispcp-db-keys.pl $(SYSTEM_ENGINE_ROOT)/messager
	81	$(CMD_INSTALL) ./ispcp-db-keys.pl $(SYSTEM_ENGINE_ROOT)/messager
82	82
83	83	$(CMD_INSTALL) ./ispcp-rqst-mngr $(SYSTEM_ENGINE_ROOT)

trunk/engine/ispcp_common_code.pl

r980	r1056
43	43	$main::cfg_file = '/etc/ispcp/ispcp.conf';
44	44
45		$rs = get_conf();
	45	$rs = get_conf($main::cfg_file);
46	46
47	47	return $rs if ($rs != 0);

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

r1043	r1056
671	671	}
672	672
673		$cmd = "$main::cfg{'CMD_CP'} -f $wrk_dir/ispcp /etc/cron.d/";
	673	if ($main::cfg{'ROOT_GROUP'} eq "wheel") {
	674	$cmd = "$main::cfg{'CMD_CP'} -f $wrk_dir/ispcp /usr/local/etc/ispcp/cron.d/";
	675	} else {
	676	$cmd = "$main::cfg{'CMD_CP'} -f $wrk_dir/ispcp /etc/cron.d/";
	677	}
674	678
675	679	$rs = sys_command_rs($cmd);

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

r1027	r1056
35	35
36	36	# read needed entries from ispcp.conf
37		for a in `cat /etc/ispcp/ispcp.conf \| grep -E '(APACHE_\|ROOT_\|MTA_MAILBOX_\|^LOG_DIR)' \| sed -e 's/ //g'`; do
38		export $a
39		done
	37	if [ -f /usr/local/etc/ispcp/ispcp.conf ]
	38	then
	39	for a in `cat /usr/local/etc/ispcp/ispcp.conf \| grep -E '(APACHE_\|ROOT_\|MTA_MAILBOX_\|^LOG_DIR)' \| sed -e 's/ //g'`; do
	40	export $a
	41	done
	42	else
	43	for a in `cat /etc/ispcp/ispcp.conf \| grep -E '(APACHE_\|ROOT_\|MTA_MAILBOX_\|^LOG_DIR)' \| sed -e 's/ //g'`; do
	44	export $a
	45	done
	46	fi
40	47
41	48	#
…	…
57	64
58	65	#chmod ug+r,u+w,o-r /etc/ispcp/ispcp.conf
59		chown $ROOT_USER:$APACHE_SUEXEC_USER_PREF$APACHE_SUEXEC_MIN_UID /etc/ispcp/ispcp.conf
	66	if [ -f /usr/local/etc/ispcp/ispcp.conf ]
	67	then
	68	chown $ROOT_USER:$APACHE_SUEXEC_USER_PREF$APACHE_SUEXEC_MIN_UID /usr/local/etc/ispcp/ispcp.conf
	69	else
	70	chown $ROOT_USER:$APACHE_SUEXEC_USER_PREF$APACHE_SUEXEC_MIN_UID /etc/ispcp/ispcp.conf
	71	fi
60	72
61	73	for i in `find $ROOT_DIR/engine/`; do

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

r1027	r1056
35	35
36	36	# read needed entries from ispcp.conf
37		for a in `cat /etc/ispcp/ispcp.conf \| grep -E '(APACHE_\|ROOT_DIR)' \| sed -e 's/ //g'`; do
38		export $a
39		done
	37	if [ -f /usr/local/etc/ispcp/ispcp.conf ]
	38	then
	39	for a in `cat /usr/local/etc/ispcp/ispcp.conf \| grep -E '(APACHE_\|ROOT_\|MTA_MAILBOX_\|^LOG_DIR)' \| sed -e 's/ //g'`; $
	40	export $a
	41	done
	42	else
	43	for a in `cat /etc/ispcp/ispcp.conf \| grep -E '(APACHE_\|ROOT_\|MTA_MAILBOX_\|^LOG_DIR)' \| sed -e 's/ //g'`; do
	44	export $a
	45	done
	46	fi
40	47
41	48	# for spacing

Development

Navigation

Changeset 1056

Legend:

Download in other formats: