Skip to content

Commit df7e6d0

Browse files
tbrehmtbrehm
committed
Fixed several bugs (revisions 1772-1779 from stable branch).
1 parent 9d9a325 commit df7e6d0

21 files changed

+301
-78
lines changed

‎install/dist/conf/opensuse112.conf.php‎

Lines changed: 187 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,187 @@
1+
<?php
2+
3+
/*
4+
Copyright (c) 2007, Till Brehm, projektfarm Gmbh
5+
All rights reserved.
6+
7+
Redistribution and use in source and binary forms, with or without modification,
8+
are permitted provided that the following conditions are met:
9+
10+
* Redistributions of source code must retain the above copyright notice,
11+
this list of conditions and the following disclaimer.
12+
* Redistributions in binary form must reproduce the above copyright notice,
13+
this list of conditions and the following disclaimer in the documentation
14+
and/or other materials provided with the distribution.
15+
* Neither the name of ISPConfig nor the names of its contributors
16+
may be used to endorse or promote products derived from this software without
17+
specific prior written permission.
18+
19+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
20+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
21+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
22+
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
23+
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
24+
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
26+
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
27+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
28+
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29+
*/
30+
31+
//*** OpenSUSE 11.0 default settings
32+
33+
//* Main
34+
$conf['language'] = 'en';
35+
$conf['distname'] = 'opensuse110';
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/tabs/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;
54+
55+
//* 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+
//* Apache
76+
$conf['apache']['installed'] = false; // will be detected automatically during installation
77+
$conf['apache']['user'] = 'wwwrun';
78+
$conf['apache']['group'] = 'www';
79+
$conf['apache']['init_script'] = 'apache2';
80+
$conf['apache']['version'] = '2.2';
81+
$conf['apache']['vhost_conf_dir'] = '/etc/apache2/sites-available';
82+
$conf['apache']['vhost_conf_enabled_dir'] = '/etc/apache2/sites-enabled';
83+
$conf['apache']['vhost_port'] = '8080';
84+
85+
//* Website base settings
86+
$conf['web']['website_basedir'] = '/srv/www';
87+
$conf['web']['website_path'] = '/srv/www/clients/client[client_id]/web[website_id]';
88+
$conf['web']['website_symlinks'] = '/srv/www/[website_domain]/:/srv/www/clients/client[client_id]/[website_domain]/';
89+
90+
//* Apps base settings
91+
$conf['web']['apps_vhost_ip'] = '_default_';
92+
$conf['web']['apps_vhost_port'] = '8081';
93+
$conf['web']['apps_vhost_servername'] = '';
94+
$conf['web']['apps_vhost_user'] = 'ispapps';
95+
$conf['web']['apps_vhost_group'] = 'ispapps';
96+
97+
//* Fastcgi
98+
$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php5/cgi/';
99+
$conf['fastcgi']['fastcgi_starter_path'] = '/srv/www/php-fcgi-scripts/[system_user]/';
100+
101+
//* Postfix
102+
$conf['postfix']['installed'] = false; // will be detected automatically during installation
103+
$conf['postfix']['config_dir'] = '/etc/postfix';
104+
$conf['postfix']['init_script'] = 'postfix';
105+
$conf['postfix']['user'] = 'postfix';
106+
$conf['postfix']['group'] = 'postfix';
107+
$conf['postfix']['vmail_userid'] = '5000';
108+
$conf['postfix']['vmail_username'] = 'vmail';
109+
$conf['postfix']['vmail_groupid'] = '5000';
110+
$conf['postfix']['vmail_groupname'] = 'vmail';
111+
$conf['postfix']['vmail_mailbox_base'] = '/var/vmail';
112+
113+
//* Getmail
114+
$conf['getmail']['installed'] = false; // will be detected automatically during installation
115+
$conf['getmail']['config_dir'] = '/etc/getmail';
116+
$conf['getmail']['program'] = '/usr/bin/getmail';
117+
118+
//* Courier
119+
$conf['courier']['installed'] = false; // will be detected automatically during installation
120+
$conf['courier']['config_dir'] = '/etc/authlib';
121+
$conf['courier']['courier-authdaemon'] = 'courier-authdaemon';
122+
$conf['courier']['courier-imap'] = 'courier-imap';
123+
$conf['courier']['courier-imap-ssl'] = 'courier-imap-ssl';
124+
$conf['courier']['courier-pop'] = 'courier-pop';
125+
$conf['courier']['courier-pop-ssl'] = 'courier-pop-ssl';
126+
127+
//* Dovecot
128+
$conf['dovecot']['installed'] = false; // will be detected automatically during installation
129+
$conf['dovecot']['config_dir'] = '/etc/dovecot';
130+
$conf['dovecot']['init_script'] = 'dovecot';
131+
132+
//* SASL
133+
$conf['saslauthd']['installed'] = false; // will be detected automatically during installation
134+
$conf['saslauthd']['config'] = '/etc/default/saslauthd';
135+
$conf['saslauthd']['init_script'] = 'saslauthd';
136+
137+
//* Amavisd
138+
$conf['amavis']['installed'] = false; // will be detected automatically during installation
139+
$conf['amavis']['config_dir'] = '/etc';
140+
$conf['amavis']['init_script'] = 'amavis';
141+
142+
//* ClamAV
143+
$conf['clamav']['installed'] = false; // will be detected automatically during installation
144+
$conf['clamav']['init_script'] = 'clamd';
145+
146+
//* Pureftpd
147+
$conf['pureftpd']['installed'] = false; // will be detected automatically during installation
148+
$conf['pureftpd']['config_dir'] = '/etc/pure-ftpd';
149+
$conf['pureftpd']['init_script'] = 'pure-ftpd';
150+
151+
//* MyDNS
152+
$conf['mydns']['installed'] = false; // will be detected automatically during installation
153+
$conf['mydns']['config_dir'] = '/etc';
154+
$conf['mydns']['init_script'] = 'mydns';
155+
156+
//* PowerDNS
157+
$conf['powerdns']['installed'] = false; // will be detected automatically during installation
158+
$conf['powerdns']['database'] = 'powerdns';
159+
$conf["powerdns"]["config_dir"] = '/etc/powerdns/pdns.d';
160+
$conf['powerdns']['init_script'] = 'pdns';
161+
162+
//* BIND DNS Server
163+
$conf['bind']['installed'] = false; // will be detected automatically during installation
164+
$conf['bind']['bind_user'] = 'named';
165+
$conf['bind']['bind_group'] = 'named';
166+
$conf['bind']['bind_zonefiles_dir'] = '/var/lib/named';
167+
$conf['bind']['named_conf_path'] = '/etc/named.conf';
168+
$conf['bind']['named_conf_local_path'] = '/etc/named.conf.include';
169+
$conf['bind']['init_script'] = 'named';
170+
171+
//* Jailkit
172+
$conf['jailkit']['installed'] = false; // will be detected automatically during installation
173+
$conf['jailkit']['config_dir'] = '/etc/jailkit';
174+
$conf['jailkit']['jk_init'] = 'jk_init.ini';
175+
$conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini';
176+
$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico';
177+
$conf['jailkit']['jailkit_chroot_cron_programs'] = '/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php';
178+
179+
//* vlogger
180+
$conf['vlogger']['config_dir'] = '/etc';
181+
182+
//* cron
183+
$conf['cron']['init_script'] = 'cron';
184+
$conf['cron']['crontab_dir'] = '/etc/cron.d';
185+
$conf['cron']['wget'] = '/usr/bin/wget';
186+
187+
?>

