- added missing language entry

- fixed letsencrypt domain list

Author: Marius Cramer

interface/web/sites/lib/lang/de_web_vhost_domain.lng

@@ -142,4 +142,5 @@ $wb['load_client_data_txt'] = 'Kundendaten übernehmen';
 $wb['load_my_data_txt'] = 'Meine Kontaktdaten laden';
 $wb['reset_client_data_txt'] = 'Daten verwerfen';
 $wb["document_root_txt"] = "Document Root";
+$wb['ssl_letsencrypt_txt'] = 'Let\'s Encrypt SSL';
 ?>

interface/web/sites/lib/lang/en_web_vhost_domain.lng

@@ -144,4 +144,5 @@ $wb['load_client_data_txt'] = 'Load client details';
 $wb['load_my_data_txt'] = 'Load my contact details';
 $wb['reset_client_data_txt'] = 'Reset data';
 $wb["document_root_txt"] = "Document Root";
+$wb['ssl_letsencrypt_txt'] = 'Let\'s Encrypt SSL';
 ?>

server/plugins-available/apache2_plugin.inc.php

@@ -1097,6 +1097,7 @@ function update($event_name, $data) {
 		// Check if a SSL cert exists
 		$ssl_dir = $data['new']['document_root'].'/ssl';
 		$domain = $data['new']['ssl_domain'];
+		if(!$domain) $domain = $data['new']['domain'];
 		$key_file = $ssl_dir.'/'.$domain.'.key';
 		$crt_file = $ssl_dir.'/'.$domain.'.crt';
 		$bundle_file = $ssl_dir.'/'.$domain.'.bundle';
@@ -1152,6 +1153,7 @@ function update($event_name, $data) {
 					$app->system->chmod($webroot . "/.well-known/acme-challenge", "g+s");
 
 					if(file_exists("/root/.local/share/letsencrypt/bin/letsencrypt")) {
+						print "/root/.local/share/letsencrypt/bin/letsencrypt auth --text --agree-tos --authenticator=webroot --server=https://acme-v01.api.letsencrypt.org/directory --rsa-key-size=4096 --email postmaster@$domain --domains $lddomain --webroot-path " . escapeshellarg($webroot) . "\n";
 						$this->_exec("/root/.local/share/letsencrypt/bin/letsencrypt auth --text --agree-tos --authenticator=webroot --server=https://acme-v01.api.letsencrypt.org/directory --rsa-key-size=4096 --email postmaster@$domain --domains $lddomain --webroot-path " . escapeshellarg($webroot));
 					}
 				};

server/plugins-available/nginx_plugin.inc.php

@@ -1144,6 +1144,7 @@ function update($event_name, $data) {
 		$ssl_dir = $data['new']['document_root'].'/ssl';
 		if(!isset($data['new']['ssl_domain']) OR empty($data['new']['ssl_domain'])) { $data['new']['ssl_domain'] = $data['new']['domain']; }
 		$domain = $data['new']['ssl_domain'];
+		if(!$domain) $domain = $data['new']['domain'];
 		$tpl->setVar('ssl_domain', $domain);
 		$key_file = $ssl_dir.'/'.$domain.'.key';
 		$crt_file = $ssl_dir.'/'.$domain.'.crt';