Skip to content

Commit cc3fb3d

Browse files
author
oliver
committed
fixed some bugs in the installer
1 parent 92bea0b commit cc3fb3d

File tree

5 files changed

+155
-115
lines changed

5 files changed

+155
-115
lines changed

‎install/dist/conf/debian40.conf.php‎

Lines changed: 52 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,63 +3,77 @@
33
//*** Debian 4.0 default settings
44

55
//* Main
6-
$dist['init_scripts'] = '/etc/init.d';
7-
$dist['runlevel'] = '/etc';
8-
$dist['shells'] = '/etc/shells';
9-
$dist['cron_tab'] = '/var/spool/cron/crontabs/root';
10-
$dist['pam'] = '/etc/pam.d';
6+
$conf['language'] = 'en';
7+
$conf['distname'] = 'debian40';
8+
$conf['hostname'] = 'server1.example.com'; // Full hostname
9+
$conf['ispconfig_install_dir'] = '/usr/local/ispconfig';
10+
$conf['ispconfig_config_dir'] = '/usr/local/ispconfig';
11+
$conf['server_id'] = 1;
12+
$conf['init_scripts'] = '/etc/init.d';
13+
$conf['runlevel'] = '/etc';
14+
$conf['shells'] = '/etc/shells';
15+
$conf['cron_tab'] = '/var/spool/cron/crontabs/root';
16+
$conf['pam'] = '/etc/pam.d';
1117

1218
//* MySQL
13-
$dist['mysql']['init_script'] = 'mysql';
19+
$conf['mysql']['init_script'] = 'mysql';
20+
$conf['mysql']['host'] = 'localhost';
21+
$conf['mysql']['ip'] = '127.0.0.1';
22+
$conf['mysql']['port'] = '3306';
23+
$conf['mysql']['database'] = 'dbispconfig';
24+
$conf['mysql']['admin_user'] = 'root';
25+
$conf['mysql']['admin_password'] = '';
26+
$conf['mysql']['ispconfig_user'] = 'ispconfig';
27+
$conf['mysql']['ispconfig_password'] = '5sDrewBhk';
1428

1529
//* Apache
16-
$dist['apache']['user'] = 'www-data';
17-
$dist['apache']['group'] = 'www-data';
18-
$dist['apache']['init_script'] = 'apache2';
19-
$dist['apache']['version'] = '2.2';
20-
$dist['apache']['vhost_dist_dir'] = '/etc/apache2/sites-available';
21-
$dist['apache']['vhost_dist_enabled_dir'] = '/etc/apache2/sites-enabled';
30+
$conf['apache']['user'] = 'www-data';
31+
$conf['apache']['group'] = 'www-data';
32+
$conf['apache']['init_script'] = 'apache2';
33+
$conf['apache']['version'] = '2.2';
34+
$conf['apache']['vhost_conf_dir'] = '/etc/apache2/sites-available';
35+
$conf['apache']['vhost_conf_enabled_dir'] = '/etc/apache2/sites-enabled';
2236

2337
//* Postfix
24-
$dist['postfix']['config_dir'] = '/etc/postfix';
25-
$dist['postfix']['init_script'] = 'postfix';
26-
$dist['postfix']['user'] = 'postfix';
27-
$dist['postfix']['group'] = 'postfix';
28-
$dist['postfix']['vmail_userid'] = '5000';
29-
$dist['postfix']['vmail_username'] = 'vmail';
30-
$dist['postfix']['vmail_groupid'] = '5000';
31-
$dist['postfix']['vmail_groupname'] = 'vmail';
32-
$dist['postfix']['vmail_mailbox_base'] = '/home/vmail';
38+
$conf['postfix']['config_dir'] = '/etc/postfix';
39+
$conf['postfix']['init_script'] = 'postfix';
40+
$conf['postfix']['user'] = 'postfix';
41+
$conf['postfix']['group'] = 'postfix';
42+
$conf['postfix']['vmail_userid'] = '5000';
43+
$conf['postfix']['vmail_username'] = 'vmail';
44+
$conf['postfix']['vmail_groupid'] = '5000';
45+
$conf['postfix']['vmail_groupname'] = 'vmail';
46+
$conf['postfix']['vmail_mailbox_base'] = '/home/vmail';
3347

3448
//* Getmail
35-
$dist['getmail']['config_dir'] = '/etc/getmail';
36-
$dist['getmail']['program'] = '/usr/bin/getmail';
49+
$conf['getmail']['config_dir'] = '/etc/getmail';
50+
$conf['getmail']['program'] = '/usr/bin/getmail';
3751

