is an ISP management and Hosting Control Panel (for different Managed Services).
| installer_base.lib.php (ISPConfig-3.2.8p1) | : | installer_base.lib.php (ISPConfig-3.2.8p2) |
|---|
| | |
| skipping to change at line 1650 | | skipping to change at line 1650 |
|---|
| if(is_installed('doveadm')) exec("doveadm mount add '/var/www/*'
ignore > /dev/null 2> /dev/null"); | | if(is_installed('doveadm')) exec("doveadm mount add '/var/www/*'
ignore > /dev/null 2> /dev/null"); |
| | |
| } | | } |
| | |
| public function configure_amavis() { | | public function configure_amavis() { |
| global $conf; | | global $conf; |
| | |
| //* These postconf commands will be executed on installation and
update | | //* These postconf commands will be executed on installation and
update |
| $server_ini_rec = $this->db->queryOneRecord("SELECT mail_server,
config FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . '.server', $co
nf['server_id']); | | $server_ini_rec = $this->db->queryOneRecord("SELECT mail_server,
config FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . '.server', $co
nf['server_id']); |
| $server_ini_array = ini_to_array(stripslashes($server_ini_rec['co
nfig'])); | | $server_ini_array = ini_to_array(stripslashes($server_ini_rec['co
nfig'])); |
|
| $mail_server = ($server_ini_rec['mail_server']) ? true : false; | | $mail_server = $conf['services']['mail']; |
| unset($server_ini_rec); | | unset($server_ini_rec); |
| | |
| // amavisd user config file | | // amavisd user config file |
| $configfile = 'amavisd_user_config'; | | $configfile = 'amavisd_user_config'; |
| if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user')) copy
($conf['amavis']['config_dir'].'/conf.d/50-user', $conf['amavis']['config_dir'].
'/50-user~'); | | if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user')) copy
($conf['amavis']['config_dir'].'/conf.d/50-user', $conf['amavis']['config_dir'].
'/50-user~'); |
| if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user~')) chm
od($conf['amavis']['config_dir'].'/50-user~', 0400); | | if(is_file($conf['amavis']['config_dir'].'/conf.d/50-user~')) chm
od($conf['amavis']['config_dir'].'/50-user~', 0400); |
| $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-cus
tom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master'); | | $content = rfsel($conf['ispconfig_install_dir'].'/server/conf-cus
tom/install/'.$configfile.'.master', 'tpl/'.$configfile.'.master'); |
| $content = str_replace('{mysql_server_ispconfig_user}', $conf['my
sql']['ispconfig_user'], $content); | | $content = str_replace('{mysql_server_ispconfig_user}', $conf['my
sql']['ispconfig_user'], $content); |
| $content = str_replace('{mysql_server_ispconfig_password}', $conf
['mysql']['ispconfig_password'], $content); | | $content = str_replace('{mysql_server_ispconfig_password}', $conf
['mysql']['ispconfig_password'], $content); |
| $content = str_replace('{mysql_server_database}', $conf['mysql'][
'database'], $content); | | $content = str_replace('{mysql_server_database}', $conf['mysql'][
'database'], $content); |
| | |
| skipping to change at line 1774 | | skipping to change at line 1774 |
|---|
| if(!empty($amavis_group)) exec('chgrp -R '.$amavis_group.' /var/l
ib/amavis/dkim'); | | if(!empty($amavis_group)) exec('chgrp -R '.$amavis_group.' /var/l
ib/amavis/dkim'); |
| | |
| } | | } |
| | |
| public function configure_rspamd() { | | public function configure_rspamd() { |
| global $conf; | | global $conf; |
| | |
| //* These postconf commands will be executed on installation and
update | | //* These postconf commands will be executed on installation and
update |
| $server_ini_rec = $this->db->queryOneRecord("SELECT mail_server,
config FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . '.server', $co
nf['server_id']); | | $server_ini_rec = $this->db->queryOneRecord("SELECT mail_server,
config FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . '.server', $co
nf['server_id']); |
| $server_ini_array = ini_to_array(stripslashes($server_ini_rec['co
nfig'])); | | $server_ini_array = ini_to_array(stripslashes($server_ini_rec['co
nfig'])); |
|
| $mail_server = ($server_ini_rec['mail_server']) ? true : false; | | $mail_server = $conf['services']['mail']; |
| unset($server_ini_rec); | | unset($server_ini_rec); |
| | |
| $config_dir = $conf['postfix']['config_dir']; | | $config_dir = $conf['postfix']['config_dir']; |
| $quoted_config_dir = preg_quote($config_dir, '|'); | | $quoted_config_dir = preg_quote($config_dir, '|'); |
| | |
| $mail_config = $server_ini_array['mail']; | | $mail_config = $server_ini_array['mail']; |
| //* only change postfix config if rspamd is active filter | | //* only change postfix config if rspamd is active filter |
| if($mail_server && $mail_config['content_filter'] === 'rspamd') { | | if($mail_server && $mail_config['content_filter'] === 'rspamd') { |
| exec("postconf -X receive_override_options"); | | exec("postconf -X receive_override_options"); |
| exec("postconf -X content_filter"); | | exec("postconf -X content_filter"); |
| | |
| skipping to change at line 1977 | | skipping to change at line 1977 |
|---|
| } | | } |
| } | | } |
| | |
| # rename rspamd templates we no longer use | | # rename rspamd templates we no longer use |
| if(file_exists("/etc/rspamd/local.d/greylist.conf")) { | | if(file_exists("/etc/rspamd/local.d/greylist.conf")) { |
| rename("/etc/rspamd/local.d/greylist.conf", "/etc/rspamd/
local.d/greylist.old"); | | rename("/etc/rspamd/local.d/greylist.conf", "/etc/rspamd/
local.d/greylist.old"); |
| } | | } |
| | |
| exec('chmod a+r /etc/rspamd/local.d/* /etc/rspamd/local.d/maps.d/
* /etc/rspamd/override.d/*'); | | exec('chmod a+r /etc/rspamd/local.d/* /etc/rspamd/local.d/maps.d/
* /etc/rspamd/override.d/*'); |
| # protect passwords in these files | | # protect passwords in these files |
|
| exec('chgrp _rspamd /etc/rspamd/local.d/redis.conf /etc/rspamd/lo | | exec('chgrp _rspamd /etc/rspamd/local.d/redis.conf /etc/rspamd/lo |
| cal.d/classifier-bayes.conf /etc/rspamd/local.d/worker-controller.inc'); | | cal.d/classifier-bayes.conf'); |
| exec('chmod 640 /etc/rspamd/local.d/redis.conf /etc/rspamd/local. | | exec('chmod 640 /etc/rspamd/local.d/redis.conf /etc/rspamd/local. |
| d/classifier-bayes.conf /etc/rspamd/local.d/worker-controller.inc'); | | d/classifier-bayes.conf'); |
| | |
| | if(file_exists('/etc/rspamd/local.d/worker-controller.inc')) { |
| | exec('chgrp _rspamd /etc/rspamd/local.d/worker-controller |
| | .inc'); |
| | exec('chmod 640 /etc/rspamd/local.d/worker-controller.inc |
| | '); |
| | } |
| | |
| # unneccesary, since this was done above? | | # unneccesary, since this was done above? |
| $command = 'usermod -a -G amavis _rspamd'; | | $command = 'usermod -a -G amavis _rspamd'; |
| 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"); |
| | |
| if(strpos(rf('/etc/rspamd/rspamd.conf'), '.include "$LOCAL_CONFDI
R/local.d/users.conf"') === false){ | | if(strpos(rf('/etc/rspamd/rspamd.conf'), '.include "$LOCAL_CONFDI
R/local.d/users.conf"') === false){ |
| af('/etc/rspamd/rspamd.conf', '.include "$LOCAL_CONFDIR/l
ocal.d/users.conf"'); | | af('/etc/rspamd/rspamd.conf', '.include "$LOCAL_CONFDIR/l
ocal.d/users.conf"'); |
| } | | } |
| | |
| if(!isset($mail_config['rspamd_password']) || !$mail_config['rspa
md_password']) { | | if(!isset($mail_config['rspamd_password']) || !$mail_config['rspa
md_password']) { |
| | | |
| End of changes. 3 change blocks. |
|---|
| 6 lines changed or deleted | | 13 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 