From fbfdc438eaf2a70d5fefda74c919edc76e82d0fd Mon Sep 17 00:00:00 2001
From: Pascal Dreissen <pascal@dreissen.nl>
Date: Tue, 05 Jul 2016 04:00:30 -0400
Subject: [PATCH] Fixed IPV6 regex https://git.ispconfig.org/ispconfig/ispconfig3/issues/4002
---
server/plugins-available/apache2_plugin.inc.php | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 73579c3..ec92e69 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -36,6 +36,7 @@
// private variables
var $action = '';
var $ssl_certificate_changed = false;
+ var $update_letsencrypt = false;
//* This function is called during ispconfig installation to determine
// if a symlink shall be created for this plugin.
@@ -485,8 +486,6 @@
if($this->action != 'insert') $this->action = 'update';
- $update_letsencrypt = false;
-
if($data['new']['type'] != 'vhost' && $data['new']['type'] != 'vhostsubdomain' && $data['new']['type'] != 'vhostalias' && $data['new']['parent_domain_id'] > 0) {
$old_parent_domain_id = intval($data['old']['parent_domain_id']);
@@ -506,7 +505,7 @@
$data['new'] = $tmp;
$data['old'] = $tmp;
$this->action = 'update';
- $update_letsencrypt = true;
+ $this->update_letsencrypt = true;
}
// load the server configuration options
@@ -1180,7 +1179,7 @@
($data['old']['ssl'] == 'n' || $data['old']['ssl_letsencrypt'] == 'n') // we have new let's encrypt configuration
|| ($data['old']['domain'] != $data['new']['domain']) // we have domain update
|| ($data['old']['subdomain'] != $data['new']['subdomain']) // we have new or update on "auto" subdomain
- || $update_letsencrypt == true
+ || $this->update_letsencrypt == true
)) {
// default values
$temp_domains = array();
@@ -1208,8 +1207,8 @@
if(is_array($aliasdomains)) {
foreach($aliasdomains as $aliasdomain) {
$temp_domains[] = $aliasdomain['domain'];
- if(isset($aliasdomain['subdomain']) && ! empty($aliasdomain['subdomain'])) {
- $temp_domains[] = $aliasdomain['subdomain'] . "." . $aliasdomain['domain'];
+ if(isset($aliasdomain['subdomain']) && ($aliasdomain['subdomain'] != "none")) {
+ $temp_domains[] = "www." . $aliasdomain['domain'];
}
}
}
@@ -1237,9 +1236,10 @@
$app->log("Create Let's Encrypt SSL Cert for: $domain", LOGLEVEL_DEBUG);
$success = false;
- $letsencrypt = array_shift( explode("\n", shell_exec('which letsencrypt certbot /root/.local/share/letsencrypt/bin/letsencrypt')) );
+ $letsencrypt = explode("\n", shell_exec('which letsencrypt certbot /root/.local/share/letsencrypt/bin/letsencrypt'));
+ $letsencrypt = reset($letsencrypt);
if(is_executable($letsencrypt)) {
- $success = $this->_exec($letsencrypt . " certonly --text --agree-tos --authenticator webroot --server https://acme-v01.api.letsencrypt.org/directory --rsa-key-size 4096 --email postmaster@$domain --domains $lddomain --webroot-path /usr/local/ispconfig/interface/acme <<< '1'");
+ $success = $this->_exec($letsencrypt . " certonly -n --text --agree-tos --expand --authenticator webroot --server https://acme-v01.api.letsencrypt.org/directory --rsa-key-size 4096 --email postmaster@$domain --domains $lddomain --webroot-path /usr/local/ispconfig/interface/acme");
}
if(!$success) {
// error issuing cert
@@ -2139,6 +2139,7 @@
$data['new'] = $tmp;
$data['old'] = $tmp;
$this->action = 'update';
+ $this->update_letsencrypt = true;
// just run the update function
$this->update($event_name, $data);
--
Gitblit v1.9.1