Skip to content

Commit c58e3f7

Browse files
committed
updated installer and sql dump
1 parent e2d6ed9 commit c58e3f7

File tree

3 files changed

+90
-87
lines changed

3 files changed

+90
-87
lines changed

install/lib/installer_base.lib.php

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ function configure_database() {
104104
Create postfix configuration files
105105
*/
106106

107-
function configure_postfix() {
107+
function configure_postfix($options = '';) {
108108
global $conf;
109109

110110
if(!is_dir($conf["dist_postfix_config_dir"])) $this->error("The postfix configuration directory ".$conf["dist_postfix_config_dir"]." does not exist.");
@@ -248,13 +248,14 @@ function configure_postfix() {
248248
flags=R user=vmail argv=/usr/bin/maildrop -d ${recipient} ${extension} ${recipient} ${user} ${nexthop} ${sender}
249249
250250
*/
251+
if(stristr($options,'dont-create-certs') {
252+
// Create the SSL certificate
253+
$command = "cd ".$conf["dist_postfix_config_dir"]."; openssl req -new -outform PEM -out smtpd.cert -newkey rsa:2048 -nodes -keyout smtpd.key -keyform PEM -days 365 -x509";
254+
exec($command);
251255

252-
// Create the SSL certificate
253-
$command = "cd ".$conf["dist_postfix_config_dir"]."; openssl req -new -outform PEM -out smtpd.cert -newkey rsa:2048 -nodes -keyout smtpd.key -keyform PEM -days 365 -x509";
254-
exec($command);
255-
256-
$command = "chmod o= ".$conf["dist_postfix_config_dir"]."/smtpd.key";
257-
caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
256+
$command = "chmod o= ".$conf["dist_postfix_config_dir"]."/smtpd.key";
257+
caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
258+
}
258259

259260
/*
260261
We have to change the permissions of the courier authdaemon directory

0 commit comments

Comments
 (0)