3852
//* Courier
39-
$dist['courier']['config_dir'] = '/etc/courier';
40-
$dist['courier']['courier-authdaemon'] = 'courier-authdaemon';
41-
$dist['courier']['courier-imap'] = 'courier-imap';
42-
$dist['courier']['courier-imap-ssl'] = 'courier-imap-ssl';
43-
$dist['courier']['courier-pop'] = 'courier-pop';
44-
$dist['courier']['courier-pop-ssl'] = 'courier-pop-ssl';
53+
$conf['courier']['config_dir'] = '/etc/courier';
54+
$conf['courier']['courier-authdaemon'] = 'courier-authdaemon';
55+
$conf['courier']['courier-imap'] = 'courier-imap';
56+
$conf['courier']['courier-imap-ssl'] = 'courier-imap-ssl';
57+
$conf['courier']['courier-pop'] = 'courier-pop';
58+
$conf['courier']['courier-pop-ssl'] = 'courier-pop-ssl';
4559

4660
//* SASL
47-
$dist['saslauthd']['config'] = '/etc/default/saslauthd';
48-
$dist['saslauthd']['init_script'] = 'saslauthd';
61+
$conf['saslauthd']['config'] = '/etc/default/saslauthd';
62+
$conf['saslauthd']['init_script'] = 'saslauthd';
4963

5064
//* Amavisd
51-
$dist['amavis']['config_dir'] = '/etc/amavis';
52-
$dist['amavis']['init_script'] = 'amavis';
65+
$conf['amavis']['config_dir'] = '/etc/amavis';
66+
$conf['amavis']['init_script'] = 'amavis';
5367

5468
//* ClamAV
55-
$dist['clamav']['init_script'] = 'clamav-daemon';
69+
$conf['clamav']['init_script'] = 'clamav-daemon';
5670

5771
//* Pureftpd
58-
$dist['pureftpd']['config_dir'] = '/etc/pure-ftpd';
59-
$dist['pureftpd']['init_script'] = 'pure-ftpd-mysql';
72+
$conf['pureftpd']['config_dir'] = '/etc/pure-ftpd';
73+
$conf['pureftpd']['init_script'] = 'pure-ftpd-mysql';
6074

6175
//* MyDNS
62-
$dist['mydns']['config_dir'] = '/etc';
63-
$dist['mydns']['init_script'] = 'mydns';
76+
$conf['mydns']['config_dir'] = '/etc';
77+
$conf['mydns']['init_script'] = 'mydns';
6478

6579
?>

‎install/install.php‎

Lines changed: 34 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,18 @@
5252

5353
//** Include the library with the basic installer functions
5454
require_once('lib/install.lib.php');
55-
require_once('options.conf.php');
56-
5755

5856
//** Include the base class of the installer class
5957
require_once('lib/installer_base.lib.php');
6058

61-
//** Include the distribution specific installer class library and configuration
62-
include_once('dist/lib/'.$conf['distname'].'.lib.php');
63-
include_once('dist/conf/'.$conf['distname'].'.conf.php');
64-
65-
59+
//** Get distribution identifier
6660
$distname = get_distname();
67-
//** Copt the $dist created in dist/conf/foo to global var
68-
$conf['dist'] = $dist;
6961

62+
//** Include the distribution specific installer class library and configuration
63+
include_once('dist/lib/'.$distname.'.lib.php');
64+
include_once('dist/conf/'.$distname.'.conf.php');
65+
66+
//** Install logfile
7067
define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
7168

7269
//****************************************************************************************************
@@ -78,8 +75,8 @@
7875
swriteln($inst->lng(' Tap in "quit" (without the quotes) to stop the installer.'."\n\n"));
7976

