Skip to content

Commit 4fe86d0

Browse files
author
pedro_morgan
committed
MInor tidy of the dist.conf.php files
1 parent 66b4f90 commit 4fe86d0

File tree

3 files changed

+104
-107
lines changed

3 files changed

+104
-107
lines changed

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

Lines changed: 51 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,65 @@
11
<?php
22

3-
/*
4-
Distribution specific settings
5-
*/
3+
//*** Debian 4.0 default settings
64

7-
// Main
8-
$dist["init_scripts"] = "/etc/init.d";
9-
$dist["runlevel"] = "/etc";
10-
$dist["shells"] = "/etc/shells";
11-
$dist["cron_tab"] = "/var/spool/cron/crontabs/root";
12-
$dist["pam"] = "/etc/pam.d";
5+
//* 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';
1311

14-
// MySQL
15-
$dist["mysql"]["init_script"] = "mysql";
12+
//* MySQL
13+
$dist['mysql']['init_script'] = 'mysql';
1614

17-
// Apache
18-
$dist["apache"]["user"] = "www-data";
19-
$dist["apache"]["group"] = "www-data";
20-
$dist["apache"]["init_script"] = "apache2";
21-
$dist["apache"]["version"] = "2.2";
22-
$dist["apache"]["vhost_dist_dir"] = "/etc/apache2/sites-available";
23-
$dist["apache"]["vhost_dist_enabled_dir"] = "/etc/apache2/sites-enabled";
15+
//* 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';
2422

25-
// Postfix
26-
$dist["postfix"]["config_dir"] = "/etc/postfix";
27-
$dist["postfix"]["init_script"] = "postfix";
28-
$dist["postfix"]["user"] = "postfix";
29-
$dist["postfix"]["group"] = "postfix";
30-
$dist["postfix"]["vmail_userid"] = "5000";
31-
$dist["postfix"]["vmail_username"] = "vmail";
32-
$dist["postfix"]["vmail_groupid"] = "5000";
33-
$dist["postfix"]["vmail_groupname"] = "vmail";
34-
$dist["postfix"]["vmail_mailbox_base"] = "/home/vmail";
23+
//* 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';
3533

36-
// Getmail
37-
$dist["getmail"]["config_dir"] = "/etc/getmail";
38-
$dist["getmail"]["program"] = "/usr/bin/getmail";
34+
//* Getmail
35+
$dist['getmail']['config_dir'] = '/etc/getmail';
36+
$dist['getmail']['program'] = '/usr/bin/getmail';
3937

40-
// Courier
41-
$dist["courier"]["config_dir"] = "/etc/courier";
42-
$dist["courier"]["courier-authdaemon"] = "courier-authdaemon";
43-
$dist["courier"]["courier-imap"] = "courier-imap";
44-
$dist["courier"]["courier-imap-ssl"] = "courier-imap-ssl";
45-
$dist["courier"]["courier-pop"] = "courier-pop";
46-
$dist["courier"]["courier-pop-ssl"] = "courier-pop-ssl";
38+
//* 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';
4745

48-
// SASL
49-
$dist["saslauthd"]["config"] = "/etc/default/saslauthd";
50-
$dist["saslauthd"]["init_script"] = "saslauthd";
46+
//* SASL
47+
$dist['saslauthd']['config'] = '/etc/default/saslauthd';
48+
$dist['saslauthd']['init_script'] = 'saslauthd';
5149

52-
// Amavisd
53-
$dist["amavis"]["config_dir"] = "/etc/amavis";
54-
$dist["amavis"]["init_script"] = "amavis";
50+
//* Amavisd
51+
$dist['amavis']['config_dir'] = '/etc/amavis';
52+
$dist['amavis']['init_script'] = 'amavis';
5553

56-
// ClamAV
57-
$dist["clamav"]["init_script"] = "clamav-daemon";
54+
//* ClamAV
55+
$dist['clamav']['init_script'] = 'clamav-daemon';
5856

59-
// Pureftpd
60-
$dist["pureftpd"]["config_dir"] = "/etc/pure-ftpd";
61-
$dist["pureftpd"]["init_script"] = "pure-ftpd-mysql";
57+
//* Pureftpd
58+
$dist['pureftpd']['config_dir'] = '/etc/pure-ftpd';
59+
$dist['pureftpd']['init_script'] = 'pure-ftpd-mysql';
6260

63-
// MyDNS
64-
$dist["mydns"]["config_dir"] = "/etc";
65-
$dist["mydns"]["init_script"] = "mydns";
61+
//* MyDNS
62+
$dist['mydns']['config_dir'] = '/etc';
63+
$dist['mydns']['init_script'] = 'mydns';
6664

67-
?>
65+
?>

‎install/dist/conf/gentoo.conf.php‎

Lines changed: 51 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,65 @@
11
<?php
22

3-
/*
4-
Distribution specific settings
5-
*/
3+
//*** Gentoo default settings
64

7-
// Main
8-
$dist["init_scripts"] = "/etc/init.d";
9-
$dist["runlevel"] = "/etc";
10-
$dist["shells"] = "/etc/shells";
11-
$dist["cron_tab"] = "/var/spool/cron/crontabs/root";
12-
$dist["pam"] = "/etc/pam.d";
5+
//* 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';
1311

14-
// MySQL
15-
$dist["mysql"]["init_script"] = "mysql";
12+
//* MySQL
13+
$dist['mysql']['init_script'] = 'mysql';
1614

