Skip to content

Commit fa3ee6c

Browse files
author
Marius Burkard
committed
Merge branch 'develop' into 'install-strings'
# Conflicts: # server/scripts/update_from_dev_stable.sh
2 parents 89aab77 + 82f6e7b commit fa3ee6c

File tree

458 files changed

+4430
-1574
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

458 files changed

+4430
-1574
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
.DS_Store
22
/nbproject/private/
33
.phplint-cache
4+
*.swp

‎install/dist/lib/fedora.lib.php‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ function configure_postfix($options = '')
6666
//* mysql-virtual_alias_domains.cf
6767
$this->process_postfix_config('mysql-virtual_alias_domains.cf');
6868

69+
//* mysql-virtual_alias_maps.cf
70+
$this->process_postfix_config('mysql-virtual_alias_maps.cf');
71+
6972
//* mysql-virtual_mailboxes.cf
7073
$this->process_postfix_config('mysql-virtual_mailboxes.cf');
7174

@@ -121,12 +124,6 @@ function configure_postfix($options = '')
121124
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/postfix-'.$filename.'.master', 'tpl/postfix-'.$filename.'.master');
122125
wf($full_file_name, $content);
123126

124-
//* Changing mode and group of the new created config files.
125-
caselog('chmod o= '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null',
126-
__FILE__, __LINE__, 'chmod on mysql-virtual_*.cf*', 'chmod on mysql-virtual_*.cf* failed');
127-
caselog('chgrp '.$cf['group'].' '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null',
128-
__FILE__, __LINE__, 'chgrp on mysql-virtual_*.cf*', 'chgrp on mysql-virtual_*.cf* failed');
129-
130127
//* Creating virtual mail user and group
131128
$command = 'groupadd -g '.$cf['vmail_groupid'].' '.$cf['vmail_groupname'];
132129
if(!is_group($cf['vmail_groupname'])) caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
@@ -156,9 +153,16 @@ function configure_postfix($options = '')
156153
}
157154

158155
$reject_sender_login_mismatch = '';
156+
$reject_authenticated_sender_login_mismatch = '';
159157
if(isset($server_ini_array['mail']['reject_sender_login_mismatch']) && ($server_ini_array['mail']['reject_sender_login_mismatch'] == 'y')) {
160-
$reject_sender_login_mismatch = ', reject_authenticated_sender_login_mismatch';
158+
$reject_sender_login_mismatch = ', reject_sender_login_mismatch';
159+
$reject_authenticated_sender_login_mismatch = 'reject_authenticated_sender_login_mismatch, ';
161160
}
161+
162+
# placeholder includes comment char
163+
$stress_adaptive_placeholder = '#{stress_adaptive} ';
164+
$stress_adaptive = (isset($server_ini_array['mail']['stress_adaptive']) && ($server_ini_array['mail']['stress_adaptive'] == 'y')) ? '' : $stress_adaptive_placeholder;
165+
162166
unset($server_ini_array);
163167

164168
$postconf_placeholders = array('{config_dir}' => $config_dir,
@@ -168,6 +172,8 @@ function configure_postfix($options = '')
168172
'{rbl_list}' => $rbl_list,
169173
'{greylisting}' => $greylisting,
170174
'{reject_slm}' => $reject_sender_login_mismatch,
175+
'{reject_aslm}' => $reject_authenticated_sender_login_mismatch,
176+
$stress_adaptive_placeholder => $stress_adaptive,
171177
);
172178

173179
$postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_postfix.conf.master', 'tpl/fedora_postfix.conf.master');

‎install/dist/lib/gentoo.lib.php‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,16 @@ public function configure_postfix($options = '')
102102
}
103103

104104
$reject_sender_login_mismatch = '';
105+
$reject_authenticated_sender_login_mismatch = '';
105106
if(isset($server_ini_array['mail']['reject_sender_login_mismatch']) && ($server_ini_array['mail']['reject_sender_login_mismatch'] == 'y')) {
106-
$reject_sender_login_mismatch = ', reject_authenticated_sender_login_mismatch';
107+
$reject_sender_login_mismatch = ', reject_sender_login_mismatch';
108+
$reject_authenticated_sender_login_mismatch = 'reject_authenticated_sender_login_mismatch, ';
107109
}
110+
111+
# placeholder includes comment char
112+
$stress_adaptive_placeholder = '#{stress_adaptive} ';
113+
$stress_adaptive = (isset($server_ini_array['mail']['stress_adaptive']) && ($server_ini_array['mail']['stress_adaptive'] == 'y')) ? '' : $stress_adaptive_placeholder;
114+
108115
unset($server_ini_array);
109116

