Skip to content

Commit cb8c86a

Browse files
author
wyrie
committed
Implemented: FS#973 - Gentoo support for installer. Fixed FS#974 - Directory mode for firewall configuration
1 parent b17b894 commit cb8c86a

File tree

8 files changed

+1249
-51
lines changed

8 files changed

+1249
-51
lines changed

install/dist/conf/gentoo.conf.php

Lines changed: 123 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -31,85 +31,162 @@
3131
//*** Gentoo default settings
3232

3333
//* Main
34-
$dist['init_scripts'] = '/etc/init.d';
35-
$dist['runlevel'] = '/etc';
36-
$dist['shells'] = '/etc/shells';
37-
$dist['cron_tab'] = '/var/spool/cron/crontabs/root';
38-
$dist['pam'] = '/etc/pam.d';
34+
$conf['language'] = 'en';
35+
$conf['distname'] = 'gentoo-1.12.11.1';
36+
$conf['hostname'] = 'server1.domain.tld'; // Full hostname
37+
$conf['ispconfig_install_dir'] = '/usr/local/ispconfig';
38+
$conf['ispconfig_config_dir'] = '/usr/local/ispconfig';
39+
$conf['ispconfig_log_priority'] = 2; // 0 = Debug, 1 = Warning, 2 = Error
40+
$conf['server_id'] = 1;
41+
$conf['init_scripts'] = '/etc/init.d';
42+
$conf['runlevel'] = '/etc';
43+
$conf['shells'] = '/etc/shells';
44+
$conf['cron_tab'] = '/var/spool/cron/crontabs/root';
45+
$conf['pam'] = '/etc/pam.d';
46+
47+
//* Services provided by this server, this selection will be overridden by the expert mode
48+
$conf['services']['mail'] = true;
49+
$conf['services']['web'] = true;
50+
$conf['services']['dns'] = true;
51+
$conf['services']['file'] = true;
52+
$conf['services']['db'] = true;
53+
$conf['services']['vserver'] = true;
3954

4055
//* MySQL
41-
$dist['mysql']['init_script'] = 'mysql';
56+
$conf['mysql']['installed'] = false; // will be detected automatically during installation
57+
$conf['mysql']['init_script'] = 'mysql';
58+
$conf['mysql']['host'] = 'localhost';
59+
$conf['mysql']['ip'] = '127.0.0.1';
60+
$conf['mysql']['port'] = '3306';
61+
$conf['mysql']['database'] = 'dbispconfig';
62+
$conf['mysql']['admin_user'] = 'root';
63+
$conf['mysql']['admin_password'] = '';
64+
$conf['mysql']['charset'] = 'utf8';
65+
$conf['mysql']['ispconfig_user'] = 'ispconfig';
66+
$conf['mysql']['ispconfig_password'] = md5 (uniqid (rand()));
67+
$conf['mysql']['master_slave_setup'] = 'n';
68+
$conf['mysql']['master_host'] = '';
69+
$conf['mysql']['master_database'] = 'dbispconfig';
70+
$conf['mysql']['master_admin_user'] = 'root';
71+
$conf['mysql']['master_admin_password'] = '';
72+
$conf['mysql']['master_ispconfig_user'] = '';
73+
$conf['mysql']['master_ispconfig_password'] = md5 (uniqid (rand()));
74+
75+
//* SuPHP
76+
$conf['suphp']['config_file'] = '/etc/suphp.conf';
4277

4378
//* Apache
44-
$dist['apache']['user'] = 'apache';
45-
$dist['apache']['group'] = 'apache';
46-
$dist['apache']['init_script'] = 'apache2';
47-
$dist['apache']['version'] = '2.2';
48-
$dist['apache']['vhost_dist_dir'] = '/etc/apache2/vhosts.d';
49-
$dist['apache']['vhost_dist_enabled_dir'] = '/etc/apache2/vhosts.d';
79+
$conf['apache']['installed'] = false; // will be detected automatically during installation
80+
$conf['apache']['user'] = 'apache';
81+
$conf['apache']['group'] = 'apache';
82+
$conf['apache']['init_script'] = 'apache2';
83+
$conf['apache']['version'] = '2.2';
84+
$conf['apache']['config_dir'] = '/etc/apache2';
85+
$conf['apache']['config_file'] = $conf['apache']['config_dir'] .'/httpd.conf';
86+
$conf['apache']['ssl_dir'] = $conf['apache']['config_dir'] .'/ssl';
87+
$conf['apache']['vhost_conf_dir'] = $conf['apache']['config_dir'] . '/vhosts.d';
88+
$conf['apache']['vhost_conf_enabled_dir'] = $conf['apache']['vhost_conf_dir'];
89+
$conf['apache']['vhost_default'] = '00_default_vhost.conf';
5090
$conf['apache']['vhost_port'] = '8080';
5191