17-
// Apache
18-
$dist["apache"]["user"] = "apache";
19-
$dist["apache"]["group"] = "apache";
20-
$dist["apache"]["init_script"] = "apache2";
21-
$dist["apache"]["version"] = "2.2";
22-
$dist["apache"]["vhost_dist_dir"] = "/etc/apache2/vhosts.d";
23-
$dist["apache"]["vhost_dist_enabled_dir"] = "/etc/apache2/vhosts.d";
15+
//* Apache
16+
$dist['apache']['user'] = 'apache';
17+
$dist['apache']['group'] = 'apache';
18+
$dist['apache']['init_script'] = 'apache2';
19+
$dist['apache']['version'] = '2.2';
20+
$dist['apache']['vhost_dist_dir'] = '/etc/apache2/vhosts.d';
21+
$dist['apache']['vhost_dist_enabled_dir'] = '/etc/apache2/vhosts.d';
2422

25-
// Postfix
26-
$dist["postfix"]["config_dir"] = "/etc/postfix";
27-
$dist["postfix"]["init_script"] = "postfix";
28-
$dist["postfix"]["user"] = "postfix";
29-
$dist["postfix"]["group"] = "postfix";
30-
$dist["postfix"]["vmail_userid"] = "5000";
31-
$dist["postfix"]["vmail_username"] = "vmail";
32-
$dist["postfix"]["vmail_groupid"] = "5000";
33-
$dist["postfix"]["vmail_groupname"] = "vmail";
34-
$dist["postfix"]["vmail_mailbox_base"] = "/home/vmail";
23+
//* 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';
3533

36-
// Getmail
37-
$dist["getmail"]["config_dir"] = "/etc/getmail";
38-
$dist["getmail"]["program"] = "/usr/bin/getmail";
34+
//* Getmail
35+
$dist['getmail']['config_dir'] = '/etc/getmail';
36+
$dist['getmail']['program'] = '/usr/bin/getmail';
3937

40-
// Courier
41-
$dist["courier"]["config_dir"] = "/etc/courier";
42-
$dist["courier"]["courier-authdaemon"] = "courier-authlib";
43-
$dist["courier"]["courier-imap"] = "courier-imapd";
44-
$dist["courier"]["courier-imap-ssl"] = "courier-imapd-ssl";
45-
$dist["courier"]["courier-pop"] = "courier-pop3d";
46-
$dist["courier"]["courier-pop-ssl"] = "courier-pop3d-ssl";
38+
//* Courier
39+
$dist['courier']['config_dir'] = '/etc/courier';
40+
$dist['courier']['courier-authdaemon'] = 'courier-authlib';
41+
$dist['courier']['courier-imap'] = 'courier-imapd';
42+
$dist['courier']['courier-imap-ssl'] = 'courier-imapd-ssl';
43+
$dist['courier']['courier-pop'] = 'courier-pop3d';
44+
$dist['courier']['courier-pop-ssl'] = 'courier-pop3d-ssl';
4745

48-
// SASL
49-
$dist["saslauthd"]["config"] = "/etc/default/saslauthd";
50-
$dist["saslauthd"]["init_script"] = "saslauthd";
46+
//* SASL
47+
$dist['saslauthd']['config'] = '/etc/default/saslauthd';
48+
$dist['saslauthd']['init_script'] = 'saslauthd';
5149

52-
// Amavisd
53-
$dist["amavis"]["config_dir"] = "/etc/amavis";
54-
$dist["amavis"]["init_script"] = "amavisd";
50+
//* Amavisd
51+
$dist['amavis']['config_dir'] = '/etc/amavis';
52+
$dist['amavis']['init_script'] = 'amavisd';
5553

56-
// ClamAV
57-
$dist["clamav"]["init_script"] = "clamd";
54+
//* ClamAV
55+
$dist['clamav']['init_script'] = 'clamd';
5856

59-
// Pureftpd
60-
$dist["pureftpd"]["config_dir"] = "/etc/pure-ftpd";
61-
$dist["pureftpd"]["init_script"] = "pure-ftpd";
57+
//* Pureftpd
58+
$dist['pureftpd']['config_dir'] = '/etc/pure-ftpd';
59+
$dist['pureftpd']['init_script'] = 'pure-ftpd';
6260

63-
// MyDNS
64-
$dist["mydns"]["config_dir"] = "/etc";
65-
$dist["mydns"]["init_script"] = "mydns";
61+
//* MyDNS
62+
$dist['mydns']['config_dir'] = '/etc';
63+
$dist['mydns']['init_script'] = 'mydns';
6664

67-
?>
65+
?>

‎install/install.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,9 @@
7676
swriteln($inst->lng(' Default values are in [brackets] and can be accepted with <ENTER>.'));
7777
swriteln($inst->lng(' Tap in "quit" (without the quotes) to stop the installer.'."\n\n"));
7878

79+
//** Check log file is writable (probably not root or sudo)
7980
if(!is_writable(ISPC_LOG_FILE)){
80-
die("ERROR: Cannot write to the log file '".ISPC_LOG_FILE."'. Are you root ?\n\n");
81+
die("ERROR: Cannot write to the log file '".ISPC_LOG_FILE."'. Are you root or sudo ?\n\n");
8182
}
8283

8384
//** Select the language

0 commit comments

Comments
 (0)