110117
$postconf_placeholders = array('{config_dir}' => $config_dir,
@@ -114,6 +121,8 @@ public function configure_postfix($options = '')
114121
'{rbl_list}' => $rbl_list,
115122
'{greylisting}' => $greylisting,
116123
'{reject_slm}' => $reject_sender_login_mismatch,
124+
'{reject_aslm}' => $reject_authenticated_sender_login_mismatch,
125+
$stress_adaptive_placeholder => $stress_adaptive,
117126
);
118127

119128
$postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/gentoo_postfix.conf.master', 'tpl/gentoo_postfix.conf.master');

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ function configure_postfix($options = '')
6666
//* mysql-virtual_alias_domains.cf
6767
$this->process_postfix_config('mysql-virtual_alias_domains.cf');
6868

69+
//* mysql-virtual_alias_maps.cf
70+
$this->process_postfix_config('mysql-virtual_alias_maps.cf');
71+
6972
//* mysql-virtual_mailboxes.cf
7073
$this->process_postfix_config('mysql-virtual_mailboxes.cf');
7174

@@ -118,12 +121,6 @@ function configure_postfix($options = '')
118121
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/postfix-'.$filename.'.master', 'tpl/postfix-'.$filename.'.master');
119122
wf($full_file_name, $content);
120123

121-
//* Changing mode and group of the new created config files.
122-
caselog('chmod o= '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null',
123-
__FILE__, __LINE__, 'chmod on mysql-virtual_*.cf*', 'chmod on mysql-virtual_*.cf* failed');
124-
caselog('chgrp '.$cf['group'].' '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null',
125-
__FILE__, __LINE__, 'chgrp on mysql-virtual_*.cf*', 'chgrp on mysql-virtual_*.cf* failed');
126-
127124
if(!is_dir($cf['vmail_mailbox_base'])) mkdir($cf['vmail_mailbox_base']);
128125

129126
//* Creating virtual mail user and group
@@ -167,9 +164,16 @@ function configure_postfix($options = '')
167164
}
168165

169166
$reject_sender_login_mismatch = '';
167+
$reject_authenticated_sender_login_mismatch = '';
170168
if(isset($server_ini_array['mail']['reject_sender_login_mismatch']) && ($server_ini_array['mail']['reject_sender_login_mismatch'] == 'y')) {
171-
$reject_sender_login_mismatch = ', reject_authenticated_sender_login_mismatch';
169+
$reject_sender_login_mismatch = ', reject_sender_login_mismatch';
170+
$reject_authenticated_sender_login_mismatch = 'reject_authenticated_sender_login_mismatch, ';
172171
}
172+
173+
# placeholder includes comment char
174+
$stress_adaptive_placeholder = '#{stress_adaptive} ';
175+
$stress_adaptive = (isset($server_ini_array['mail']['stress_adaptive']) && ($server_ini_array['mail']['stress_adaptive'] == 'y')) ? '' : $stress_adaptive_placeholder;
176+
173177
unset($server_ini_array);
174178

175179
$postconf_placeholders = array('{config_dir}' => $config_dir,
@@ -179,6 +183,8 @@ function configure_postfix($options = '')
179183
'{rbl_list}' => $rbl_list,
180184
'{greylisting}' => $greylisting,
181185
'{reject_slm}' => $reject_sender_login_mismatch,
186+
'{reject_aslm}' => $reject_authenticated_sender_login_mismatch,
187+
$stress_adaptive_placeholder => $stress_adaptive,
182188
);
183189

184190
$postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/opensuse_postfix.conf.master', 'tpl/opensuse_postfix.conf.master');

‎install/install.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@
150150
$retval=shell_exec("which which");
151151
if (empty($retval)) die ("ISPConfig requieres which \n");
152152

153+
$inst->check_prerequisites();
154+
153155
swriteln($inst->lng(' Following will be a few questions for primary configuration so be careful.'));
154156
swriteln($inst->lng(' Default values are in [brackets] and can be accepted with <ENTER>.'));
155157
swriteln($inst->lng(' Tap in "quit" (without the quotes) to stop the installer.'."\n\n"));
@@ -574,6 +576,12 @@
574576
$inst->install_ispconfig_interface = false;
575577
}
576578

579+
// Create SSL certs for non-webserver(s)?
580+
if(!file_exists('/usr/local/ispconfig/interface/ssl/ispserver.crt')) {
581+
if(strtolower($inst->simple_query('Do you want to create SSL certs for your server?', array('y', 'n'), 'y')) == 'y')
582+
$inst->make_ispconfig_ssl_cert();
583+
}
584+
577585
$inst->install_ispconfig();
578586

579587
//* Configure DBServer

0 commit comments

Comments
 (0)