- fallback to ww. on letsencrypt path

- typo

Author: Marius Burkard

interface/web/sites/ajax_get_json.php

@@ -50,7 +50,7 @@
 	$web_config = $app->getconf->get_server_config($server_id, 'web');
 	if(!empty($web_config['server_type'])) $server_type = $web_config['server_type'];
 	$json .= $server_type;
-	unset($webconfig);
+	unset($web_config);
 	$json .= '"}';
 }
 

server/plugins-available/apache2_plugin.inc.php

@@ -1254,6 +1254,11 @@ function update($event_name, $data) {
 			$crt_tmp_file = "/etc/letsencrypt/live/".$domain."/cert.pem";
 			$key_tmp_file = "/etc/letsencrypt/live/".$domain."/privkey.pem";
 			$bundle_tmp_file = "/etc/letsencrypt/live/".$domain."/chain.pem";
+			if(!is_dir("/etc/letsencrypt/live/".$domain)) {
+				$crt_tmp_file = "/etc/letsencrypt/live/www.".$domain."/fullchain.pem";
+				$key_tmp_file = "/etc/letsencrypt/live/www.".$domain."/privkey.pem";
+				$bundle_tmp_file = "/etc/letsencrypt/live/www.".$domain."/chain.pem";
+			}
 			$webroot = $data['new']['document_root']."/web";
 
 			//* check if we have already a Let's Encrypt cert

server/plugins-available/nginx_plugin.inc.php

@@ -1328,6 +1328,10 @@ function update($event_name, $data) {
 			//* TODO: check dns entry is correct
 			$crt_tmp_file = "/etc/letsencrypt/live/".$domain."/fullchain.pem";
 			$key_tmp_file = "/etc/letsencrypt/live/".$domain."/privkey.pem";
+			if(!is_dir("/etc/letsencrypt/live/".$domain)) {
+				$crt_tmp_file = "/etc/letsencrypt/live/www.".$domain."/fullchain.pem";
+				$key_tmp_file = "/etc/letsencrypt/live/www.".$domain."/privkey.pem";
+			}
 			$webroot = $data['new']['document_root']."/web";
 
 			//* check if we have already a Let's Encrypt cert