Skip to content

Commit b0fbbba

Browse files
florian030florian030
committed
Merge branch 'develop' of git.ispconfig.org:ispconfig/ispconfig3 into develop
2 parents a6f97c3 + 54b0478 commit b0fbbba

File tree

10 files changed

+41
-61
lines changed

10 files changed

+41
-61
lines changed

‎install/lib/installer_base.lib.php‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2718,7 +2718,7 @@ private function curl_request($url, $use_ipv6 = false) {
27182718
return $response;
27192719
}
27202720

2721-
private function make_acme_vhost($server_name, $server = 'apache') {
2721+
private function make_acme_vhost($server_name, $server = 'apache', $restart = true) {
27222722
global $conf;
27232723

27242724
$use_template = 'apache_acme.conf.master';
@@ -2756,12 +2756,13 @@ private function make_acme_vhost($server_name, $server = 'apache') {
27562756
if(!@is_link($vhost_conf_enabled_dir.'' . $use_symlink)) {
27572757
symlink($vhost_conf_dir.'/' . $use_name, $vhost_conf_enabled_dir.'/' . $use_symlink);
27582758
}
2759-
2760-
if($conf[$server]['installed'] == true && $conf[$server]['init_script'] != '') {
2761-
if($this->is_update) {
2762-
system($this->getinitcommand($conf[$server]['init_script'], 'force-reload').' &> /dev/null || ' . $this->getinitcommand($conf[$server]['init_script'], 'restart').' &> /dev/null');
2763-
} else {
2764-
system($this->getinitcommand($conf[$server]['init_script'], 'restart').' &> /dev/null');
2759+
if($restart === true) {
2760+
if($conf[$server]['installed'] == true && $conf[$server]['init_script'] != '') {
2761+
if($this->is_update) {
2762+
system($this->getinitcommand($conf[$server]['init_script'], 'force-reload').' &> /dev/null || ' . $this->getinitcommand($conf[$server]['init_script'], 'restart').' &> /dev/null');
2763+
} else {
2764+
system($this->getinitcommand($conf[$server]['init_script'], 'restart').' &> /dev/null');
2765+
}
27652766
}
27662767
}
27672768
}
@@ -2994,9 +2995,14 @@ public function make_ispconfig_ssl_cert() {
29942995
symlink($vhost_conf_dir.'/ispconfig.conf', $vhost_conf_enabled_dir.'/000-ispconfig.conf');
29952996
}
29962997
}
2997-
} elseif(($svr_ip4 && in_array($svr_ip4, $dns_ips)) || ($svr_ip6 && in_array($svr_ip6, $dns_ips))) {
2998-
// the directory already exists so we have to assume that it was created previously
2999-
$issued_successfully = true;
2998+
} else {
2999+
if($conf['apache']['installed'] == true) {
3000+
$this->make_acme_vhost($hostname, 'apache', false); // we need this config file but we don't want apache to be restarted at this point
3001+
}
3002+
if(($svr_ip4 && in_array($svr_ip4, $dns_ips)) || ($svr_ip6 && in_array($svr_ip6, $dns_ips))) {
3003+
// the directory already exists so we have to assume that it was created previously
3004+
$issued_successfully = true;
3005+
}
30003006
}
30013007

30023008
// If the LE SSL certs for this hostname exists

‎install/tpl/apache_acme.conf.master‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme/.well-known/acme-challenge
2-
3-
<Directory /usr/local/ispconfig/interface/acme>
4-
AllowOverride None
1+
Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme/.well-known/acme-challenge
2+
<Directory /usr/local/ispconfig/interface/acme/.well-known/acme-challenge>
53
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
64
Require all granted
75
<tmpl_else>
8-
Order allow,deny
9-
Allow from all
6+
Order allow,deny
7+
Allow from all
108
</tmpl_if>
11-
</Directory>
9+
<IfModule mpm_itk_module>
10+
AssignUserId ispconfig ispconfig
11+
</IfModule>
12+
</Directory>
13+

‎install/tpl/apache_ispconfig.conf.master‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -132,19 +132,6 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
132132

133133
Alias /awstats-icon "/usr/share/awstats/icon"
134134

135-
Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme/.well-known/acme-challenge
136-
<Directory /usr/local/ispconfig/interface/acme/.well-known/acme-challenge>
137-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
138-
Require all granted
139-
<tmpl_else>
140-
Order allow,deny
141-
Allow from all
142-
</tmpl_if>
143-
<IfModule mpm_itk_module>
144-
AssignUserId ispconfig ispconfig
145-
</IfModule>
146-
</Directory>
147-
148135
NameVirtualHost *:80
149136
NameVirtualHost *:443
150137
<tmpl_loop name="ip_adresses">

‎interface/web/dashboard/dashlets/databasequota.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function show() {
1111
return;
1212
}
1313

14-
$modules = $_SESSION['s']['user']['modules'];
14+
$modules = explode(',', $_SESSION['s']['user']['modules']);
1515
if (!in_array($modules, 'sites')) {
1616
return '';
1717
}

‎interface/web/dashboard/dashlets/quota.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function show() {
1111
return;
1212
}
1313

14-
$modules = $_SESSION['s']['user']['modules'];
14+
$modules = explode(',', $_SESSION['s']['user']['modules']);
1515
if (!in_array($modules, 'sites')) {
1616
return '';
1717
}

‎server/conf/apache_ispconfig.conf.master‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -127,19 +127,6 @@ CustomLog "| /usr/local/ispconfig/server/scripts/vlogger -s access.log -t \"%Y%m
127127

128128
Alias /awstats-icon "/usr/share/awstats/icon"
129129

130-
Alias /.well-known/acme-challenge /usr/local/ispconfig/interface/acme/.well-known/acme-challenge
131-
<Directory /usr/local/ispconfig/interface/acme/.well-known/acme-challenge>
132-
<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
133-
Require all granted
134-
<tmpl_else>
135-
Order allow,deny
136-
Allow from all
137-
</tmpl_if>
138-
<IfModule mpm_itk_module>
139-
AssignUserId ispconfig ispconfig
140-
</IfModule>
141-
</Directory>
142-
143130
NameVirtualHost *:80
144131
NameVirtualHost *:443
145132
<tmpl_loop name="ip_adresses">

‎server/lib/classes/cron.d/100-monitor_database_size.inc.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,12 @@ public function onRunJob() {
9595
if(!is_numeric($quota)) continue;
9696

9797
if($quota < 1 || $quota > $data[$i]['size']) {
98-
print 'database ' . $rec['database_name'] . ' size does not exceed quota: ' . ($quota < 1 ? 'unlimited' : $quota) . ' (quota) > ' . $data[$i]['size'] . " (used)\n";
98+
//print 'database ' . $rec['database_name'] . ' size does not exceed quota: ' . ($quota < 1 ? 'unlimited' : $quota) . ' (quota) > ' . $data[$i]['size'] . " (used)\n";
9999
if($rec['quota_exceeded'] == 'y') {
100100
$app->dbmaster->datalogUpdate('web_database', array('quota_exceeded' => 'n'), 'database_id', $rec['database_id']);
101101
}
102102
} elseif($rec['quota_exceeded'] == 'n') {
103-
print 'database ' . $rec['database_name'] . ' size exceeds quota: ' . $quota . ' (quota) < ' . $data[$i]['size'] . " (used)\n";
103+
//print 'database ' . $rec['database_name'] . ' size exceeds quota: ' . $quota . ' (quota) < ' . $data[$i]['size'] . " (used)\n";
104104
$app->dbmaster->datalogUpdate('web_database', array('quota_exceeded' => 'y'), 'database_id', $rec['database_id']);
105105
}
106106
}

‎server/lib/classes/cron.d/100-monitor_hd_quota.inc.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,13 @@ public function onRunJob() {
112112
$groupname = $s[0];
113113
if (substr($groupname, 0, 6) == 'client') {
114114
if (isset($data['group'][$groupname])) {
115-
$data['group'][$groupname]['used'] += $s[1];
116-
$data['group'][$groupname]['soft'] += $s[2];
117-
$data['group'][$groupname]['hard'] += $s[3];
115+
$data['group'][$groupname]['used'] += $s[2];
116+
$data['group'][$groupname]['soft'] += $s[3];
117+
$data['group'][$groupname]['hard'] += $s[4];
118118
} else {
119-
$data['group'][$groupname]['used'] = $s[1];
120-
$data['group'][$groupname]['soft'] = $s[2];
121-
$data['group'][$groupname]['hard'] = $s[3];
119+
$data['group'][$groupname]['used'] = $s[2];
120+
$data['group'][$groupname]['soft'] = $s[3];
121+
$data['group'][$groupname]['hard'] = $s[4];
122122
}
123123
}
124124
}

‎server/lib/classes/monitor_tools.inc.php‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -561,13 +561,11 @@ public function _getLogData($log) {
561561
}
562562
break;
563563
case 'log_letsencrypt':
564-
if ($dist == 'debian') {
565-
$logfile = '/var/log/letsencrypt/letsencrypt.log';
566-
} elseif ($dist == 'redhat') {
567-
$logfile = '/var/log/letsencrypt/letsencrypt.log';
568-
} elseif ($dist == 'suse') {
569-
$logfile = '/var/log/letsencrypt/letsencrypt.log';
570-
} elseif ($dist == 'gentoo') {
564+
if(file_exists('/root/.acme.sh/acme.sh') && file_exists('/root/.acme.sh/acme.sh.log')) {
565+
$logfile = '/root/.acme.sh/acme.sh.log';
566+
} elseif(file_exists('/usr/local/ispconfig/server/scripts/acme.sh') && file_exists('/usr/local/ispconfig/server/scripts/acme.sh.log')) {
567+
$logfile = '/usr/local/ispconfig/server/scripts/acme.sh.log';
568+
} else {
571569
$logfile = '/var/log/letsencrypt/letsencrypt.log';
572570
}
573571
break;

‎server/plugins-available/mysql_clientdb_plugin.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ function process_host_list($action, $database_name, $database_user, $database_pa
137137
if($user_access_mode == 'r') $grants = 'SELECT';
138138
elseif($user_access_mode == 'rd') $grants = 'SELECT, DELETE, ALTER, DROP';
139139

140-
$database_name = str_replace('_', '\\_', $link->escape_string($database_name));
140+
$database_name = $link->escape_string($database_name);
141141

142142
if($action == 'GRANT') {
143143
if($user_access_mode == 'r' || $user_access_mode == 'rd') {

0 commit comments

Comments
 (0)