Development

Navigation

← Previous Changeset
Next Changeset →

Changeset 1094

Timestamp:

04/02/08 00:50:50 (5 months ago)

Author:

rats

Message:

* Fixed #1155: Fix major freebsd dist setup

Files:

trunk/Makefile.fbsd (modified) (1 diff)
trunk/configs/freebsd/BSDmakefile (modified) (1 diff)
trunk/configs/freebsd/apache/BSDmakefile (modified) (2 diffs)
trunk/configs/freebsd/apache/fastcgi.conf (modified) (1 diff)
trunk/configs/freebsd/awstats/BSDmakefile (modified) (1 diff)
trunk/configs/freebsd/bind/BSDmakefile (modified) (1 diff)
trunk/configs/freebsd/courier/BSDmakefile (modified) (1 diff)
trunk/configs/freebsd/cron.d/BSDmakefile (modified) (1 diff)
trunk/configs/freebsd/database/BSDmakefile (modified) (1 diff)
trunk/configs/freebsd/fcgi/BSDmakefile (modified) (1 diff)
trunk/configs/freebsd/init.d/BSDmakefile (modified) (2 diffs)
trunk/configs/freebsd/init.d/ispcp_daemon (modified) (1 diff)
trunk/configs/freebsd/init.d/ispcp_network (modified) (1 diff)
trunk/configs/freebsd/ispcp.conf (modified) (5 diffs)
trunk/configs/freebsd/logrotate/BSDmakefile (modified) (1 diff)
trunk/configs/freebsd/postfix/BSDmakefile (modified) (1 diff)
trunk/configs/freebsd/proftpd/BSDmakefile (modified) (1 diff)
trunk/docs/FreeBSD/INSTALL (modified) (3 diffs)
trunk/docs/FreeBSD/freebsd-packages (modified) (1 diff)
trunk/engine/setup/reset-setup (modified) (2 diffs)

Legend:

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

trunk/Makefile.fbsd

r1050	r1094
39	39	SYSTEM_LOG=$(INST_PREF)/var/log/ispcp
40	40	SYSTEM_APACHE_BACK_LOG=$(INST_PREF)/usr/local/www/logs/backup
41		SYSTEM_VIRTUAL=$(INST_PREF)/usr/local/www/data
	41	SYSTEM_VIRTUAL=$(INST_PREF)/usr/local/www/data/virtual
42	42	SYSTEM_AWSTATS=$(INST_PREF)/usr/local/www/awstats
43		SYSTEM_FCGI=$(INST_PREF)/usr/local/www/fcgi
	43	SYSTEM_FCGI=$(INST_PREF)/usr/local/www/data/fcgi
44	44	SYSTEM_MAIL_VIRTUAL=$(INST_PREF)/var/mail/virtual
45	45	SYSTEM_MAKE_DIRS=/bin/mkdir -p

trunk/configs/freebsd/BSDmakefile

r1009 r1094

1 .include <../../~~../~~Makefile.fbsd>
1 .include <../../Makefile.fbsd>
2 2
3 3 install:

trunk/configs/freebsd/apache/BSDmakefile

r1056	r1094
1		.include <../../../~~../~~Makefile.fbsd>
	1	.include <../../../Makefile.fbsd>
2	2
3	3	APACHE_EXT_CONF=$(INST_PREF)/usr/local/etc/apache22/Includes
…	…
13	13
14	14	cp ./httpd.conf ./working/ispcp.conf
15		cp ./fastcgi.conf ./working/fastcgi_ispcp.conf
	15	#cp ./fastcgi.conf ./working/fastcgi_ispcp.conf
16	16	cp ./00_master.conf $(SYSTEM_CONF)/apache22
17	17	cp ./01_awstats.conf $(SYSTEM_CONF)/apache22

trunk/configs/freebsd/apache/fastcgi.conf

r1082	r1094
20	20	<IfModule mod_fastcgi.c>
21	21	FastCgiWrapper On
22		FastCgiIpcDir /var/~~lib/apache2~~/fastcgi
	22	FastCgiIpcDir /var/run/fastcgi
23	23
24	24	FastCgiConfig -minProcesses 1 \

trunk/configs/freebsd/awstats/BSDmakefile

r1009 r1094

1 .include <../../../~~../~~Makefile.fbsd>
1 .include <../../../Makefile.fbsd>
2 2
3 3 install:
trunk/configs/freebsd/bind/BSDmakefile

r1009 r1094

