Commit a75c8169 authored by Florian Schaal's avatar Florian Schaal
Browse files

shows warning for missing services during install (and allows force-configure...

shows warning for missing services during install (and allows force-configure for missing / not detected services)
parent 13a336cf
...@@ -218,141 +218,235 @@ include_once 'lib/mysql.lib.php'; ...@@ -218,141 +218,235 @@ include_once 'lib/mysql.lib.php';
$inst->db = new db(); $inst->db = new db();
//** Begin with standard or expert installation //** Begin with standard or expert installation
$conf['services']['mail'] = false;
$conf['services']['web'] = false;
$conf['services']['dns'] = false;
$conf['services']['file'] = false;
$conf['services']['db'] = true;
$conf['services']['vserver'] = false;
$conf['services']['firewall'] = false;
$conf['services']['proxy'] = false;
$conf['services']['xmpp'] = false;
if($install_mode == 'standard') { if($install_mode == 'standard') {
//* Create the MySQL database //* Create the MySQL database
$inst->configure_database(); $inst->configure_database();
//* Configure Webserver - Apache or nginx
if($conf['apache']['installed'] == true && $conf['nginx']['installed'] == true) {
$http_server_to_use = $inst->simple_query('Apache and nginx detected. Select server to use for ISPConfig:', array('apache', 'nginx'), 'apache','http_server');
if($http_server_to_use == 'apache'){
$conf['nginx']['installed'] = false;
} else {
$conf['apache']['installed'] = false;
}
}
//* Insert the Server record into the database //* Insert the Server record into the database
$inst->add_database_server_record(); $inst->add_database_server_record();
//* Configure Postfix //* Configure Postgrey
$inst->configure_postfix(); $force = @($conf['postgrey']['installed']) ? true : $inst->force_configure_app('Postgrey');
if($force) swriteln('Configuring Postgrey');
//* Configure Mailman //* Configure Postfix
if($conf['mailman']['installed'] == true) { $force = @($conf['postfix']['installed']) ? true : $inst->force_configure_app('Postfix');
$inst->configure_mailman('install'); if($force) {
swriteln('Configuring Postfix');
$inst->configure_postfix();
$conf['services']['mail'] = true;
} }
//* Configure jailkit if($conf['services']['mail']) {
swriteln('Configuring Jailkit');
$inst->configure_jailkit();
if($conf['dovecot']['installed'] == true) { //* Configure Mailman
$force = @($conf['mailman']['installed']) ? true : $inst->force_configure_app('Mailman');
if($force) {
swriteln('Configuring Mailman');
$inst->configure_mailman();
}
//* Check for Dovecot and Courier
if(!$conf['dovecot']['installed'] && !$conf['courier']['installed']) {
$conf['dovecot']['installed'] = @($conf['dovecot']['installed']) ? false : $inst->force_configure_app('Dovecot');
$conf['courier']['installed'] = @($conf['couier']['installed']) ? false : $inst->force_configure_app('Courier');
}
//* Configure Mailserver - Dovecot or Courier
if($conf['dovecot']['installed'] && $conf['courier']['installed']) {
$mail_server_to_use = $inst->simple_query('Dovecot and Courier detected. Select server to use with ISPConfig:', array('dovecot', 'courier'), 'dovecot','mail_server');
if($mail_server_to_use == 'dovecot'){
$conf['courier']['installed'] = false;
} else {
$conf['dovecot']['installed'] = false;
}
}
//* Configure Dovecot //* Configure Dovecot
swriteln('Configuring Dovecot'); if($conf['dovecot']['installed']) {
$inst->configure_dovecot(); swriteln('Configuring Dovecot');
} else { $inst->configure_dovecot();
//* Configure saslauthd }
swriteln('Configuring SASL');
$inst->configure_saslauthd();
//* Configure PAM
swriteln('Configuring PAM');
$inst->configure_pam();
//* Configure Courier //* Configure Courier
swriteln('Configuring Courier'); if($conf['courier']['installed']) {
$inst->configure_courier(); swriteln('Configuring Courier');
} $inst->configure_courier();
swriteln('Configuring SASL');
$inst->configure_saslauthd();
swriteln('Configuring PAM');
$inst->configure_pam();
}
//* Configure Spamasassin //* Configure Spamasassin
swriteln('Configuring Spamassassin'); $force = @($conf['spamassassin']['installed']) ? true : $inst->force_configure_app('Spamassassin');
$inst->configure_spamassassin(); if($force) {
swriteln('Configuring Spamassassin');
$inst->configure_spamassassin();
}
//* Configure Amavis
$force = @($conf['amavis']['installed']) ? true : $inst->force_configure_app('Amavisd');
if($force) {
swriteln('Configuring Amavisd');
$inst->configure_amavis();
}
//* Configure Amavis //* Configure Getmail
if($conf['amavis']['installed'] == true) { $force = @($conf['getmail']['installed']) ? true : $inst->force_configure_app('Getmail');
swriteln('Configuring Amavisd'); if($force) {
$inst->configure_amavis(); swriteln('Configuring Getmail');
} $inst->configure_getmail();
}
//* Configure Getmail } else swriteln('[ERROR] Postfix not installed - skipping Mail');
swriteln('Configuring Getmail');
$inst->configure_getmail();
//* Configure Pureftpd //* Check for DNS
swriteln('Configuring Pureftpd'); if(!$conf['powerdns']['installed'] && !$conf['bind']['installed'] && !$conf['mydns']['installed']) {
$inst->configure_pureftpd(); $conf['powerdns']['installed'] = $inst->force_configure_app('PowerDNS');
$conf['bind']['installed'] = $inst->force_configure_app('BIND');
//* Configure DNS $conf['mydns']['installed'] = $inst->force_configure_app('MyDNS');
if($conf['powerdns']['installed'] == true) { }
//* Configure PowerDNS
if($conf['powerdns']['installed']) {
swriteln('Configuring PowerDNS'); swriteln('Configuring PowerDNS');
$inst->configure_powerdns(); $inst->configure_powerdns();
} elseif($conf['bind']['installed'] == true) { $conf['services']['dns'] = true;
}
//* Configure Bind
if($conf['bind']['installed']) {
swriteln('Configuring BIND'); swriteln('Configuring BIND');
$inst->configure_bind(); $inst->configure_bind();
} else { $conf['services']['dns'] = true;
}
//* Configure MyDNS
if($conf['mydns']['installed']) {
swriteln('Configuring MyDNS'); swriteln('Configuring MyDNS');
$inst->configure_mydns(); $inst->configure_mydns();
$conf['services']['dns'] = true;
}
//* Configure Jailkit
$force = @($conf['jailkit']['installed']) ? true : $inst->force_configure_app('Jailkit');
if($force) {
swriteln('Configuring Jailkit');
$inst->configure_jailkit();
}
//* Configure Pureftpd
$force = @($conf['pureftpd']['installed']) ? true : $inst->force_configure_app('pureftpd');
if($force) {
swriteln('Configuring Pureftpd');
$inst->configure_pureftpd();
}
//* Check for Web-Server
if(!$conf['apache']['installed'] && !$conf['nginx']['installed']) {
$conf['apache']['installed'] = $inst->force_configure_app('Apache');
$conf['nginx']['installed'] = $inst->force_configure_app('nginx');
}
//* Configure Webserver - Apache or nginx
if($conf['apache']['installed'] && $conf['nginx']['installed']) {
$http_server_to_use = $inst->simple_query('Apache and nginx detected. Select server to use for ISPConfig:', array('apache', 'nginx'), 'apache','http_server');
if($http_server_to_use == 'apache'){
$conf['nginx']['installed'] = false;
} else {
$conf['apache']['installed'] = false;
}
} }
//* Configure Apache //* Configure Apache
if($conf['apache']['installed'] == true){ if($conf['apache']['installed']){
swriteln('Configuring Apache'); swriteln('Configuring Apache');
$inst->configure_apache(); $inst->configure_apache();
$conf['services']['web'] = true;
$conf['services']['file'] = true;
//* Configure Vlogger
$force = @($conf['vlogger']['installed']) ? true : $inst->force_configure_app('vlogger');
if($force) {
swriteln('Configuring vlogger');
$inst->configure_vlogger();
}
//* Configure squid
/*
$force = @($conf['squid']['installed']) ? true : $inst->force_configure_app('squid');
if($force) {
swriteln('Configuring Squid');
$inst->configure_squid();
$conf['services']['proxy'] = true;
}
*/
} }
//* Configure nginx //* Configure nginx
if($conf['nginx']['installed'] == true){ if($conf['nginx']['installed']){
swriteln('Configuring nginx'); swriteln('Configuring nginx');
$inst->configure_nginx(); $inst->configure_nginx();
$conf['services']['web'] = true;
} }
//** Configure Vlogger //* Configure XMPP
swriteln('Configuring Vlogger'); $force = @($conf['xmpp']['installed']) ? true : $inst->force_configure_app('Metronome XMPP Server');
$inst->configure_vlogger(); if($force) {
swriteln('Configuring Metronome XMPP Server');
//** Configure apps vhost $inst->configure_xmpp();
swriteln('Configuring Apps vhost'); $conf['services']['xmpp'] = true;
$inst->configure_apps_vhost(); }
//* Configure Firewall //* Check for Firewall
if($conf['ufw']['installed'] == true) { if(!$conf['ufw']['installed'] && !$conf['firewall']['installed']) {
//* Configure Ubuntu Firewall $conf['ufw']['installed'] = $inst->force_configure_app('Ubuntu Firewall');
$conf['services']['firewall'] = true; $conf['firewall']['installed'] = $inst->force_configure_app('Bastille Firewall');
}
//* Configure Firewall - Ubuntu or Bastille
if($conf['ufw']['installed'] && $conf['firewall']['installed']) {
$firewall_to_use = $inst->simple_query('Ubuntu and Bastille Firewall detected. Select firewall to use with ISPConfig:', array('bastille', 'ubuntu'), 'bastille','firewall_server');
if($firewall_to_use == 'bastille'){
$conf['ufw']['installed'] = false;
} else {
$conf['firewall']['installed'] = false;
}
}
//* Configure Ubuntu Firewall
if($conf['ufw']['installed']){
swriteln('Configuring Ubuntu Firewall'); swriteln('Configuring Ubuntu Firewall');
$inst->configure_ufw_firewall(); $inst->configure_ufw_firewall();
} else {
//* Configure Bastille Firewall
$conf['services']['firewall'] = true; $conf['services']['firewall'] = true;
}
//* Configure Bastille Firewall
if($conf['firewall']['installed']){
swriteln('Configuring Bastille Firewall'); swriteln('Configuring Bastille Firewall');
$inst->configure_bastille_firewall(); $inst->configure_bastille_firewall();
$conf['services']['firewall'] = true;
} }
//* Configure Fail2ban //* Configure Fail2ban
if($conf['fail2ban']['installed'] == true) { $force = @($conf['fail2ban']['installed']) ? true : $inst->force_configure_app('Fail2ban');
if($force) {
swriteln('Configuring Fail2ban'); swriteln('Configuring Fail2ban');
$inst->configure_fail2ban(); $inst->configure_fail2ban();
} }
/* //* Configure OpenVZ
if($conf['squid']['installed'] == true) { $force = @($conf['openvz']['installed']) ? true : $inst->force_configure_app('OpenVZ');
$conf['services']['proxy'] = true; if($force) {
swriteln('Configuring Squid'); $conf['services']['vserver'] = true;
$inst->configure_squid(); swriteln('Configuring OpenVZ');
} else if($conf['nginx']['installed'] == true) {
$conf['services']['proxy'] = true;
swriteln('Configuring Nginx');
$inst->configure_nginx();
} }
*/
//* Configure XMPP //** Configure apps vhost
if($conf['xmpp']['installed'] == true){ swriteln('Configuring Apps vhost');
$conf['services']['xmpp'] = true; $inst->configure_apps_vhost();
swriteln('Configuring Metronome XMPP Server');
$inst->configure_xmpp();
}
//* Configure ISPConfig //* Configure ISPConfig
swriteln('Installing ISPConfig'); swriteln('Installing ISPConfig');
...@@ -374,8 +468,10 @@ if($install_mode == 'standard') { ...@@ -374,8 +468,10 @@ if($install_mode == 'standard') {
$inst->configure_dbserver(); $inst->configure_dbserver();
//* Configure ISPConfig //* Configure ISPConfig
swriteln('Installing ISPConfig crontab'); if($conf['cron']['installed']) {
$inst->install_crontab(); swriteln('Installing ISPConfig crontab');
$inst->install_crontab();
} else swriteln('[ERROR] Cron not found');
swriteln('Restarting services ...'); swriteln('Restarting services ...');
if($conf['mysql']['installed'] == true && $conf['mysql']['init_script'] != '') system($inst->getinitcommand($conf['mysql']['init_script'], 'restart').' >/dev/null 2>&1'); if($conf['mysql']['installed'] == true && $conf['mysql']['init_script'] != '') system($inst->getinitcommand($conf['mysql']['init_script'], 'restart').' >/dev/null 2>&1');
...@@ -407,17 +503,7 @@ if($install_mode == 'standard') { ...@@ -407,17 +503,7 @@ if($install_mode == 'standard') {
if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '') system($inst->getinitcommand($conf['ufw']['init_script'], 'restart').' &> /dev/null'); if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '') system($inst->getinitcommand($conf['ufw']['init_script'], 'restart').' &> /dev/null');
if($conf['xmpp']['installed'] == true && $conf['xmpp']['init_script'] != '') system($inst->getinitcommand($conf['xmpp']['init_script'], 'restart').' &> /dev/null'); if($conf['xmpp']['installed'] == true && $conf['xmpp']['init_script'] != '') system($inst->getinitcommand($conf['xmpp']['init_script'], 'restart').' &> /dev/null');
} else { } else { //* expert mode
//* In expert mode, we select the services in the following steps, only db is always available
$conf['services']['mail'] = false;
$conf['services']['web'] = false;
$conf['services']['dns'] = false;
$conf['services']['db'] = true;
$conf['services']['firewall'] = false;
$conf['services']['proxy'] = false;
$conf['services']['xmpp'] = false;
//** Get Server ID //** Get Server ID
// $conf['server_id'] = $inst->free_query('Unique Numeric ID of the server','1'); // $conf['server_id'] = $inst->free_query('Unique Numeric ID of the server','1');
...@@ -460,11 +546,17 @@ if($install_mode == 'standard') { ...@@ -460,11 +546,17 @@ if($install_mode == 'standard') {
//* Create the mysql database //* Create the mysql database
$inst->configure_database(); $inst->configure_database();
//* Check for Web-Server
if($conf['apache']['installed'] != true && $conf['nginx']['installed'] != true) {
$conf['apache']['installed'] = $inst->force_configure_app('Apache');
$conf['nginx']['installed'] = $inst->force_configure_app('nginx');
}
//* Configure Webserver - Apache or nginx //* Configure Webserver - Apache or nginx
if($conf['apache']['installed'] == true && $conf['nginx']['installed'] == true) { if($conf['apache']['installed'] == true && $conf['nginx']['installed'] == true) {
$http_server_to_use = $inst->simple_query('Apache and nginx detected. Select server to use for ISPConfig:', array('apache', 'nginx'), 'apache','http_server'); $http_server_to_use = $inst->simple_query('Apache and nginx detected. Select server to use for ISPConfig:', array('apache', 'nginx'), 'apache','http_server');
if($http_server_to_use == 'apache'){ if($http_server_to_use == 'apache'){
$conf['nginx']['installed'] = false; $conf['nginx']['installed'] = false;
$conf['services']['file'] = true;
} else { } else {
$conf['apache']['installed'] = false; $conf['apache']['installed'] = false;
} }
...@@ -479,44 +571,73 @@ if($install_mode == 'standard') { ...@@ -479,44 +571,73 @@ if($install_mode == 'standard') {
$conf['services']['mail'] = true; $conf['services']['mail'] = true;
//* Configure Postgrey
$force = @($conf['postgrey']['installed']) ? true : $inst->force_configure_app('Postgrey');
if($force) swriteln('Configuring Postgrey');
//* Configure Postfix //* Configure Postfix
swriteln('Configuring Postfix'); $force = @($conf['postfix']['installed']) ? true : $inst->force_configure_app('Postfix');
$inst->configure_postfix(); if($force) {
swriteln('Configuring Postfix');
$inst->configure_postfix();
}
//* Configure Mailman //* Configure Mailman
swriteln('Configuring Mailman'); $force = @($conf['mailman']['installed']) ? true : $inst->force_configure_app('Mailman');
$inst->configure_mailman(); if($force) {
swriteln('Configuring Mailman');
$inst->configure_mailman();
}
if($conf['dovecot']['installed'] == true) { //* Check for Dovecot and Courier
//* Configure dovecot if(!$conf['dovecot']['installed'] && !$conf['courier']['installed']) {
$conf['dovecot']['installed'] = @($conf['dovecot']['installed']) ? false : $inst->force_configure_app('Dovecot');
$conf['courier']['installed'] = @($conf['couier']['installed']) ? false : $inst->force_configure_app('Courier');
}
//* Configure Mailserver - Dovecot or Courier
if($conf['dovecot']['installed'] && $conf['courier']['installed']) {
$mail_server_to_use = $inst->simple_query('Dovecot and Courier detected. Select server to use with ISPConfig:', array('dovecot', 'courier'), 'dovecot','mail_server');
if($mail_server_to_use == 'dovecot'){
$conf['courier']['installed'] = false;
} else {
$conf['dovecot']['installed'] = false;
}
}
//* Configure Dovecot
if($conf['dovecot']['installed']) {
swriteln('Configuring Dovecot'); swriteln('Configuring Dovecot');
$inst->configure_dovecot(); $inst->configure_dovecot();
} else { }
//* Configure Courier
//* Configure saslauthd if($conf['courier']['installed']) {
swriteln('Configuring Courier');
$inst->configure_courier();
swriteln('Configuring SASL'); swriteln('Configuring SASL');
$inst->configure_saslauthd(); $inst->configure_saslauthd();
//* Configure PAM
swriteln('Configuring PAM'); swriteln('Configuring PAM');
$inst->configure_pam(); $inst->configure_pam();
//* Configure courier
swriteln('Configuring Courier');
$inst->configure_courier();
} }
//* Configure Spamasassin //* Configure Spamasassin
swriteln('Configuring Spamassassin'); $force = @($conf['spamassassin']['installed']) ? true : $inst->force_configure_app('Spamassassin');
$inst->configure_spamassassin(); if($force) {
swriteln('Configuring Spamassassin');
$inst->configure_spamassassin();
}
//* Configure Amavis //* Configure Amavis
swriteln('Configuring Amavisd'); $force = @($conf['amavis']['installed']) ? true : $inst->force_configure_app('Amavisd');
$inst->configure_amavis(); if($force) {
swriteln('Configuring Amavisd');
$inst->configure_amavis();
}
//* Configure Getmail //* Configure Getmail
swriteln('Configuring Getmail'); $force = @($conf['getmail']['installed']) ? true : $inst->force_configure_app('Getmail');
$inst->configure_getmail(); if($force) {
swriteln('Configuring Getmail');
$inst->configure_getmail();
}
if($conf['postfix']['installed'] == true && $conf['postfix']['init_script'] != '') system($inst->getinitcommand($conf['postfix']['init_script'], 'restart')); if($conf['postfix']['installed'] == true && $conf['postfix']['init_script'] != '') system($inst->getinitcommand($conf['postfix']['init_script'], 'restart'));
if($conf['saslauthd']['installed'] == true && $conf['saslauthd']['init_script'] != '') system($inst->getinitcommand($conf['saslauthd']['init_script'], 'restart')); if($conf['saslauthd']['installed'] == true && $conf['saslauthd']['init_script'] != '') system($inst->getinitcommand($conf['saslauthd']['init_script'], 'restart'));
...@@ -533,122 +654,122 @@ if($install_mode == 'standard') { ...@@ -533,122 +654,122 @@ if($install_mode == 'standard') {
if($conf['mailman']['installed'] == true && $conf['mailman']['init_script'] != '') system('nohup '.$inst->getinitcommand($conf['mailman']['init_script'], 'restart').' >/dev/null 2>&1 &'); if($conf['mailman']['installed'] == true && $conf['mailman']['init_script'] != '') system('nohup '.$inst->getinitcommand($conf['mailman']['init_script'], 'restart').' >/dev/null 2>&1 &');
} }
//** Configure Jailkit //* Configure Jailkit
if(strtolower($inst->simple_query('Configure Jailkit', array('y', 'n'), 'y','configure_jailkit') ) == 'y') { $force = @($conf['jailkit']['installed']) ? true : $inst->force_configure_app('Jailkit');
if($force) {
swriteln('Configuring Jailkit'); swriteln('Configuring Jailkit');
$inst->configure_jailkit(); $inst->configure_jailkit();
} }
//** Configure Pureftpd //* Configure Pureftpd
if(strtolower($inst->simple_query('Configure FTP Server', array('y', 'n'), 'y','configure_ftp') ) == 'y') { $force = @($conf['pureftpd']['installed']) ? true : $inst->force_configure_app('pureftpd');
if($force) {
swriteln('Configuring Pureftpd'); swriteln('Configuring Pureftpd');
$inst->configure_pureftpd(); $inst->configure_pureftpd();
if($conf['pureftpd']['installed'] == true && $conf['pureftpd']['init_script'] != '') system($inst->getinitcommand($conf['pureftpd']['init_script'], 'restart'));
} }
//** Configure DNS //** Configure DNS
if(strtolower($inst->simple_query('Configure DNS Server', array('y', 'n'), 'y','configure_dns')) == 'y') { if(strtolower($inst->simple_query('Configure DNS Server', array('y', 'n'), 'y','configure_dns')) == 'y') {
$conf['services']['dns'] = true; $conf['services']['dns'] = true;
//* Configure DNS
if($conf['powerdns']['installed'] == true) { //* Check for DNS
if(!$conf['powerdns']['installed'] && !$conf['bind']['installed'] && !$conf['mydns']['installed']) {
$conf['powerdns']['installed'] = $inst->force_configure_app('PowerDNS');
$conf['bind']['installed'] = $inst->force_configure_app('BIND');
$conf['mydns']['installed'] = $inst->force_configure_app('MyDNS');
}
//* Configure PowerDNS
if($conf['powerdns']['installed']) {
swriteln('Configuring PowerDNS'); swriteln('Configuring PowerDNS');
$inst->configure_powerdns(); $inst->configure_powerdns();
if($conf['powerdns']['init_script'] != '') system($inst->getinitcommand($conf['powerdns']['init_script'], 'restart').' &> /dev/null'); $conf['services']['dns'] = true;
} elseif($conf['bind']['installed'] == true) { }
//* Configure Bind
if($conf['bind']['installed']) {
swriteln('Configuring BIND'); swriteln('Configuring BIND');
$inst->configure_bind(); $inst->configure_bind();
if($conf['bind']['init_script'] != '') system($inst->getinitcommand($conf['bind']['init_script'], 'restart').' &> /dev/null'); $conf['services']['dns'] = true;
} else { }
//* Configure MyDNS
if($conf['mydns']['installed']) {
swriteln('Configuring MyDNS'); swriteln('Configuring MyDNS');
$inst->configure_mydns(); $inst->configure_mydns();
if($conf['mydns']['init_script'] != '') system($inst->getinitcommand($conf['mydns']['init_script'], 'restart').' &> /dev/null'); $conf['services']['dns'] = true;
} }
} }