Skip to content

Commit 55c54a8

Browse files
author
Marius Burkard
committed
Merge branch 'stable-3.1'
2 parents 8cc6b5a + 7ddeb2a commit 55c54a8

File tree

13 files changed

+72
-18
lines changed

13 files changed

+72
-18
lines changed

‎helper_scripts/mydns_to_powerdns_migration.php‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,28 @@
3131
{
3232
$file2=$row2['data'];
3333
}
34+
35+
//
36+
// Fix for 'domain.ext.' apex notation
37+
//
38+
$record_name_end=substr($row2['name'], -1);
39+
if ($record_name_end==".")
40+
{
41+
// remove trailing dot from apex
42+
$record_name = substr($row2['name'], 0, strlen($row2['name'])-1);
43+
}
44+
else
45+
{
46+
// add domain to make it a fqdn
47+
$record_name = $row2['name'] . "." . $row3['origin'];
48+
}
49+
50+
print "$row2[name].$row3[origin]" . " $record_name\r\n";
3451
mysql_select_db("dbispconfig");
3552
$sql3 = mysql_query("SELECT substr(origin,1, LENGTH(origin)-1) AS origin FROM dns_soa where id=$row2[zone];");
3653
$row3 = mysql_fetch_array($sql3);
3754
mysql_select_db("powerdns");
38-
mysql_query("INSERT INTO records (domain_id,name,content,ispconfig_id,type,ttl,prio,change_date) values ('$row2[zone]','$row2[name].$row3[origin]','$file2','$row2[id]','$row2[type]','$row2[ttl]','$row2[aux]','1260446221');");
55+
mysql_query("INSERT INTO records (domain_id,name,content,ispconfig_id,type,ttl,prio,change_date) values ('$row2[zone]','$record_name','$file2','$row2[id]','$row2[type]','$row2[ttl]','$row2[aux]','1260446221');");
3956
}
4057
else
4158
{

‎install/dist/lib/centos_base.lib.php‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,21 @@ public function configure_amavis() {
4848
$content = str_replace('{mysql_server_ip}', $conf['mysql']['ip'], $content);
4949
$content = str_replace('{hostname}', $conf['hostname'], $content);
5050
$content = str_replace('/var/spool/amavisd/clamd.sock', $this->clamav_socket, $content);
51-
$content = str_replace('{amavis_config_dir}', $conf['amavis']['config_dir']);
51+
$content = str_replace('{amavis_config_dir}', $conf['amavis']['config_dir'], $content);
5252
wf($conf["amavis"]["config_dir"].'/amavisd.conf', $content);
5353
chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0640);
5454

55+
if(!is_file($conf['amavis']['config_dir'].'/60-dkim')) {
56+
touch($conf['amavis']['config_dir'].'/60-dkim');
57+
chmod($conf['amavis']['config_dir'].'/60-dkim', 0640);
58+
}
59+
5560
// for CentOS 7.2 only
5661
if($dist['confid'] == 'centos72') {
5762
chmod($conf['amavis']['config_dir'].'/amavisd.conf', 0750);
5863
chgrp($conf['amavis']['config_dir'].'/amavisd.conf', 'amavis');
64+
chmod($conf['amavis']['config_dir'].'/60-dkim', 0750);
65+
chgrp($conf['amavis']['config_dir'].'/60-dkim', 'amavis');
5966
}
6067

6168

‎install/lib/install.lib.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ function get_distname() {
180180
break;
181181
default:
182182
$relname = "UNKNOWN";
183+
$distconfid = 'ubuntu1604';
183184
}
184185
$distver = $ver.$lts." ".$relname;
185186
swriteln("Operating System: ".$distname.' '.$distver."\n");
@@ -230,7 +231,8 @@ function get_distname() {
230231
} else {
231232
$distname = 'Debian';
232233
$distver = 'Unknown';
233-
$distid = 'debian40';
234+
$distid = 'debian60';
235+
$distconfid = 'debian90';
234236
$distbaseid = 'debian';
235237
swriteln("Operating System: Debian or compatible, unknown version.\n");
236238
}

‎install/tpl/mysql-virtual_policy_greylist.cf.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
user = {mysql_server_ispconfig_user}
22
password = {mysql_server_ispconfig_password}
33
dbname = {mysql_server_database}
4-
query = SELECT 'greylisting' FROM (SELECT greylisting, source AS email FROM mail_forwarding WHERE server_id = {server_id} UNION SELECT greylisting, email FROM mail_user WHERE server_id = {server_id}) addresses WHERE addresses.email='%s' AND addresses.greylisting='y'
4+
query = SELECT 'greylisting' FROM (SELECT greylisting, source AS email FROM mail_forwarding WHERE server_id = {server_id} UNION SELECT greylisting, email FROM mail_user WHERE server_id = {server_id}) addresses WHERE addresses.email='%s' AND addresses.greylisting='y' UNION SELECT 'greylisting' FROM `mail_forwarding` f CROSS JOIN `mail_user` u ON u.email = f.destination WHERE f.type = 'catchall' AND u.greylisting = 'y' AND u.server_id = {server_id} AND f.source = '@%s'
55
hosts = {mysql_server_ip}

‎interface/lib/classes/remote.d/server.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ public function server_get_app_version($session_id, $server_id = 0)
244244
return false;
245245
}
246246
if (!empty($session_id)) {
247-
if($server_id === 0) $ispc_app_version = array('ispc_app_version' => ISPC_APP_VERSION);
247+
if($server_id == 0) $ispc_app_version = array('ispc_app_version' => ISPC_APP_VERSION);
248248
else {
249249
$rec = $app->db->queryOneRecord("SELECT data FROM monitor_data WHERE type = 'ispc_info' AND server_id = ?", $server_id);
250250
$rec = unserialize($rec['data']);

‎interface/web/dns/templates/dns_dmarc_edit.htm‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,13 @@ <h1><tmpl_var name="list_head_txt"></h1>
136136
<select name="dmarc_sp" id="dmarc_sp" class="form-control">{tmpl_var name='dmarc_sp'}</select>
137137
</div>
138138
</div>
139+
140+
<div class="form-group">
141+
<label for="ttl" class="col-sm-2 control-label">{tmpl_var name='ttl_txt'}</label>
142+
<div class="col-sm-3">
143+
<input type="text" name="ttl" id="ttl" value="{tmpl_var name='ttl'}" class="form-control" />
144+
</div>
145+
</div>
139146

140147
<div class="form-group">
141148
<label class="col-sm-2 control-label">{tmpl_var name='active_txt'}</label>

‎interface/web/mail/xmpp_domain_edit.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ function onSubmit() {
223223
/* check if the domain module is used - and check if the selected domain can be used! */
224224
$app->uses('ini_parser,getconf');
225225
$settings = $app->getconf->get_global_config('domains');
226-
if ($settings['use_domain_module'] == 'y') {
226+
if ((isset($this->dataRecord['domain'])) && ($settings['use_domain_module'] == 'y')) {
227227
if ($_SESSION["s"]["user"]["typ"] == 'admin' || $app->auth->has_clients($_SESSION['s']['user']['userid'])) {
228228
$this->dataRecord['client_group_id'] = $app->tools_sites->getClientIdForDomain($this->dataRecord['domain']);
229229
}

‎server/conf/nginx_vhost.conf.master‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ server {
146146
location = /favicon.ico {
147147
log_not_found off;
148148
access_log off;
149+
expires max;
150+
add_header Cache-Control "public, must-revalidate, proxy-revalidate";
149151
}
150152

151153
location = /robots.txt {

‎server/conf/php-fcgi-starter.master‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ export TMPDIR=<tmpl_var name='document_root'>/tmp
1414
export TEMP=<tmpl_var name='document_root'>/tmp
1515
exec <tmpl_var name='php_fcgi_bin'> \
1616
<tmpl_if name="security_level" op="==" value="20"> -d open_basedir="<tmpl_var name='open_basedir'>" \
17-
-d disable_functions="" \
18-
-d suhosin.executor.func.blacklist="" \
1917
-d upload_tmp_dir=<tmpl_var name='document_root'>/tmp \
2018
-d session.save_path=<tmpl_var name='document_root'>/tmp \
2119
-d sendmail_path="/usr/sbin/sendmail -t -i -f webmaster@<tmpl_var name='domain'>" \

‎server/conf/vhost.conf.master‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182

183183
<tmpl_if name='python' op='==' value='y'>
184184
<IfModule mod_python.c>
185-
<Directory {tmpl_var name='web_document_root_www'}>
185+
<Directory {tmpl_var name='web_document_root'}>
186186
<FilesMatch "\.py$">
187187
SetHandler mod_python
188188
</FilesMatch>
@@ -362,10 +362,10 @@
362362
Action php5-fcgi /php5-fcgi virtual
363363
Alias /php5-fcgi {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'}
364364
<tmpl_if name='use_tcp'>
365-
FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -host 127.0.0.1:<tmpl_var name='fpm_port'> -pass-header Authorization
365+
FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -host 127.0.0.1:<tmpl_var name='fpm_port'> -pass-header Authorization -pass-header Content-Type
366366
</tmpl_if>
367367
<tmpl_if name='use_socket'>
368-
FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -socket <tmpl_var name='fpm_socket'> -pass-header Authorization
368+
FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/php5-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -socket <tmpl_var name='fpm_socket'> -pass-header Authorization -pass-header Content-Type
369369
</tmpl_if>
370370
</IfModule>
371371
<IfModule mod_proxy_fcgi.c>
@@ -428,7 +428,7 @@
428428
</Directory>
429429
Action hhvm-fcgi /hhvm-fcgi virtual
430430
Alias /hhvm-fcgi {tmpl_var name='document_root'}/cgi-bin/hhvm-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'}
431-
FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/hhvm-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -socket /var/run/hhvm/hhvm.<tmpl_var name='system_user'>.sock -pass-header Authorization
431+
FastCgiExternalServer {tmpl_var name='document_root'}/cgi-bin/hhvm-fcgi-{tmpl_var name='ip_address'}-{tmpl_var name='port'}-{tmpl_var name='domain'} -idle-timeout 300 -socket /var/run/hhvm/hhvm.<tmpl_var name='system_user'>.sock -pass-header Authorization -pass-header Content-Type
432432
</IfModule>
433433
<IfModule mod_proxy_fcgi.c>
434434
<Directory {tmpl_var name='document_root'}/cgi-bin>

0 commit comments

Comments
 (0)