- fixed path variables in vhost file for LE

Author: Marius Burkard

server/plugins-available/apache2_plugin.inc.php

@@ -1153,10 +1153,6 @@ function update($event_name, $data) {
 		$crt_file = $ssl_dir.'/'.$domain.'.crt';
 		$bundle_file = $ssl_dir.'/'.$domain.'.bundle';
 
-		$vhost_data['ssl_crt_file'] = $crt_file;
-		$vhost_data['ssl_key_file'] = $key_file;
-		$vhost_data['ssl_bundle_file'] = $bundle_file;
-
 		if($data['new']['ssl'] == 'y' && $data['new']['ssl_letsencrypt'] == 'y') {
 			$domain = $data['new']['domain'];
 			if(substr($domain, 0, 2) === '*.') {
@@ -1174,6 +1170,10 @@ function update($event_name, $data) {
 			$bundle_file = $ssl_dir.'/'.$domain.'-le.bundle';
 		}
 
+		$vhost_data['ssl_crt_file'] = $crt_file;
+		$vhost_data['ssl_key_file'] = $key_file;
+		$vhost_data['ssl_bundle_file'] = $bundle_file;
+
 		//* Generate Let's Encrypt SSL certificat
 		if($data['new']['ssl'] == 'y' && $data['new']['ssl_letsencrypt'] == 'y' && ( // ssl and let's encrypt is active
 			($data['old']['ssl'] == 'n' || $data['old']['ssl_letsencrypt'] == 'n') // we have new let's encrypt configuration

server/plugins-available/nginx_plugin.inc.php

@@ -1223,10 +1223,6 @@ function update($event_name, $data) {
 		$csr_file = $ssl_dir.'/'.$domain.'.csr';
 		$crt_file = $ssl_dir.'/'.$domain.'.crt';
 
-		$vhost_data['ssl_crt_file'] = $crt_file;
-		$vhost_data['ssl_key_file'] = $key_file;
-		$vhost_data['ssl_bundle_file'] = $bundle_file;
-
 		$tpl->setVar('ssl_letsencrypt', "n");
 
 		if($data['new']['ssl'] == 'y' && $data['new']['ssl_letsencrypt'] == 'y') {
@@ -1246,6 +1242,10 @@ function update($event_name, $data) {
 			$bundle_file = $ssl_dir.'/'.$domain.'-le.bundle';
 		}
 
+		$vhost_data['ssl_crt_file'] = $crt_file;
+		$vhost_data['ssl_key_file'] = $key_file;
+		$vhost_data['ssl_bundle_file'] = $bundle_file;
+
 		//* Generate Let's Encrypt SSL certificat
 		if($data['new']['ssl'] == 'y' && $data['new']['ssl_letsencrypt'] == 'y' && ( // ssl and let's encrypt is active
 			($data['old']['ssl'] == 'n' || $data['old']['ssl_letsencrypt'] == 'n') // we have new let's encrypt configuration