‎install/dist/lib/opensuse.lib.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ public function configure_amavis() {
381381

382382
// amavisd user config file
383383
$configfile = 'opensuse_amavisd_conf';
384-
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) @copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["courier"]["config_dir"].'/amavisd.conf~');
384+
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) @copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["amavis"]["config_dir"].'/amavisd.conf~');
385385
if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf~')) exec('chmod 400 '.$conf["amavis"]["config_dir"].'/amavisd.conf~');
386386
$content = rf("tpl/".$configfile.".master");
387387
$content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content);

‎install/dist/lib/opensuse112.lib.php‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
3+
/*
4+
Copyright (c) 2007, Till Brehm, projektfarm Gmbh
5+
All rights reserved.
6+
7+
Redistribution and use in source and binary forms, with or without modification,
8+
are permitted provided that the following conditions are met:
9+
10+
* Redistributions of source code must retain the above copyright notice,
11+
this list of conditions and the following disclaimer.
12+
* Redistributions in binary form must reproduce the above copyright notice,
13+
this list of conditions and the following disclaimer in the documentation
14+
and/or other materials provided with the distribution.
15+
* Neither the name of ISPConfig nor the names of its contributors
16+
may be used to endorse or promote products derived from this software without
17+
specific prior written permission.
18+
19+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
20+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
21+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
22+
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
23+
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
24+
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
26+
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
27+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
28+
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29+
*/
30+
31+
class installer extends installer_dist {
32+
33+
34+
}
35+
36+
?>