92+
//* Website base settings
93+
$conf['web']['website_basedir'] = '/var/www';
94+
$conf['web']['website_path'] = '/var/www/clients/client[client_id]/web[website_id]';
95+
$conf['web']['website_symlinks'] = '/var/www/[website_domain]/:/var/www/clients/client[client_id]/[website_domain]/';
96+
97+
//* Apps base settings
98+
$conf['web']['apps_vhost_ip'] = '_default_';
99+
$conf['web']['apps_vhost_port'] = '8081';
100+
$conf['web']['apps_vhost_servername'] = '';
101+
$conf['web']['apps_vhost_user'] = 'ispapps';
102+
$conf['web']['apps_vhost_group'] = 'ispapps';
103+
104+
//* Fastcgi
105+
$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php5/cgi/';
106+
$conf['fastcgi']['fastcgi_starter_path'] = '/var/www/php-fcgi-scripts/[system_user]/';
107+
52108
//* Postfix
53-
$dist['postfix']['config_dir'] = '/etc/postfix';
54-
$dist['postfix']['init_script'] = 'postfix';
55-
$dist['postfix']['user'] = 'postfix';
56-
$dist['postfix']['group'] = 'postfix';
57-
$dist['postfix']['vmail_userid'] = '5000';
58-
$dist['postfix']['vmail_username'] = 'vmail';
59-
$dist['postfix']['vmail_groupid'] = '5000';
60-
$dist['postfix']['vmail_groupname'] = 'vmail';
61-
$dist['postfix']['vmail_mailbox_base'] = '/var/vmail';
109+
$conf['postfix']['installed'] = false; // will be detected automatically during installation
110+
$conf['postfix']['config_dir'] = '/etc/postfix';
111+
$conf['postfix']['init_script'] = 'postfix';
112+
$conf['postfix']['user'] = 'postfix';
113+
$conf['postfix']['group'] = 'postfix';
114+
$conf['postfix']['vmail_userid'] = '5000';
115+
$conf['postfix']['vmail_username'] = 'vmail';
116+
$conf['postfix']['vmail_groupid'] = '5000';
117+
$conf['postfix']['vmail_groupname'] = 'vmail';
118+
$conf['postfix']['vmail_mailbox_base'] = '/var/vmail';
62119

63120
//* Getmail
64-
$dist['getmail']['config_dir'] = '/etc/getmail';
65-
$dist['getmail']['program'] = '/usr/bin/getmail';
121+
$conf['getmail']['installed'] = false; // will be detected automatically during installation
122+
$conf['getmail']['user'] = 'getmail';
123+
$conf['getmail']['config_dir'] = '/etc/getmail';
124+
$conf['getmail']['program'] = '/usr/bin/getmail';
66125

67126
//* Courier
68-
$dist['courier']['config_dir'] = '/etc/courier';
69-
$dist['courier']['courier-authdaemon'] = 'courier-authlib';
70-
$dist['courier']['courier-imap'] = 'courier-imapd';
71-
$dist['courier']['courier-imap-ssl'] = 'courier-imapd-ssl';
72-
$dist['courier']['courier-pop'] = 'courier-pop3d';
73-
$dist['courier']['courier-pop-ssl'] = 'courier-pop3d-ssl';
127+
$conf['courier']['installed'] = false; // will be detected automatically during installation
128+
$conf['courier']['config_dir'] = '/etc/courier/authlib';
129+
$conf['courier']['courier-authdaemon'] = 'courier-authlib';
130+
$conf['courier']['courier-imap'] = 'courier-imapd';
131+
$conf['courier']['courier-imap-ssl'] = 'courier-imapd-ssl';
132+
$conf['courier']['courier-pop'] = 'courier-pop3d';
133+
$conf['courier']['courier-pop-ssl'] = 'courier-pop3d-ssl';
74134