8077
//** Check log file is writable (probably not root or sudo)
81-
if(!is_writable(ISPC_LOG_FILE)){
82-
die("ERROR: Cannot write to the log file '".ISPC_LOG_FILE."'. Are you root or sudo ?\n\n");
78+
if(!is_writable(dirname(ISPC_LOG_FILE))){
79+
die("ERROR: Cannot write to the directory ".dirname(ISPC_LOG_FILE).". Are you root or sudo ?\n\n");
8380
}
8481

8582
//** Select the language
@@ -92,7 +89,7 @@
9289
//** Get the hostname
9390
$tmp_out = array();
9491
exec('hostname -f', $tmp_out);
95-
$conf['hostname'] = $inst->free_query('Full qualified hostname (FQDN) of the server, eg foo.example.com ', $tmp_out[0]);
92+
$inst->conf['hostname'] = $inst->free_query('Full qualified hostname (FQDN) of the server, eg foo.example.com ', $tmp_out[0]);
9693
unset($tmp_out);
9794

9895
//** Get MySQL root credentials
@@ -175,19 +172,19 @@
175172
$inst->install_crontab();
176173

177174
swriteln('Restarting services ...');
178-
system($conf['dist']['init_scripts'].'/'.$conf['dist']['mysql']['init_script'].' restart');
179-
system($conf['dist']['init_scripts'].'/'.$conf['dist']['postfix']['init_script'].' restart');
180-
system($conf['dist']['init_scripts'].'/'.$conf['dist']['saslauthd']['init_script'].' restart');
181-
system($conf['dist']['init_scripts'].'/'.$conf['dist']['amavis']['init_script'].' restart');
182-
system($conf['dist']['init_scripts'].'/'.$conf['dist']['clamav']['init_script'].' restart');
183-
system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-authdaemon'].' restart');
184-
system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-imap'].' restart');
185-
system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-imap-ssl'].' restart');
186-
system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-pop'].' restart');
187-
system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-pop-ssl'].' restart');
188-
system($conf['dist']['init_scripts'].'/'.$conf['dist']['apache']['init_script'].' restart');
189-
system($conf['dist']['init_scripts'].'/'.$conf['dist']['pureftpd']['init_script'].' restart');
190-
system($conf['dist']['init_scripts'].'/'.$conf['dist']['mydns']['init_script'].' restart');
175+
system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
176+
system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
177+
system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
178+
system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
179+
system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
180+
system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
181+
system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
182+
system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
183+
system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
184+
system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
185+
system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
186+
system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
187+
system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart');
191188

192189
}else{
193190

@@ -226,29 +223,29 @@
226223
swriteln('Configuring Getmail');
227224
$inst->configure_getmail();
228225

229-
system($conf['dist']['init_scripts'].'/'.$conf['dist']['postfix']['init_script'].' restart');
230-
system($conf['dist']['init_scripts'].'/'.$conf['dist']['saslauthd']['init_script'].' restart');
231-
system($conf['dist']['init_scripts'].'/'.$conf['dist']['amavis']['init_script'].' restart');
232-
system($conf['dist']['init_scripts'].'/'.$conf['dist']['clamav']['init_script'].' restart');
233-
system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-authdaemon'].' restart');
234-
system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-imap'].' restart');
235-
system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-imap-ssl'].' restart');
236-
system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-pop'].' restart');
237-
system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-pop-ssl'].' restart');
226+
system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
227+
system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
228+
system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
229+
system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
230+
system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
231+
system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
232+
system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
233+
system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
234+
system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
238235
}
239236

240237
//** Configure Pureftpd
241238
if(strtolower($inst->simple_query('Configure FTP Server', array('y','n'),'y') ) == 'y') {
242239
swriteln('Configuring Pureftpd');
243240
$inst->configure_pureftpd();
244-
system($conf['dist']['init_scripts'].'/'.$conf['dist']['pureftpd']['init_script'].' restart');
241+
system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
245242
}
246243

247244
//** Configure MyDNS
248245
if(strtolower($inst->simple_query('Configure DNS Server',array('y','n'),'y')) == 'y') {
249246
swriteln('Configuring MyDNS');
250247
$inst->configure_mydns();
251-
system($conf['dist']['init_scripts'].'/'.$conf['dist']['mydns']['init_script'].' restart');
248+
system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart');
252249
}
253250

254251
//** Configure Apache
@@ -265,7 +262,7 @@
265262
//* Configure ISPConfig
266263
swriteln('Installing Crontab');
267264
$inst->install_crontab();
268-
system($conf['dist']['init_scripts'].'/'.$conf['dist']['apache']['init_script'].' restart');
265+
system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
269266
}
270267

271268
} //* << $install_mode / 'Standard' or Genius

‎install/lib/install.lib.php‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,22 @@
5656

5757
$FILE = realpath('../install.php');
5858

59+
//** Get distribution identifier
5960
function get_distname() {
60-
global $conf; // TODO wtf ?
61-
$distname = $conf['distname'];
61+
62+
//** Debian
63+
if(file_exists('/etc/debian_version')) {
64+
65+
if(trim(file_get_contents('/etc/debian_version')) == '4.0') {
66+
$distname = 'debian40';
67+
}
68+
}
69+
70+
//** Redhat
71+
elseif(file_exists("/etc/redhat_release")) {
72+
73+
}
74+
6275
return $distname;
6376
}
6477

0 commit comments

Comments
 (0)