From b1a6a5a3991cec5cd08873b01376e45d0b247f18 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 14 Nov 2013 09:05:33 -0500
Subject: [PATCH] Cleaning up code to match coding guidelines
---
install/dist/lib/gentoo.lib.php | 625 ++++++++++++++++++++++++++++----------------------------
1 files changed, 314 insertions(+), 311 deletions(-)
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index 60cadad..99670ee 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -28,47 +28,47 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-class installer extends installer_base
+class installer extends installer_base
{
public function configure_jailkit()
- {
- global $conf;
-
+ {
+ global $conf;
+
if (is_dir($conf['jailkit']['config_dir']))
{
$jkinit_content = $this->get_template_file($conf['jailkit']['jk_init'], true); //* get contents
$this->write_config_file($conf['jailkit']['config_dir'] . '/' . $conf['jailkit']['jk_init'], $jkinit_content);
-
+
$jkchroot_content = $this->get_template_file($conf['jailkit']['jk_chrootsh'], true); //* get contents
$this->write_config_file($conf['jailkit']['config_dir'] . '/' . $conf['jailkit']['jk_chrootsh'], $jkchroot_content);
}
-
+
$command = 'chown root:root /var/www';
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
- }
-
+ }
+
public function configure_postfix($options = '')
- {
- global $conf;
-
- $cf = $conf['postfix'];
+ {
+ global $conf;
+
+ $cf = $conf['postfix'];
$config_dir = $cf['config_dir'];
-
+
if(!is_dir($config_dir)){
- $this->error("The postfix configuration directory '$config_dir' does not exist.");
- }
-
- //* Install virtual mappings
- foreach (glob('tpl/mysql-virtual_*.master') as $filename) {
- $this->process_postfix_config( basename($filename, '.master') );
- }
-
+ $this->error("The postfix configuration directory '$config_dir' does not exist.");
+ }
+
+ //* Install virtual mappings
+ foreach (glob('tpl/mysql-virtual_*.master') as $filename) {
+ $this->process_postfix_config( basename($filename, '.master') );
+ }
+
//* Changing mode and group of the new created config files.
caselog('chmod o= '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null',
- __FILE__, __LINE__, 'chmod on mysql-virtual_*.cf*', 'chmod on mysql-virtual_*.cf* failed');
- caselog('chgrp '.$cf['group'].' '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null',
- __FILE__, __LINE__, 'chgrp on mysql-virtual_*.cf*', 'chgrp on mysql-virtual_*.cf* failed');
-
+ __FILE__, __LINE__, 'chmod on mysql-virtual_*.cf*', 'chmod on mysql-virtual_*.cf* failed');
+ caselog('chgrp '.$cf['group'].' '.$config_dir.'/mysql-virtual_*.cf* &> /dev/null',
+ __FILE__, __LINE__, 'chgrp on mysql-virtual_*.cf*', 'chgrp on mysql-virtual_*.cf* failed');
+
//* Creating virtual mail user and group
$command = 'groupadd -g '.$cf['vmail_groupid'].' '.$cf['vmail_groupname'];
if (!is_group($cf['vmail_groupname'])) {
@@ -77,81 +77,81 @@
$command = 'useradd -g '.$cf['vmail_groupname'].' -u '.$cf['vmail_userid'].' '.$cf['vmail_username'].' -d '.$cf['vmail_mailbox_base'].' -m';
if (!is_user($cf['vmail_username'])) {
- caselog("$command &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
+ caselog("$command &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
}
//* These postconf commands will be executed on installation and update
- $postconf_placeholders = array('{config_dir}' => $config_dir,
- '{vmail_mailbox_base}' => $cf['vmail_mailbox_base'],
- '{vmail_userid}' => $cf['vmail_userid'],
- '{vmail_groupid}' => $cf['vmail_groupid'],
- '{rbl_list}' => $rbl_list);
-
- $postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/gentoo_postfix.conf.master', 'tpl/gentoo_postfix.conf.master');
- $postconf_tpl = strtr($postconf_tpl, $postconf_placeholders);
- $postconf_commands = array_filter(explode("\n", $postconf_tpl)); // read and remove empty lines
-
+ $postconf_placeholders = array('{config_dir}' => $config_dir,
+ '{vmail_mailbox_base}' => $cf['vmail_mailbox_base'],
+ '{vmail_userid}' => $cf['vmail_userid'],
+ '{vmail_groupid}' => $cf['vmail_groupid'],
+ '{rbl_list}' => $rbl_list);
+
+ $postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/gentoo_postfix.conf.master', 'tpl/gentoo_postfix.conf.master');
+ $postconf_tpl = strtr($postconf_tpl, $postconf_placeholders);
+ $postconf_commands = array_filter(explode("\n", $postconf_tpl)); // read and remove empty lines
+
//* These postconf commands will be executed on installation only
if($this->is_update == false) {
- $postconf_commands = array_merge($postconf_commands,array(
- 'myhostname = '.$conf['hostname'],
- 'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain',
- 'mynetworks = 127.0.0.0/8 [::1]/128'
- ));
+ $postconf_commands = array_merge($postconf_commands, array(
+ 'myhostname = '.$conf['hostname'],
+ 'mydestination = '.$conf['hostname'].', localhost, localhost.localdomain',
+ 'mynetworks = 127.0.0.0/8 [::1]/128'
+ ));
}
-
+
//* Create the header and body check files
touch($config_dir.'/header_checks');
touch($config_dir.'/mime_header_checks');
touch($config_dir.'/nested_header_checks');
touch($config_dir.'/body_checks');
-
-
+
+
//* Make a backup copy of the main.cf file
copy($config_dir.'/main.cf', $config_dir.'/main.cf~');
-
+
//* Executing the postconf commands
foreach($postconf_commands as $cmd) {
$command = "postconf -e '$cmd'";
caselog($command.' &> /dev/null', __FILE__, __LINE__, 'EXECUTED: '.$command, 'Failed to execute the command '.$command);
}
-
+
//* Create the SSL certificate
- if (!stristr($options,'dont-create-certs'))
+ if (!stristr($options, 'dont-create-certs'))
{
$command = 'cd '.$config_dir.'; '
- .'openssl req -new -outform PEM -out smtpd.cert -newkey rsa:2048 -nodes -keyout smtpd.key -keyform PEM -days 365 -x509';
+ .'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= '.$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 to make it accessible for maildrop.
$command = 'chmod 755 /var/lib/courier/authdaemon/';
if (is_dir('/var/lib/courier/authdaemon')) {
caselog($command.' &> /dev/null', __FILE__, __LINE__, 'EXECUTED: '.$command, 'Failed to execute the command '.$command);
}
-
+
//* Changing maildrop lines in posfix master.cf
$configfile = $config_dir.'/master.cf';
$content = rf($configfile);
- $content = preg_replace('/^#?maildrop/m', 'maildrop', $content);
- $content = preg_replace('/^#?(\s+)flags=DRhu user=vmail argv=\/usr\/bin\/maildrop -d/m',
- '$1flags=DRhu user=vmail argv=/usr/bin/maildrop -d vmail \${extension} \${recipient} \${user} \${nexthop} \${sender}',
- $content);
-
+ $content = preg_replace('/^#?maildrop/m', 'maildrop', $content);
+ $content = preg_replace('/^#?(\s+)flags=DRhu user=vmail argv=\/usr\/bin\/maildrop -d/m',
+ '$1flags=DRhu user=vmail argv=/usr/bin/maildrop -d vmail \${extension} \${recipient} \${user} \${nexthop} \${sender}',
+ $content);
+
$this->write_config_file($configfile, $content);
-
+
//* Writing the Maildrop mailfilter file
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/mailfilter.master', 'tpl/mailfilter.master');
$content = str_replace('{dist_postfix_vmail_mailbox_base}', $cf['vmail_mailbox_base'], $content);
-
+
$this->write_config_file($cf['vmail_mailbox_base'].'/.mailfilter', $content);
-
+
//* Create the directory for the custom mailfilters
- if (!is_dir($cf['vmail_mailbox_base'].'/mailfilters'))
+ if (!is_dir($cf['vmail_mailbox_base'].'/mailfilters'))
{
$command = 'mkdir '.$cf['vmail_mailbox_base'].'/mailfilters';
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
@@ -161,127 +161,127 @@
$full_file_name=$config_dir.'/tag_as_originating.re';
if(is_file($full_file_name)) {
copy($full_file_name, $config_dir.$configfile.'~');
- }
- $this->write_config_file($full_file_name,'/^/ FILTER amavis:[127.0.0.1]:10026');
+ }
+ $this->write_config_file($full_file_name, '/^/ FILTER amavis:[127.0.0.1]:10026');
- $full_file_name=$config_dir.'/tag_as_foreign.re';
- if(is_file($full_file_name)) {
- copy($full_file_name, $config_dir.$configfile.'~');
- }
- $this->write_config_file($full_file_name,'/^/ FILTER amavis:[127.0.0.1]:10024');
-
+ $full_file_name=$config_dir.'/tag_as_foreign.re';
+ if(is_file($full_file_name)) {
+ copy($full_file_name, $config_dir.$configfile.'~');
+ }
+ $this->write_config_file($full_file_name, '/^/ FILTER amavis:[127.0.0.1]:10024');
+
//* Chmod and chown the .mailfilter file
$command = 'chown -R '.$cf['vmail_username'].':'.$cf['vmail_groupname'].' '.$cf['vmail_mailbox_base'].'/.mailfilter';
caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
-
+
$command = 'chmod -R 600 '.$cf['vmail_mailbox_base'].'/.mailfilter';
caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
-
+
}
-
- public function configure_saslauthd()
+
+ public function configure_saslauthd()
{
global $conf;
-
+
$content = $this->get_template_file('sasl_smtpd.conf', true, true); //* get contents & insert db cred
$this->write_config_file($conf['saslauthd']['config_dir'].'/smtpd.conf', $content);
-
+
//* Edit the file saslauthd config file
$content = rf($conf['saslauthd']['config_file']);
$content = preg_replace('/(?<=\n)SASLAUTHD_OPTS="\$\{SASLAUTHD_OPTS\}[^"]+"/', 'SASLAUTHD_OPTS="${SASLAUTHD_OPTS} -a pam -r -c -s 128 -t 30 -n 5"', $content);
-
+
$this->write_config_file($conf['saslauthd']['config_file'], $content);
}
-
+
public function configure_courier()
- {
- global $conf;
-
+ {
+ global $conf;
+
//* authmysqlrc
$content = $this->get_template_file('authmysqlrc', true, true); //* get contents & insert db cred
$this->write_config_file($conf['courier']['config_dir'].'/authmysqlrc', $content);
-
+
//* authdaemonrc
$configfile = $conf['courier']['config_dir'].'/authdaemonrc';
$content = rf($configfile);
$content = preg_replace('/(?<=\n)authmodulelist="[^"]+"/', "authmodulelist=\"authmysql\"", $content);
$this->write_config_file($configfile, $content);
-
+
//* create certificates
$command = 'mkimapdcert';
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
-
+
$command = 'mkpop3dcert';
caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
- }
-
- public function configure_dovecot()
- {
- global $conf;
-
- $config_dir = $conf['dovecot']['config_dir'];
-
- $configfile = $conf['postfix']['config_dir'].'/master.cf';
-
- if(is_file($configfile)) {
+ }
+
+ public function configure_dovecot()
+ {
+ global $conf;
+
+ $config_dir = $conf['dovecot']['config_dir'];
+
+ $configfile = $conf['postfix']['config_dir'].'/master.cf';
+
+ if(is_file($configfile)) {
copy($configfile, $configfile.'~2');
}
if(is_file($configfile.'~2')) {
chmod($configfile.'~2', 0400);
}
-
- //* Configure master.cf and add a line for deliver
+
+ //* Configure master.cf and add a line for deliver
$content = rf($configfile);
-
- if(!stristr($content,'dovecot/deliver')) {
+
+ if(!stristr($content, 'dovecot/deliver')) {
$deliver_content = 'dovecot unix - n n - - pipe'."\n".' flags=DROhu user=vmail:vmail argv=/usr/libexec/dovecot/deliver -f ${sender} -d ${user}@${nexthop}';
- af($conf['postfix']['config_dir'].'/master.cf',$deliver_content);
+ af($conf['postfix']['config_dir'].'/master.cf', $deliver_content);
}
unset($content);
unset($deliver_content);
unset($configfile);
-
+
//* Reconfigure postfix to use dovecot authentication
$postconf_commands = array (
- 'dovecot_destination_recipient_limit = 1',
- 'virtual_transport = dovecot',
- 'smtpd_sasl_type = dovecot',
- 'smtpd_sasl_path = private/auth'
+ 'dovecot_destination_recipient_limit = 1',
+ 'virtual_transport = dovecot',
+ 'smtpd_sasl_type = dovecot',
+ 'smtpd_sasl_path = private/auth'
);
-
+
//* Make a backup copy of the main.cf file
- copy($conf['postfix']['config_dir'].'/main.cf',$conf['postfix']['config_dir'].'/main.cf~3');
-
- //* Executing the postconf commands
- foreach($postconf_commands as $cmd)
+ copy($conf['postfix']['config_dir'].'/main.cf', $conf['postfix']['config_dir'].'/main.cf~3');
+
+ //* Executing the postconf commands
+ foreach($postconf_commands as $cmd)
{
$command = "postconf -e '$cmd'";
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
}
-
+
//* copy dovecot.conf
$configfile = $config_dir.'/dovecot.conf';
$content = $this->get_template_file('dovecot.conf', true);
$this->write_config_file($configfile, $content);
-
+
//* dovecot-sql.conf
$configfile = $config_dir.'/dovecot-sql.conf';
$content = $this->get_template_file('debian_dovecot-sql.conf', true, true);
$this->write_config_file($configfile, $content);
- }
-
+ }
+
public function configure_spamassassin()
- {
+ {
return true;
- }
-
+ }
+
public function configure_getmail()
- {
+ {
global $conf;
-
+
$config_dir = $conf['getmail']['config_dir'];
-
+
if (!is_dir($config_dir)) {
exec('mkdir -p '.escapeshellcmd($config_dir));
}
@@ -290,86 +290,86 @@
if (!is_user('getmail')) {
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
}
-
+
$command = "chown -R getmail $config_dir";
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
-
+
$command = "chmod -R 700 $config_dir";
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
-
+
//* Getmail will be run from cron. In order to have access to cron the getmail user needs to be part of the cron group.
$command = "gpasswd -a getmail " . $conf['cron']['group'];
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
}
-
- public function configure_amavis()
- {
+
+ public function configure_amavis()
+ {
global $conf;
-
+
//* Amavisd-new user config file
$conf_file = 'amavisd-ispconfig.conf';
$conf_path = dirname($conf['amavis']['config_file']) . '/' . $conf_file;
-
+
$content = $this->get_template_file($conf_file, true, true); //* get contents & insert db cred
$this->write_config_file($conf_path, $content);
-
+
//* Activate config directory in default file
$amavis_conf = rf($conf['amavis']['config_file']);
- if (stripos($amavis_conf, $conf_path) === false)
+ if (stripos($amavis_conf, $conf_path) === false)
{
$amavis_conf = preg_replace('/^(1;.*)$/m', "include_config_files('$conf_path');\n$1", $amavis_conf);
$this->write_config_file($conf['amavis']['config_file'], $amavis_conf);
}
-
+
//* Adding the amavisd commands to the postfix configuration
$postconf_commands = array (
'content_filter = amavis:[127.0.0.1]:10024',
'receive_override_options = no_address_mappings'
);
-
- foreach($postconf_commands as $cmd) {
+
+ foreach($postconf_commands as $cmd) {
$command = "postconf -e '$cmd'";
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
}
-
+
//* Append the configuration for amavisd to the master.cf file
$content = rf($conf['postfix']['config_dir'].'/master.cf');
-
- if(!stristr($content,'127.0.0.1:10025')) //* Only add the content if we had not addded it before
- {
+
+ if(!stristr($content, '127.0.0.1:10025')) //* Only add the content if we had not addded it before
+ {
unset($content);
$content = $this->get_template_file('master_cf_amavis', true);
af($conf['postfix']['config_dir'].'/master.cf', $content);
}
unset($content);
-
+
//* Add the clamav user to the amavis group
exec('usermod -a -G amavis clamav');
- }
-
- public function configure_pureftpd()
- {
+ }
+
+ public function configure_pureftpd()
+ {
global $conf;
-
+
//* configure pure-ftpd for MySQL authentication against the ispconfig database
$content = $this->get_template_file('pureftpd_mysql.conf', true, true); //* get contents & insert db cred
$content = str_replace('{server_id}', $conf['server_id'], $content);
-
+
$this->write_config_file($conf['pureftpd']['mysql_config_file'], $content, 600, 'root', 'root');
-
+
//* enable pure-ftpd and server settings
$content = rf($conf["pureftpd"]["config_file"]);
-
+
$content = preg_replace('/#?IS_CONFIGURED="(?:yes|no)"/', 'IS_CONFIGURED="yes"', $content);
$content = str_replace('AUTH="-l unix"', 'AUTH="-l mysql:'.$conf['pureftpd']['mysql_config_file'].'"', $content);
-
+
//* Logging defaults to syslog's ftp facility. Override this behaviour for better compatibility with debian/ubuntu
//* and specify the format.
$logdir = '/var/log/pure-ftpd';
if (!is_dir($logdir)) {
mkdir($logdir, 0755, true);
}
-
+
/**
* @link http://download.pureftpd.org/pub/pure-ftpd/doc/README
* -b brokenclientscompatibility
@@ -377,45 +377,47 @@
* -E noanonymous
* -O altlog <format>:<log file>
* -Z customerproof (Add safe guards against common customer mistakes ie. like chmod 0 on their own files)
- * -D displaydotfiles
+ * -D displaydotfiles
* -H dontresolve
*/
+
+
$content = preg_replace('/MISC_OTHER="[^"]+"/', 'MISC_OTHER="-b -A -E -Z -D -H -O clf:'.$logdir.'/transfer.log"', $content);
-
+
$this->write_config_file($conf['pureftpd']['config_file'], $content);
- }
-
- public function configure_powerdns()
+ }
+
+ public function configure_powerdns()
{
global $conf;
-
+
//* Create the database
if(!$this->db->query('CREATE DATABASE IF NOT EXISTS '.$conf['powerdns']['database'].' DEFAULT CHARACTER SET '.$conf['mysql']['charset'])) {
$this->error('Unable to create MySQL database: '.$conf['powerdns']['database'].'.');
}
-
+
//* Create the ISPConfig database user in the local database
- $query = 'GRANT ALL ON `'.$conf['powerdns']['database'].'` . * TO \''.$conf['mysql']['ispconfig_user'].'\'@\'localhost\';';
+ $query = 'GRANT ALL ON `'.$conf['powerdns']['database'].'` . * TO \''.$conf['mysql']['ispconfig_user'].'\'@\'localhost\';';
if(!$this->db->query($query)) {
$this->error('Unable to create user for powerdns database Error: '.$this->db->errorMessage);
}
-
+
//* Reload database privelages
$this->db->query('FLUSH PRIVILEGES;');
-
+
//* load the powerdns databse dump
if($conf['mysql']['admin_password'] == '') {
- caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' '".$conf['powerdns']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/powerdns.sql' &> /dev/null",
- __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in powerdns.sql');
+ caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' '".$conf['powerdns']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/powerdns.sql' &> /dev/null",
+ __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in powerdns.sql');
} else {
- caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' '".$conf['powerdns']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/powerdns.sql' &> /dev/null",
- __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in powerdns.sql');
+ caselog("mysql --default-character-set=".$conf['mysql']['charset']." -h '".$conf['mysql']['host']."' -u '".$conf['mysql']['admin_user']."' -p'".$conf['mysql']['admin_password']."' '".$conf['powerdns']['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/powerdns.sql' &> /dev/null",
+ __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in powerdns.sql');
}
-
+
//* Create the powerdns config file
$content = $this->get_template_file('pdns.local', true, true); //* get contents & insert db cred
$content = str_replace('{powerdns_database}', $conf['powerdns']['database'], $content);
-
+
$this->write_config_file($conf["powerdns"]["config_dir"].'/'.$conf["powerdns"]["config_file"], $content, 600, 'root', 'root');
//* Create symlink to init script to start the correct config file
@@ -423,26 +425,26 @@
symlink($conf['init_scripts'].'/pdns', $conf['init_scripts'].'/'.$conf['powerdns']['init_script']);
}
}
-
+
public function configure_bind() {
global $conf;
- //* Check if the zonefile directory has a slash at the end
- $content=$conf['bind']['bind_zonefiles_dir'];
- if(substr($content,-1,1) != '/') {
- $content .= '/';
+ //* Check if the zonefile directory has a slash at the end
+ $content=$conf['bind']['bind_zonefiles_dir'];
+ if(substr($content, -1, 1) != '/') {
+ $content .= '/';
}
-
+
//* New default format of named.conf uses views. Check which version the system is using and include our zones file.
$named_conf = rf($conf['bind']['named_conf_path']);
- if (stripos($named_conf, 'include "'.$conf['bind']['named_conf_local_path'].'";') === false)
+ if (stripos($named_conf, 'include "'.$conf['bind']['named_conf_local_path'].'";') === false)
{
preg_match_all("/(?<=\n)view \"(?:public|internal)\" in \{.*\n\};/Us", $named_conf, $views);
if (count($views[0]) == 2) {
foreach ($views[0] as $view) {
$named_conf = str_replace($view, substr($view, 0, -2)."include \"{$conf['bind']['named_conf_local_path']}\";\n};", $named_conf);
}
-
+
wf($conf['bind']['named_conf_path'], $named_conf);
}
else {
@@ -450,48 +452,48 @@
}
}
}
-
+
public function configure_apache()
- {
+ {
global $conf;
-
+
if($conf['apache']['installed'] == false) return;
//* Create the logging directory for the vhost logfiles
if (!is_dir($conf['ispconfig_log_dir'].'/httpd')) {
mkdir($conf['ispconfig_log_dir'].'/httpd', 0755, true);
}
-
- if (is_file($conf['suphp']['config_file']))
+
+ if (is_file($conf['suphp']['config_file']))
{
$content = rf($conf['suphp']['config_file']);
-
+
if (!preg_match('|^x-httpd-suphp=php:/usr/bin/php-cgi$|m', $content))
{
- $content = preg_replace('/;Handler for php-scripts/',";Handler for php-scripts\nx-httpd-suphp=php:/usr/bin/php-cgi", $content);
- $content = preg_replace('/;?umask=\d+/','umask=0022', $content);
+ $content = preg_replace('/;Handler for php-scripts/', ";Handler for php-scripts\nx-httpd-suphp=php:/usr/bin/php-cgi", $content);
+ $content = preg_replace('/;?umask=\d+/', 'umask=0022', $content);
}
-
+
$this->write_config_file($conf['suphp']['config_file'], $content);
}
-
+
//* Enable ISPConfig default vhost settings
$default_vhost_path = $conf['apache']['vhost_conf_dir'].'/'.$conf['apache']['vhost_default'];
- if (is_file($default_vhost_path))
+ if (is_file($default_vhost_path))
{
$content = rf($default_vhost_path);
-
+
$content = preg_replace('/^#?\s*NameVirtualHost.*$/m', 'NameVirtualHost *:80', $content);
$content = preg_replace('/<VirtualHost[^>]+>/', '<VirtualHost *:80>', $content);
-
+
$this->write_config_file($default_vhost_path, $content);
}
-
+
//* Generate default ssl certificates
if (!is_dir($conf['apache']['ssl_dir'])) {
mkdir($conf['apache']['ssl_dir']);
}
-
- if ($conf['services']['mail'] == true)
+
+ if ($conf['services']['mail'] == true)
{
copy($conf['postfix']['config_dir']."/smtpd.key", $conf['apache']['ssl_dir']."/server.key");
copy($conf['postfix']['config_dir']."/smtpd.cert", $conf['apache']['ssl_dir']."/server.crt");
@@ -502,76 +504,76 @@
exec("openssl req -new -outform PEM -out {$conf['apache']['ssl_dir']}/server.crt -newkey rsa:2048 -nodes -keyout {$conf['apache']['ssl_dir']}/server.key -keyform PEM -days 365 -x509");
}
}
-
-
-
+
+
+
//* Copy the ISPConfig configuration include
$content = $this->get_template_file('apache_ispconfig.conf', true);
-
+
$records = $this->db->queryAllRecords("SELECT * FROM server_ip WHERE server_id = ".$conf["server_id"]." AND virtualhost = 'y'");
- if(is_array($records) && count($records) > 0)
+ if(is_array($records) && count($records) > 0)
{
foreach($records as $rec) {
$content .= "NameVirtualHost ".$rec["ip_address"].":80\n";
$content .= "NameVirtualHost ".$rec["ip_address"].":443\n";
}
}
-
+
$this->write_config_file($conf['apache']['vhost_conf_dir'].'/000-ispconfig.conf', $content);
-
+
//* Gentoo by default does not include .vhost files. Add include line to config file.
$content = rf($conf['apache']['config_file']);
if ( strpos($content, 'Include /etc/apache2/vhosts.d/*.vhost') === false ) {
- $content = preg_replace('|(Include /etc/apache2/vhosts.d/\*.conf)|',"$1\nInclude /etc/apache2/vhosts.d/*.vhost", $content);
+ $content = preg_replace('|(Include /etc/apache2/vhosts.d/\*.conf)|', "$1\nInclude /etc/apache2/vhosts.d/*.vhost", $content);
}
-
+
$this->write_config_file($conf['apache']['config_file'], $content);
-
+
//* make sure that webalizer finds its config file when it is directly in /etc
- if(is_file('/etc/webalizer.conf') && !is_dir('/etc/webalizer'))
+ if(is_file('/etc/webalizer.conf') && !is_dir('/etc/webalizer'))
{
mkdir('/etc/webalizer', 0755);
symlink('/etc/webalizer.conf', '/etc/webalizer/webalizer.conf');
}
-
- if(is_file('/etc/webalizer/webalizer.conf')) //* Change webalizer mode to incremental
- {
- replaceLine('/etc/webalizer/webalizer.conf','#IncrementalName','IncrementalName webalizer.current',0,0);
- replaceLine('/etc/webalizer/webalizer.conf','#Incremental','Incremental yes',0,0);
- replaceLine('/etc/webalizer/webalizer.conf','#HistoryName','HistoryName webalizer.hist',0,0);
+
+ if(is_file('/etc/webalizer/webalizer.conf')) //* Change webalizer mode to incremental
+ {
+ replaceLine('/etc/webalizer/webalizer.conf', '#IncrementalName', 'IncrementalName webalizer.current', 0, 0);
+ replaceLine('/etc/webalizer/webalizer.conf', '#Incremental', 'Incremental yes', 0, 0);
+ replaceLine('/etc/webalizer/webalizer.conf', '#HistoryName', 'HistoryName webalizer.hist', 0, 0);
}
-
+
//* add a sshusers group
- if (!is_group('sshusers'))
+ if (!is_group('sshusers'))
{
$command = 'groupadd sshusers';
caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
}
- }
-
- public function configure_apps_vhost()
+ }
+
+ public function configure_apps_vhost()
{
global $conf;
-
+
//* Create the ispconfig apps vhost user and group
if($conf['apache']['installed'] == true){
$apps_vhost_user = escapeshellcmd($conf['web']['apps_vhost_user']);
$apps_vhost_group = escapeshellcmd($conf['web']['apps_vhost_group']);
$install_dir = escapeshellcmd($conf['web']['website_basedir'].'/apps');
-
+
$command = 'groupadd '.$apps_vhost_user;
if ( !is_group($apps_vhost_group) ) {
caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
}
-
+
$command = "useradd -g '$apps_vhost_group' -d $install_dir $apps_vhost_group";
if ( !is_user($apps_vhost_user) ) {
caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
}
-
+
$command = 'adduser '.$conf['apache']['user'].' '.$apps_vhost_group;
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
-
+
if(!@is_dir($install_dir)){
mkdir($install_dir, 0755, true);
} else {
@@ -579,41 +581,41 @@
}
chown($install_dir, $apps_vhost_user);
chgrp($install_dir, $apps_vhost_group);
-
+
//* Copy the apps vhost file
$vhost_conf_dir = $conf['apache']['vhost_conf_dir'];
$vhost_conf_enabled_dir = $conf['apache']['vhost_conf_enabled_dir'];
$apps_vhost_servername = ($conf['web']['apps_vhost_servername'] == '') ? '' : 'ServerName '.$conf['web']['apps_vhost_servername'];
-
+
//* Dont just copy over the virtualhost template but add some custom settings
$content = $this->get_template_file('apache_apps.vhost', true);
-
+
$content = str_replace('{apps_vhost_ip}', $conf['web']['apps_vhost_ip'], $content);
$content = str_replace('{apps_vhost_port}', $conf['web']['apps_vhost_port'], $content);
$content = str_replace('{apps_vhost_dir}', $conf['web']['website_basedir'].'/apps', $content);
$content = str_replace('{website_basedir}', $conf['web']['website_basedir'], $content);
$content = str_replace('{apps_vhost_servername}', $apps_vhost_servername, $content);
-
+
//* comment out the listen directive if port is 80 or 443
if($conf['web']['apps_vhost_ip'] == 80 or $conf['web']['apps_vhost_ip'] == 443) {
$content = str_replace('{vhost_port_listen}', '#', $content);
} else {
$content = str_replace('{vhost_port_listen}', '', $content);
}
-
+
$this->write_config_file("$vhost_conf_dir/apps.vhost", $content);
-
- //if ( !is_file($conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter') )
+
+ //if ( !is_file($conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter') )
//{
- $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/apache_apps_fcgi_starter.master', 'tpl/apache_apps_fcgi_starter.master');
- $content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
- $content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
- mkdir($conf['web']['website_basedir'].'/php-fcgi-scripts/apps', 0755, true);
- //copy('tpl/apache_apps_fcgi_starter.master',$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter');
- wf($conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter', $content);
- exec('chmod +x '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter');
- exec('chown -R ispapps:ispapps '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps');
-
+ $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/apache_apps_fcgi_starter.master', 'tpl/apache_apps_fcgi_starter.master');
+ $content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
+ $content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
+ mkdir($conf['web']['website_basedir'].'/php-fcgi-scripts/apps', 0755, true);
+ //copy('tpl/apache_apps_fcgi_starter.master',$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter');
+ wf($conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter', $content);
+ exec('chmod +x '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps/.php-fcgi-starter');
+ exec('chown -R ispapps:ispapps '.$conf['web']['website_basedir'].'/php-fcgi-scripts/apps');
+
//}
}
if($conf['nginx']['installed'] == true){
@@ -646,15 +648,15 @@
// Dont just copy over the virtualhost template but add some custom settings
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/nginx_apps.vhost.master', 'tpl/nginx_apps.vhost.master');
-
+
if($conf['web']['apps_vhost_ip'] == '_default_'){
$apps_vhost_ip = '';
} else {
$apps_vhost_ip = $conf['web']['apps_vhost_ip'].':';
}
-
+
$socket_dir = escapeshellcmd($conf['nginx']['php_fpm_socket_dir']);
- if(substr($socket_dir,-1) != '/') $socket_dir .= '/';
+ if(substr($socket_dir, -1) != '/') $socket_dir .= '/';
if(!is_dir($socket_dir)) exec('mkdir -p '.$socket_dir);
$fpm_socket = $socket_dir.'apps.sock';
$cgi_socket = escapeshellcmd($conf['nginx']['cgi_socket']);
@@ -668,7 +670,7 @@
$content = str_replace('{cgi_socket}', $cgi_socket, $content);
wf($vhost_conf_dir.'/apps.vhost', $content);
-
+
// PHP-FPM
// Dont just copy over the php-fpm pool template but add some custom settings
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/apps_php_fpm_pool.conf.master', 'tpl/apps_php_fpm_pool.conf.master');
@@ -683,84 +685,84 @@
//* and create the symlink
if(@is_link($vhost_conf_enabled_dir.'/apps.vhost')) unlink($vhost_conf_enabled_dir.'/apps.vhost');
if(!@is_link($vhost_conf_enabled_dir.'/000-apps.vhost')) {
- symlink($vhost_conf_dir.'/apps.vhost',$vhost_conf_enabled_dir.'/000-apps.vhost');
+ symlink($vhost_conf_dir.'/apps.vhost', $vhost_conf_enabled_dir.'/000-apps.vhost');
}
-
+
}
}
-
- public function install_ispconfig()
- {
+
+ public function install_ispconfig()
+ {
global $conf;
-
+
$install_dir = $conf['ispconfig_install_dir'];
-
- //* Create the ISPConfig installation directory
- if(!is_dir($install_dir))
+
+ //* Create the ISPConfig installation directory
+ if(!is_dir($install_dir))
{
$command = "mkdir $install_dir";
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
}
-
+
//* Create a ISPConfig user and group
- if (!is_group('ispconfig'))
+ if (!is_group('ispconfig'))
{
$command = 'groupadd ispconfig';
caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
}
-
- if (!is_user('ispconfig'))
+
+ if (!is_user('ispconfig'))
{
$command = "useradd -g ispconfig -d $install_dir ispconfig";
caselog($command.' &> /dev/null 2> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
}
-
+
//* copy the ISPConfig interface part
$command = "cp -rf ../interface $install_dir";
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
-
+
//* copy the ISPConfig server part
$command = "cp -rf ../server $install_dir";
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
-
-
+
+
//* Create the config file for ISPConfig interface
$configfile = 'config.inc.php';
$content = $this->get_template_file($configfile, true, true); //* get contents & insert db cred
-
+
$content = str_replace('{mysql_master_server_ispconfig_user}', $conf['mysql']['master_ispconfig_user'], $content);
$content = str_replace('{mysql_master_server_ispconfig_password}', $conf['mysql']['master_ispconfig_password'], $content);
$content = str_replace('{mysql_master_server_database}', $conf['mysql']['master_database'], $content);
$content = str_replace('{mysql_master_server_host}', $conf['mysql']['master_host'], $content);
-
+
$content = str_replace('{server_id}', $conf['server_id'], $content);
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
$content = str_replace('{language}', $conf['language'], $content);
$content = str_replace('{timezone}', $conf['timezone'], $content);
$content = str_replace('{theme}', $conf['theme'], $content);
$content = str_replace('{language_file_import_enabled}', ($conf['language_file_import_enabled'] == true)?'true':'false', $content);
-
+
$this->write_config_file("$install_dir/interface/lib/$configfile", $content);
-
+
//* Create the config file for ISPConfig server
$this->write_config_file("$install_dir/server/lib/$configfile", $content);
-
+
//* Create the config file for remote-actions (but only, if it does not exist, because
// the value is a autoinc-value and so changed by the remoteaction_core_module
if (!file_exists($install_dir.'/server/lib/remote_action.inc.php')) {
$content = '<?php' . "\n" . '$maxid_remote_action = 0;' . "\n" . '?>';
wf($install_dir.'/server/lib/remote_action.inc.php', $content);
}
-
- // Enable the server modules and plugins.
+
+ // Enable the server modules and plugins.
// TODO: Implement a selector which modules and plugins shall be enabled.
$dir = $install_dir.'/server/mods-available/';
if (is_dir($dir)) {
if ($dh = opendir($dir)) {
while (($file = readdir($dh)) !== false) {
- if($file != '.' && $file != '..' && substr($file,-8,8) == '.inc.php') {
- include_once($install_dir.'/server/mods-available/'.$file);
- $module_name = substr($file,0,-8);
+ if($file != '.' && $file != '..' && substr($file, -8, 8) == '.inc.php') {
+ include_once $install_dir.'/server/mods-available/'.$file;
+ $module_name = substr($file, 0, -8);
$tmp = new $module_name;
if($tmp->onInstall()) {
if(!@is_link($install_dir.'/server/mods-enabled/'.$file)) {
@@ -787,11 +789,11 @@
while (($file = readdir($dh)) !== false) {
if($conf['apache']['installed'] == true && $file == 'nginx_plugin.inc.php') continue;
if($conf['nginx']['installed'] == true && $file == 'apache2_plugin.inc.php') continue;
- if($file != '.' && $file != '..' && substr($file,-8,8) == '.inc.php') {
- include_once($install_dir.'/server/plugins-available/'.$file);
- $plugin_name = substr($file,0,-8);
+ if($file != '.' && $file != '..' && substr($file, -8, 8) == '.inc.php') {
+ include_once $install_dir.'/server/plugins-available/'.$file;
+ $plugin_name = substr($file, 0, -8);
$tmp = new $plugin_name;
- if(method_exists($tmp,'onInstall') && $tmp->onInstall()) {
+ if(method_exists($tmp, 'onInstall') && $tmp->onInstall()) {
if(!@is_link($install_dir.'/server/plugins-enabled/'.$file)) {
@symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-enabled/'.$file);
}
@@ -807,7 +809,7 @@
closedir($dh);
}
}
-
+
//* Update the server config
$mail_server_enabled = ($conf['services']['mail'])?1:0;
$web_server_enabled = ($conf['services']['web'])?1:0;
@@ -815,16 +817,16 @@
$file_server_enabled = ($conf['services']['file'])?1:0;
$db_server_enabled = ($conf['services']['db'])?1:0;
$vserver_server_enabled = ($conf['services']['vserver'])?1:0;
-
- $sql = "UPDATE `server` SET mail_server = '$mail_server_enabled', web_server = '$web_server_enabled', dns_server = '$dns_server_enabled', file_server = '$file_server_enabled', db_server = '$db_server_enabled', vserver_server = '$vserver_server_enabled' WHERE server_id = ".intval($conf['server_id']);
-
+
+ $sql = "UPDATE `server` SET mail_server = '$mail_server_enabled', web_server = '$web_server_enabled', dns_server = '$dns_server_enabled', file_server = '$file_server_enabled', db_server = '$db_server_enabled', vserver_server = '$vserver_server_enabled' WHERE server_id = ".intval($conf['server_id']);
+
if($conf['mysql']['master_slave_setup'] == 'y') {
$this->dbmaster->query($sql);
$this->db->query($sql);
} else {
$this->db->query($sql);
}
-
+
//* Chmod the files
$command = "chmod -R 750 $install_dir";
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
@@ -832,40 +834,40 @@
//* chown the files to the ispconfig user and group
$command = "chown -R ispconfig:ispconfig $install_dir";
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
-
+
//* Make the global language file directory group writable
exec("chmod -R 770 $install_dir/interface/lib/lang");
-
+
//* Make the temp directory for language file exports writable
if(is_dir($install_dir.'/interface/web/temp')) {
exec("chmod -R 770 $install_dir/interface/web/temp");
}
-
- //* Make all interface language file directories group writable
+
+ //* Make all interface language file directories group writable
$handle = @opendir($install_dir.'/interface/web');
- while ($file = @readdir ($handle)) {
- if ($file != '.' && $file != '..') {
- if(@is_dir($install_dir.'/interface/web'.'/'.$file.'/lib/lang')) {
+ while ($file = @readdir($handle)) {
+ if ($file != '.' && $file != '..') {
+ if(@is_dir($install_dir.'/interface/web'.'/'.$file.'/lib/lang')) {
$handle2 = opendir($install_dir.'/interface/web'.'/'.$file.'/lib/lang');
- chmod($install_dir.'/interface/web'.'/'.$file.'/lib/lang',0770);
- while ($lang_file = @readdir ($handle2)) {
+ chmod($install_dir.'/interface/web'.'/'.$file.'/lib/lang', 0770);
+ while ($lang_file = @readdir($handle2)) {
if ($lang_file != '.' && $lang_file != '..') {
- chmod($install_dir.'/interface/web'.'/'.$file.'/lib/lang/'.$lang_file,0770);
+ chmod($install_dir.'/interface/web'.'/'.$file.'/lib/lang/'.$lang_file, 0770);
}
}
}
}
}
-
+
//* Make the APS directories group writable
exec("chmod -R 770 $install_dir/interface/web/sites/aps_meta_packages");
exec("chmod -R 770 $install_dir/server/aps_packages");
-
- //* make sure that the server config file (not the interface one) is only readable by the root user
+
+ //* make sure that the server config file (not the interface one) is only readable by the root user
chmod($install_dir.'/server/lib/config.inc.php', 0600);
chown($install_dir.'/server/lib/config.inc.php', 'root');
chgrp($install_dir.'/server/lib/config.inc.php', 'root');
-
+
//* Make sure thet the interface config file is readable by user ispconfig only
chmod($install_dir.'/interface/lib/config.inc.php', 0600);
chown($install_dir.'/interface/lib/config.inc.php', 'ispconfig');
@@ -880,12 +882,12 @@
chown($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
chgrp($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
}
-
+
if(is_dir($install_dir.'/interface/invoices')) {
exec('chmod -R 770 '.escapeshellarg($install_dir.'/interface/invoices'));
exec('chown -R ispconfig:ispconfig '.escapeshellarg($install_dir.'/interface/invoices'));
}
-
+
// TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing
// and must be fixed as this will allow the apache user to read the ispconfig files.
// Later this must run as own apache server or via suexec!
@@ -905,23 +907,23 @@
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
}
}
-
+
//* Make the shell scripts executable
$command = "chmod +x $install_dir/server/scripts/*.sh";
caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
-
+
if($conf['apache']['installed'] == true && $this->install_ispconfig_interface == true){
//* Copy the ISPConfig vhost for the controlpanel
$content = $this->get_template_file("apache_ispconfig.vhost", true);
$content = str_replace('{vhost_port}', $conf['apache']['vhost_port'], $content);
-
+
//* comment out the listen directive if port is 80 or 443
if ($conf['apache']['vhost_port'] == 80 or $conf['apache']['vhost_port'] == 443) {
$content = str_replace('{vhost_port_listen}', '#', $content);
} else {
$content = str_replace('{vhost_port_listen}', '', $content);
}
-
+
if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key')) {
$content = str_replace('{ssl_comment}', '', $content);
} else {
@@ -932,10 +934,10 @@
} else {
$content = str_replace('{ssl_bundle_comment}', '#', $content);
}
-
+
$vhost_path = $conf['apache']['vhost_conf_dir'].'/ispconfig.vhost';
$this->write_config_file($vhost_path, $content);
-
+
if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/apache_ispconfig_fcgi_starter.master', 'tpl/apache_ispconfig_fcgi_starter.master');
$content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
@@ -944,7 +946,7 @@
wf('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', $content);
exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
chmod('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', 0755);
- @symlink($install_dir.'/interface/web','/var/www/ispconfig');
+ @symlink($install_dir.'/interface/web', '/var/www/ispconfig');
exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');
}
}
@@ -957,7 +959,7 @@
// Dont just copy over the virtualhost template but add some custom settings
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/nginx_ispconfig.vhost.master', 'tpl/nginx_ispconfig.vhost.master');
$content = str_replace('{vhost_port}', $conf['nginx']['vhost_port'], $content);
-
+
if(is_file($install_dir.'/interface/ssl/ispserver.crt') && is_file($install_dir.'/interface/ssl/ispserver.key')) {
$content = str_replace('{ssl_on}', ' on', $content);
$content = str_replace('{ssl_comment}', '', $content);
@@ -967,19 +969,19 @@
$content = str_replace('{ssl_comment}', '#', $content);
$content = str_replace('{fastcgi_ssl}', 'off', $content);
}
-
+
$socket_dir = escapeshellcmd($conf['nginx']['php_fpm_socket_dir']);
- if(substr($socket_dir,-1) != '/') $socket_dir .= '/';
+ if(substr($socket_dir, -1) != '/') $socket_dir .= '/';
if(!is_dir($socket_dir)) exec('mkdir -p '.$socket_dir);
$fpm_socket = $socket_dir.'ispconfig.sock';
-
+
//$content = str_replace('{fpm_port}', $conf['nginx']['php_fpm_start_port'], $content);
$content = str_replace('{fpm_socket}', $fpm_socket, $content);
wf($vhost_conf_dir.'/ispconfig.vhost', $content);
-
+
unset($content);
-
+
// PHP-FPM
// Dont just copy over the php-fpm pool template but add some custom settings
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/php_fpm_pool.conf.master', 'tpl/php_fpm_pool.conf.master');
@@ -995,31 +997,31 @@
if($this->is_update == false) {
if(@is_link($vhost_conf_enabled_dir.'/ispconfig.vhost')) unlink($vhost_conf_enabled_dir.'/ispconfig.vhost');
if(!@is_link($vhost_conf_enabled_dir.'/000-ispconfig.vhost')) {
- symlink($vhost_conf_dir.'/ispconfig.vhost',$vhost_conf_enabled_dir.'/000-ispconfig.vhost');
+ symlink($vhost_conf_dir.'/ispconfig.vhost', $vhost_conf_enabled_dir.'/000-ispconfig.vhost');
}
}
}
-
+
//* Install the update script
if (is_file('/usr/local/bin/ispconfig_update_from_svn.sh')) {
unlink('/usr/local/bin/ispconfig_update_from_svn.sh');
}
-
+
chown($install_dir.'/server/scripts/update_from_svn.sh', 'root');
chmod($install_dir.'/server/scripts/update_from_svn.sh', 0700);
chown($install_dir.'/server/scripts/update_from_tgz.sh', 'root');
chmod($install_dir.'/server/scripts/update_from_tgz.sh', 0700);
chown($install_dir.'/server/scripts/ispconfig_update.sh', 'root');
chmod($install_dir.'/server/scripts/ispconfig_update.sh', 0700);
-
+
if (!is_link('/usr/local/bin/ispconfig_update_from_svn.sh')) {
symlink($install_dir.'/server/scripts/ispconfig_update.sh', '/usr/local/bin/ispconfig_update_from_svn.sh');
}
-
+
if (!is_link('/usr/local/bin/ispconfig_update.sh')) {
symlink($install_dir.'/server/scripts/ispconfig_update.sh', '/usr/local/bin/ispconfig_update.sh');
}
-
+
//* Make the logs readable for the ispconfig user
if (is_file('/var/log/maillog')) {
exec('chmod +r /var/log/maillog');
@@ -1033,7 +1035,7 @@
if (is_file('/var/log/clamav/freshclam.log')) {
exec('chmod +r /var/log/clamav/freshclam.log');
}
-
+
//* Create the ispconfig log directory
if (!is_dir($conf['ispconfig_log_dir'])) {
mkdir($conf['ispconfig_log_dir']);
@@ -1041,25 +1043,26 @@
if (!is_file($conf['ispconfig_log_dir'].'/ispconfig.log')) {
touch($conf['ispconfig_log_dir'].'/ispconfig.log');
}
-
+
//* Create the ispconfig auth log file and set uid/gid
if(!is_file($conf['ispconfig_log_dir'].'/auth.log')) {
touch($conf['ispconfig_log_dir'].'/auth.log');
}
exec('chown ispconfig:ispconfig '. $conf['ispconfig_log_dir'].'/auth.log');
exec('chmod 660 '. $conf['ispconfig_log_dir'].'/auth.log');
-
+
rename($install_dir.'/server/scripts/run-getmail.sh', '/usr/local/bin/run-getmail.sh');
-
+
if (is_user('getmail')) {
chown('/usr/local/bin/run-getmail.sh', 'getmail');
}
chmod('/usr/local/bin/run-getmail.sh', 0744);
-
+
//* Remove Domain module as its functions are available in the client module now
if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
-
- }
+
+ }
+
}
?>
--
Gitblit v1.9.1