- Fixed letsencrypt call

Marius Cramer · Marius Cramer · commit a7b97c4310d8 · 2015-12-08T16:58:01.000+01:00
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
@@ -1146,7 +1146,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")) {
-						$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 --webroot-path --email postmaster@$domain --domains $lddomain --webroot-path " . escapeshellarg($webroot));
+						$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));
 					}
 				};
 
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
@@ -1183,7 +1183,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")) {
-					$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 --webroot-path --email postmaster@$domain --domains $lddomain --webroot-path " . escapeshellarg($webroot));
+					$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));
 				}
 			};
 

Original file line number	Diff line number	Diff line change
`@@ -1146,7 +1146,7 @@ function update($event_name, $data) {`
`1146`	`1146`	`$app->system->chmod($webroot . "/.well-known/acme-challenge", "g+s");`
`1147`	`1147`
`1148`	`1148`	`if(file_exists("/root/.local/share/letsencrypt/bin/letsencrypt")) {`
`1149`		`- $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 --webroot-path --email postmaster@$domain --domains $lddomain --webroot-path " . escapeshellarg($webroot));`
	`1149`	`+ $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));`
`1150`	`1150`	`}`
`1151`	`1151`	`};`
`1152`	`1152`
Original file line number	Diff line number	Diff line change
`@@ -1183,7 +1183,7 @@ function update($event_name, $data) {`
`1183`	`1183`	`$app->system->chmod($webroot . "/.well-known/acme-challenge", "g+s");`
`1184`	`1184`
`1185`	`1185`	`if(file_exists("/root/.local/share/letsencrypt/bin/letsencrypt")) {`
`1186`		`- $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 --webroot-path --email postmaster@$domain --domains $lddomain --webroot-path " . escapeshellarg($webroot));`
	`1186`	`+ $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));`
`1187`	`1187`	`}`
`1188`	`1188`	`};`
`1189`	`1189`