1 .include <../../../~~../~~Makefile.fbsd>
1 .include <../../../Makefile.fbsd>
2 2
3 3 install:
trunk/configs/freebsd/courier/BSDmakefile

r1040 r1094

1 .include <../../../~~../~~Makefile.fbsd>
1 .include <../../../Makefile.fbsd>
2 2
3 3 ROOT_COURIER_CONF=$(ROOT_CONF)/courier-imap
trunk/configs/freebsd/cron.d/BSDmakefile

r1056 r1094

28 28 # http://isp-control.net
29 29 #
30 .include <../../../~~../~~Makefile.fbsd>
30 .include <../../../Makefile.fbsd>
31 31
32 32 install:
trunk/configs/freebsd/database/BSDmakefile

r1009 r1094

1 .include <../../../~~../~~Makefile.fbsd>
1 .include <../../../Makefile.fbsd>
2 2
3 3 install:
trunk/configs/freebsd/fcgi/BSDmakefile

r1009 r1094

1 .include <../../../~~../~~Makefile.fbsd>
1 .include <../../../Makefile.fbsd>
2 2
3 3 install:

trunk/configs/freebsd/init.d/BSDmakefile

r1015	r1094
1		.include <../../../~~../~~Makefile.fbsd>
	1	.include <../../../Makefile.fbsd>
2	2
3	3	install:
…	…
5	5	$(SYSTEM_MAKE_DIRS) $(ROOT_CONF)/rc.d
6	6
7		cp ispcp_daemon $(ROOT_CONF)/rc.d~~/ispcp_daemon.sh~~
8		cp ispcp_network $(ROOT_CONF)/rc.d~~/ispcp_network.sh~~
	7	cp ispcp_daemon $(ROOT_CONF)/rc.d
	8	cp ispcp_network $(ROOT_CONF)/rc.d
9	9
10		chown root:wheel $(ROOT_CONF)/rc.d/ispcp_network~~.sh $(ROOT_CONF)/rc.d/ispcp_daemon.sh~~
11		chmod 0755 $(ROOT_CONF)/rc.d/ispcp_network~~.sh $(ROOT_CONF)/rc.d/ispcp_daemon.sh~~
	10	chown root:wheel $(ROOT_CONF)/rc.d/ispcp_network $(ROOT_CONF)/rc.d/ispcp_daemon
	11	chmod 0755 $(ROOT_CONF)/rc.d/ispcp_network $(ROOT_CONF)/rc.d/ispcp_daemon
12	12
13	13	uninstall:
14	14
15		rm -f $(ROOT_CONF)/rc.d/ispcp_daemon~~.sh~~
16		rm -f $(ROOT_CONF)/rc.d/ispcp_network~~.sh~~
	15	rm -f $(ROOT_CONF)/rc.d/ispcp_daemon
	16	rm -f $(ROOT_CONF)/rc.d/ispcp_network

trunk/configs/freebsd/init.d/ispcp_daemon

r1001	r1094
40	40
41	41	PATH=/sbin:/bin:/usr/sbin:/usr/bin
42		DAEMON=/~~var~~/www/ispcp/daemon/ispcp_daemon
	42	DAEMON=/usr/local/www/ispcp/daemon/ispcp_daemon
43	43	PID=/var/run/ispcp-daemon.pid
44	44	NAME=ispcp_daemon

trunk/configs/freebsd/init.d/ispcp_network

r1001 r1094

1 #!/bin/bash
1 #!/usr/local/bin/bash
2 2
3 3 echo "currently not ported to BSD"

trunk/configs/freebsd/ispcp.conf

r1089	r1094
9	9	#
10	10
11		BuildDate = 20080331
	11	BuildDate = 20080401
12	12
13	13	Version = 1.0.0 RC5 OMEGA
…	…
75	75	CMD_RM = /bin/rm
76	76
77		CMD_SHELL = /bin/bash
	77	CMD_SHELL = /usr/local/bin/bash
78	78
79	79	CMD_TAR = /bin/tar
…	…
106	106	DATABASE_DIR = /var/db/mysql
107	107
108		CMD_MYSQLDUMP = /usr/bin/mysqldump
	108	CMD_MYSQLDUMP = /usr/local/bin/mysqldump
109	109
110	110	DATABASE_UTF8 = yes
…	…
118	118	LOG_DIR = /var/log/ispcp
119	119
120		PHP_STARTER_DIR = /usr/local/www/fcgi
	120	PHP_STARTER_DIR = /usr/local/www/data/fcgi