‎install/lib/install.lib.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,14 @@ function get_distname() {
113113
swriteln("Operating System: openSUSE 11.1 or compatible\n");
114114
} elseif(stristr(file_get_contents('/etc/SuSE-release'),'11.2')) {
115115
$distname = 'openSUSE';
116-
$distver = '11.1';
117-
$distid = 'opensuse110';
116+
$distver = '11.2';
117+
$distid = 'opensuse112';
118118
$distbaseid = 'opensuse';
119119
swriteln("Operating System: openSUSE 11.2 or compatible\n");
120120
} else {
121121
$distname = 'openSUSE';
122122
$distver = 'Unknown';
123-
$distid = 'opensuse110';
123+
$distid = 'opensuse112';
124124
$distbaseid = 'opensuse';
125125
swriteln("Operating System: openSUSE or compatible, unknown version.\n");
126126
}

‎install/tpl/mysql-virtual_domains.cf.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ dbname = {mysql_server_database}
44
table = mail_domain
55
select_field = domain
66
where_field = domain
7-
additional_conditions = and active = 'y' and server_id = {server_id}
7+
additional_conditions = and active = 'y'
88
hosts = {mysql_server_ip}

‎install/tpl/mysql-virtual_email2email.cf.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ dbname = {mysql_server_database}
44
table = mail_user
55
select_field = email
66
where_field = email
7-
additional_conditions = and postfix = 'y' and server_id = {server_id}
7+
additional_conditions = and postfix = 'y'
88
hosts = {mysql_server_ip}

‎install/tpl/mysql-virtual_forwardings.cf.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ dbname = {mysql_server_database}
44
table = mail_forwarding
55
select_field = destination
66
where_field = source
7-
additional_conditions = and active = 'y' and server_id = {server_id}
7+
additional_conditions = and active = 'y'
88
hosts = {mysql_server_ip}

‎install/tpl/mysql-virtual_mailboxes.cf.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ dbname = {mysql_server_database}
44
table = mail_user
55
select_field = CONCAT(SUBSTRING_INDEX(email,'@',-1),'/',SUBSTRING_INDEX(email,'@',1),'/')
66
where_field = email
7-
additional_conditions = and postfix = 'y' and server_id = {server_id}
7+
additional_conditions = and postfix = 'y'
88
hosts = {mysql_server_ip}

‎install/tpl/mysql-virtual_recipient.cf.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ dbname = {mysql_server_database}
44
table = mail_access
55
select_field = access
66
where_field = source
7-
additional_conditions = and type = 'recipient' and active = 'y' and server_id = {server_id}
7+
additional_conditions = and type = 'recipient' and active = 'y'
88
hosts = {mysql_server_ip}

‎install/tpl/mysql-virtual_relaydomains.cf.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ dbname = {mysql_server_database}
44
table = mail_transport
55
select_field = domain
66
where_field = domain
7-
additional_conditions = and active = 'y' and server_id = {server_id}
7+
additional_conditions = and active = 'y'
88
hosts = {mysql_server_ip}

0 commit comments

Comments
 (0)