75135
//* SASL
76-
$dist['saslauthd']['config'] = '/etc/default/saslauthd';
77-
$dist['saslauthd']['init_script'] = 'saslauthd';
136+
$conf['saslauthd']['installed'] = false; // will be detected automatically during installation
137+
$conf['saslauthd']['config_file'] = '/etc/conf.d/saslauthd';
138+
$conf['saslauthd']['config_dir'] = '/etc/sasl2';
139+
$conf['saslauthd']['init_script'] = 'saslauthd';
78140

79141
//* Amavisd
80-
$dist['amavis']['config_dir'] = '/etc/amavis';
81-
$dist['amavis']['init_script'] = 'amavisd';
142+
$conf['amavis']['installed'] = false; // will be detected automatically during installation
143+
$conf['amavis']['config_file'] = '/etc/amavisd.conf';
144+
$conf['amavis']['init_script'] = 'amavisd';
82145

83146
//* ClamAV
84-
$dist['clamav']['init_script'] = 'clamd';
147+
$conf['clamav']['installed'] = false; // will be detected automatically during installation
148+
$conf['clamav']['init_script'] = 'clamd';
85149

86150
//* Pureftpd
87-
$dist['pureftpd']['config_dir'] = '/etc/pure-ftpd';
88-
$dist['pureftpd']['init_script'] = 'pure-ftpd';
151+
$conf['pureftpd']['installed'] = false; // will be detected automatically during installation
152+
$conf['pureftpd']['config_file'] = '/etc/conf.d/pure-ftpd';
153+
$conf['pureftpd']['mysql_config_file'] = '/etc/pureftpd-mysql.conf';
154+
$conf['pureftpd']['init_script'] = 'pure-ftpd';
89155

90156
//* MyDNS
91-
$dist['mydns']['config_dir'] = '/etc';
92-
$dist['mydns']['init_script'] = 'mydns';
157+
$conf['mydns']['installed'] = false; // will be detected automatically during installation
158+
$conf['mydns']['config_dir'] = '/etc';
159+
$conf['mydns']['init_script'] = 'mydns';
93160

94161
//* PowerDNS
95162
$conf['powerdns']['installed'] = false; // will be detected automatically during installation
96163
$conf['powerdns']['database'] = 'powerdns';
97-
$conf["powerdns"]["config_dir"] = '/etc/powerdns/pdns.d';
98-
$conf['powerdns']['init_script'] = 'pdns';
164+
$conf["powerdns"]["config_dir"] = '/etc/powerdns';
165+
$conf["powerdns"]["config_file"] = 'pdns-local.conf';
166+
$conf['powerdns']['init_script'] = 'pdns.local';
167+
168+
//* BIND DNS Server
169+
$conf['bind']['installed'] = false; // will be detected automatically during installation
170+
$conf['bind']['bind_user'] = 'root';
171+
$conf['bind']['bind_group'] = 'bind';
172+
$conf['bind']['bind_zonefiles_dir'] = '/etc/bind';
173+
$conf['bind']['named_conf_path'] = '/etc/bind/named.conf';
174+
$conf['bind']['named_conf_local_path'] = '/etc/bind/named.conf.local';
175+
$conf['bind']['init_script'] = 'named';
99176

100177
//* Jailkit
178+
$conf['jailkit']['installed'] = false; // will be detected automatically during installation
101179
$conf['jailkit']['config_dir'] = '/etc/jailkit';
102180
$conf['jailkit']['jk_init'] = 'jk_init.ini';
103181
$conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini';
104-
$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico';
105-
$conf['jailkit']['jailkit_chroot_cron_programs'] = '/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php';
182+
$conf['jailkit']['jailkit_chroot_app_programs'] = '/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/less /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/vim';
106183

107184
//* vlogger
108-
$conf['vlogger']['config_dir'] = '/etc';
185+
$conf['vlogger']['config_dir'] = '/etc/vlogger';
109186

110187
//* cron
111-
$conf['cron']['init_script'] = 'cron';
188+
$conf['cron']['init_script'] = 'vixie-cron';
112189
$conf['cron']['crontab_dir'] = '/etc/cron.d';
190+
$conf['cron']['group'] = 'cron';
113191
$conf['cron']['wget'] = '/usr/bin/wget';
114-
115-
?>
192+
?>

0 commit comments

Comments
 (0)