121	121
122	122	ROOT_DIR = /usr/local/www/ispcp
…	…
130	130	APACHE_WWW_DIR = /usr/local/www/data
131	131
132		SCOREBOARDS_DIR = /~~var~~/www/scoreboards
	132	SCOREBOARDS_DIR = /usr/local/www/scoreboards
133	133
134	134	# Select Zipping Algorithm for Backups

trunk/configs/freebsd/logrotate/BSDmakefile

r1009 r1094

1 .include <../../../~~../~~Makefile.fbsd>
1 .include <../../../Makefile.fbsd>
2 2
3 3 install:
trunk/configs/freebsd/postfix/BSDmakefile

r1040 r1094

1 .include <../../../~~../~~Makefile.fbsd>
1 .include <../../../Makefile.fbsd>
2 2
3 3 ROOT_POSTFIX_CONF=$(ROOT_CONF)/postfix
trunk/configs/freebsd/proftpd/BSDmakefile

r1046 r1094

1 .include <../../../~~../~~Makefile.fbsd>
1 .include <../../../Makefile.fbsd>
2 2
3 3 install:

trunk/docs/FreeBSD/INSTALL

r1082	r1094
17	17	1) Version Info
18	18	---------------
19		ispCP ω Version: 1.0.0 RC4
20		INSTALL Script: 2.0
21		Maintainer:
22		Homepage: http://www.isp-contol.net
23		~~Linux Distros:~~ FreeBSD
	19	ispCP ω Versio : 1.0.0 RC4
	20	INSTALL Script : 2.0
	21	Maintainer :
	22	Homepage : http://www.isp-contol.net
	23	Distros : FreeBSD
24	24
25	25	================================================================================
…	…
33	33	Debian (or even any other *NIX-Distribution)
34	34
35		All FreeBSD required packages are listed in
36		./docs/FreeBSD/freebsd-packages
	35	All FreeBSD required packages are listed in docs/FreeBSD/freebsd-packages
37	36
38		The configuration is c~~ostu~~mised for use with apache 2.2.x version using suexec
	37	The configuration is customised for use with apache 2.2.x version using suexec
39	38	module enable.
40	39	================================================================================
…	…
64	63
65	64	3. Install the required modules
66		see: ./docs/FreeBSD/freebsd-packages
	65	see: docs/FreeBSD/freebsd-packages
67	66
68	67	4. (optional) Check the ispcp.conf and adapt it to your requirements.

trunk/docs/FreeBSD/freebsd-packages

r1026	r1094
1		apr
2		apr-util
3		bash
4		bzip2
5		c-client
6		courier-imap
7		courier-pop3
8		courier-utils
9		curl
10		cyrus-sasl-2.1.21p3
11		db-4.2.52p11
12		expat
13		freetype
14		gdbm
15		gettext
16		gmp
17		jpeg-6bp3
18		libghttp
19		libiconv
20		libltdl
21		libmcrypt
22		libxml
23		mhash
24		mtr-0.72-no_x11
25		mysql-client
26		mysql-server
27		neon
28		p5-Compress-Zlib
29		p5-Crypt-Blowfish
30		p5-Crypt-CBC
31		p5-Crypt-DES
32		p5-Crypt-PasswdMD5
33		p5-Crypt-SSLeay
34		p5-DBD-mysql
35		p5-DBI
36		p5-Digest-HMAC
37		p5-Digest-SHA1
38		p5-HTML-Parser
39		p5-HTML-Tagset
40		p5-HTTP-GHTTP
41		p5-IO-stringy
42		p5-MIME-tools
43		p5-Mail-SpamAssassin-3.1.8
44		p5-Mail-Tools
45		p5-Net-DNS
46		p5-Net-Daemon
47		p5-Net-IP
48		p5-PlRPC
49		p5-URI
50		p5-libwww
51		p5-Term-ReadPassword
52		pcre
53		pdflib
54		php4-bz2
55		php4-core
56		php4-curl
57		php4-dbx
58		php4-domxml
59		php4-extensions
60		php4-filepro
61		php4-gd-4.4.1p5-no_x11
62		php4-gmp
63		php4-imap
64		php4-mcrypt
65		php4-mhash
66		php4-mysql
67		php4-pdf
68		php4-pear
69		php4-shmop
70		php4-xmlrpc
71		php4-xslt
72		png
73		postfix-2.3.7-sasl2
74		recode
75		sablotron
76		subversion
77		t1lib
78		tiff
79		unzip
80		wget
	1	=-=-=-= BASIC REQUIRED PACKAGE/PORTS =-=-=-= last update 20080331
	2
	3	Apache 2.2.x Web System
	4	x suexec ( Recomended )
	5	+ mod_cband for bandwitdh management
	6	o mod_php WARNING: security risk for hosting
	7	+ mod_fastcgi ( Recomended )
	8	Proftpd FTP System
	9	x IPV6 IP v6 support ( but disable by ispcp )
	10	x mysql Database module
	11	x quota quota module
	12	x ratio ratio module
	13	x ctrls control module
	14	- delay Not Available in ports
	15	- ctrls_admin Not Available in ports
	16	Postfix Email System
	17	Bash Shell compatibility with Main Version
	18	courier-imap IMAP system
	19	x userdb For use with userdb ( ispcp default )
	20	x mysql For use with mysql
	21	courier-pop3 IMAP POP3 system
	22	mysql-client Database system
	23	mysql-server Database system
	24	Perl =-=-=-= PERL MODULE =-=-=-=
	25	+ Compress-Zlib
	26	+ Crypt-Blowfish
	27	+ Crypt-CBC
	28	+ Crypt-DES
	29	+ Crypt-PasswdMD5
	30	+ Crypt-SSLeay
	31	+ DBD-mysql
	32	+ DBI
	33	+ Digest-HMAC
	34	+ Digest-SHA1
	35	+ HTML-Parser
	36	+ HTML-Tagset
	37	+ HTTP-GHTTP
	38	+ IO-stringy
	39	+ MIME-tools
	40	+ Mail-Tools
	41	+ Net-DNS
	42	+ Net-Daemon
	43	+ Net-IP
	44	+ PlRPC
	45	+ URI
	46	+ libwww
	47	+ Term-ReadPassword
	48	PHP =-=-=-= PHP PACKAGE =-=-=-=
	49	x apache Build Apache module
	50	x CLI
	51	x CGI
	52	x suhosin
	53	x fastcgi
	54	PHP-Extensions
	55	x pcre
	56	x bz2
	57	x core
	58	x curl
	59	x dbx
	60	x domxml
	61	x filepro
	62	x gd
	63	x imap
	64	x mcrypt
	65	x mhash
	66	x mysql
	67	x pear
	68	x shmop
	69	x xmlrpc
	70	x xslt
	71	x session
	72	awstats

trunk/engine/setup/reset-setup

r940	r1094
39	39
40	40	## Variables
41		my ($rs, $sql, $rdata~~) = (undef, undef, undef~~);
	41	my ($rs, $sql, $rdata, $delete_cmd ) = (undef, undef, undef,undef );
42	42	my $user_prefix = $main::cfg{'APACHE_SUEXEC_USER_PREF'};
43	43	my $master_user = $main::cfg{'APACHE_SUEXEC_MIN_UID'};
…	…
48	48	print STDOUT "Re-setting ISPCP Setup!\n";
49	49	print STDOUT "========================\n";
50		~~my $delete_cmd = "$user_delete -r $user_prefix$master_user";~~
51		~~$rs = sys_command($delete_cmd);~~
52	50
53		my $delete_fcgi = "$main::cfg{'CMD_RM'} -r $main::cfg{'PHP_STARTER_DIR'}/master";
54		$rs = sys_command($delete_fcgi);
	51	if ($main::cfg{'ROOT_GROUP'} eq "wheel") {
	52	$delete_cmd = "rmuser -y $user_prefix$master_user";
	53	$rs = sys_command($delete_cmd);
	54	} else {
	55	$delete_cmd = "$user_delete -r $user_prefix$master_user";
	56	$rs = sys_command($delete_cmd);
	57	my $delete_fcgi = "$main::cfg{'CMD_RM'} -r $main::cfg{'PHP_STARTER_DIR'}/master";
	58	$rs = sys_command($delete_fcgi);
	59	}
55	60
56	61	$sql = "DROP DATABASE IF EXISTS $database";
57	62	($rs, $rdata) = doSQL($sql);
	63
58	64	if ($rs != 0) {
59	65	print STDOUT "An error occured!\n";
60	66	print STDOUT "$rdata\n";
61		}
62		else {
	67	} else {
63	68	print STDOUT "done!\n";
64	69	}

Development

Navigation

Changeset 1094

Legend:

Download in other formats: