Commit c58e3f77 authored by tbrehm's avatar tbrehm
Browse files

updated installer and sql dump

parent e2d6ed95
......@@ -104,7 +104,7 @@ class installer_base {
Create postfix configuration files
*/
function configure_postfix() {
function configure_postfix($options = '';) {
global $conf;
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 @@ maildrop unix - n n - - pipe
flags=R user=vmail argv=/usr/bin/maildrop -d ${recipient} ${extension} ${recipient} ${user} ${nexthop} ${sender}
*/
if(stristr($options,'dont-create-certs') {
// Create the SSL certificate
$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";
exec($command);
// Create the SSL certificate
$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";
exec($command);
$command = "chmod o= ".$conf["dist_postfix_config_dir"]."/smtpd.key";
caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
$command = "chmod o= ".$conf["dist_postfix_config_dir"]."/smtpd.key";
caselog($command." &> /dev/null", __FILE__, __LINE__,"EXECUTED: ".$command,"Failed to execute the command ".$command);
}
/*
We have to change the permissions of the courier authdaemon directory
......
This diff is collapsed.
......@@ -91,7 +91,7 @@ foreach($db_tables as $table) {
exec("mysql -h $conf[mysql_server_host] -u $conf[mysql_server_ispconfig_user] -p$conf[mysql_server_ispconfig_password] $conf[mysql_server_database] < existing_db.sql &> /dev/null");
// Configure postfix
$inst->configure_postfix();
$inst->configure_postfix('dont-create-certs');
// Configure saslauthd
swriteln('Configuring SASL');
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment