"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "server/lib/classes/letsencrypt.inc.php" between
ISPConfig-3.2.4.tar.gz and ISPConfig-3.2.5.tar.gz

About: ISPConfig is an ISP management and Hosting Control Panel (for different Managed Services).

letsencrypt.inc.php  (ISPConfig-3.2.4):letsencrypt.inc.php  (ISPConfig-3.2.5)
skipping to change at line 83 skipping to change at line 83
} else { } else {
$cert_arg = '--fullchain-file ' . escapeshellarg($bundle_ file) . ' --cert-file ' . escapeshellarg($cert_file); $cert_arg = '--fullchain-file ' . escapeshellarg($bundle_ file) . ' --cert-file ' . escapeshellarg($cert_file);
} }
$cmd = 'R=0 ; C=0 ; ' . $letsencrypt . ' --issue ' . $cmd . ' -w /usr/local/ispconfig/interface/acme --always-force-new-domain-key --keylength 40 96; R=$? ; if [[ $R -eq 0 || $R -eq 2 ]] ; then ' . $letsencrypt . ' --install-c ert ' . $cmd . ' --key-file ' . escapeshellarg($key_file) . ' ' . $cert_arg . ' --reloadcmd ' . escapeshellarg($this->get_reload_command()) . ' --log ' . escape shellarg($conf['ispconfig_log_dir'].'/acme.log') . '; C=$? ; fi ; if [[ $C -eq 0 ]] ; then exit $R ; else exit $C ; fi'; $cmd = 'R=0 ; C=0 ; ' . $letsencrypt . ' --issue ' . $cmd . ' -w /usr/local/ispconfig/interface/acme --always-force-new-domain-key --keylength 40 96; R=$? ; if [[ $R -eq 0 || $R -eq 2 ]] ; then ' . $letsencrypt . ' --install-c ert ' . $cmd . ' --key-file ' . escapeshellarg($key_file) . ' ' . $cert_arg . ' --reloadcmd ' . escapeshellarg($this->get_reload_command()) . ' --log ' . escape shellarg($conf['ispconfig_log_dir'].'/acme.log') . '; C=$? ; fi ; if [[ $C -eq 0 ]] ; then exit $R ; else exit $C ; fi';
return $cmd; return $cmd;
} }
public function get_certbot_script() { public function get_certbot_script() {
$letsencrypt = explode("\n", shell_exec('which letsencrypt certbo t /root/.local/share/letsencrypt/bin/letsencrypt /opt/eff.org/certbot/venv/bin/c ertbot')); $letsencrypt = explode("\n", shell_exec('which certbot /root/.loc al/share/letsencrypt/bin/letsencrypt /opt/eff.org/certbot/venv/bin/certbot letse ncrypt'));
$letsencrypt = reset($letsencrypt); $letsencrypt = reset($letsencrypt);
if(is_executable($letsencrypt)) { if(is_executable($letsencrypt)) {
return $letsencrypt; return $letsencrypt;
} else { } else {
return false; return false;
} }
} }
private function install_acme() { private function install_acme() {
$install_cmd = 'wget -O - https://get.acme.sh | sh'; $install_cmd = 'wget -O - https://get.acme.sh | sh';
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)