Commit f686264a authored by Marius Burkard's avatar Marius Burkard

Merge branch 'master' into 'stable-3.1'

Master



See merge request !274
parents b8f4cacc cffef259
......@@ -177,9 +177,6 @@ $inst = new installer();
if (!$inst->get_php_version()) die('ISPConfig requieres PHP '.$inst->min_php."\n");
$inst->is_update = true;
//** Detect the installed applications
$inst->find_installed_apps();
echo "This application will update ISPConfig 3 on your server.\n\n";
//* Make a backup before we start the update
......@@ -304,6 +301,18 @@ if($reconfigure_master_database_rights_answer == 'yes') {
}
//}
//** Detect the installed applications
$inst->find_installed_apps();
$conf['services']['mail'] = $conf['postfix']['installed'];
if ($conf['powerdns']['installed'] || $conf['bind']['installed'] || $conf['mydns']['installed']) $conf['services']['dns'] = true;
if ($conf['apache']['installed'] || $conf['nginx']['installed']) $conf['services']['web'] = true;
$conf['services']['xmpp'] = $conf['xmpp']['installed'];;
if ($conf['ufw']['installed'] || $conf['firewall']['installed']) $conf['services']['firewall'] = true;
$conf['services']['vserver'] = $conf['services']['vserver'];
$conf['services']['db'] = true;
//** Shall the services be reconfigured during update
$reconfigure_services_answer = $inst->simple_query('Reconfigure Services?', array('yes', 'no', 'selected'), 'yes','reconfigure_services');
......@@ -323,12 +332,6 @@ if($reconfigure_services_answer == 'yes' || $reconfigure_services_answer == 'sel
$inst->configure_mailman('update');
}
//* Configure Jailkit
if($inst->reconfigure_app('Jailkit', $reconfigure_services_answer)) {
swriteln('Configuring Jailkit');
$inst->configure_jailkit();
}
if($conf['dovecot']['installed'] == true && $inst->reconfigure_app('Dovecot', $reconfigure_services_answer)) {
//* Configure dovecot
swriteln('Configuring Dovecot');
......@@ -407,6 +410,13 @@ if($reconfigure_services_answer == 'yes' || $reconfigure_services_answer == 'sel
swriteln('Configuring Apps vhost');
$inst->configure_apps_vhost();
}
//* Configure Jailkit
if($inst->reconfigure_app('Jailkit', $reconfigure_services_answer)) {
swriteln('Configuring Jailkit');
$inst->configure_jailkit();
}
}
if($conf['services']['xmpp'] && $inst->reconfigure_app('XMPP', $reconfigure_services_answer)) {
......
......@@ -41,7 +41,7 @@
<div class="form-group">
<label class="col-sm-2 control-label">{tmpl_var name='dmarc_fo_txt'}</label>
<div class="col-sm-3">
<div class="col-sm-1">
<input type="checkbox" value="1" id="dmarc_fo0" name="dmarc_fo0" {tmpl_var name='dmarc_fo0'}/>
</div>
<div class="col-sm-3 input-sm">
......@@ -50,7 +50,7 @@
</div>
<div class="form-group">
<label class="col-sm-2 control-label"></label>
<div class="col-sm-3">
<div class="col-sm-1">
<input type="checkbox" value="1" id="dmarc_fo0" name="dmarc_fo0" {tmpl_var name='dmarc_fo1'}/>
</div>
<div class="col-sm-3 input-sm">
......@@ -59,7 +59,7 @@
</div>
<div class="form-group">
<label class="col-sm-2 control-label"></label>
<div class="col-sm-3">
<div class="col-sm-1">
<input type="checkbox" value="1" id="dmarc_fod" name="dmarc_fod" {tmpl_var name='dmarc_fod'}/>
</div>
<div class="col-sm-3 input-sm">
......@@ -68,7 +68,7 @@
</div>
<div class="form-group">
<label class="col-sm-2 control-label"></label>
<div class="col-sm-3">
<div class="col-sm-1">
<input type="checkbox" value="1" id="dmarc_fos" name="dmarc_fos" {tmpl_var name='dmarc_fos'}/>
</div>
<div class="col-sm-3 input-sm">
......@@ -96,7 +96,7 @@
</div>
<div class="form-group">
<label class="col-sm-2 control-label">{tmpl_var name='dmarc_rf_txt'}</label>
<div class="col-sm-3">
<div class="col-sm-1">
<input type="checkbox" value="1" id="dmarc_rf_afrf" name="dmarc_fo0" {tmpl_var name='dmarc_rf_afrf'}/>
</div>
<div class="col-sm-3 input-sm">
......@@ -104,8 +104,8 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label"></label>
<div class="col-sm-3">
<label class="col-sm-2 control-label">{tmpl_var name='dmarc_rf_iodef'}</label>
<div class="col-sm-1">
<input type="checkbox" value="1" id="dmarc_rf_iodef" name="dmarc_rf_iodef" {tmpl_var name='dmarc_rf_iodef'}/>
</div>
<div class="col-sm-3 input-sm">
......
Markdown is supported
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