evolix
/
evoadmin-web
18
0
Fork 1
Code Issues 33 Pull Requests 6 Releases 1 Wiki Activity

bugfixes for the evoacme part

This commit is contained in:
Nicolas Roman 2019-07-15 17:06:50 +02:00
parent 4eaf3ad6d1
commit c218aebaae
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
inc/webadmin-letsencrypt.php
View File

@ -134,8 +134,7 @@ if (isset($_POST['submit'])) {
} }
// evoacme // evoacme
// $generateCert = $letsencrypt->generateSSLCertificate($params[1], false); $generateCert = $letsencrypt->generateSSLCertificate($params[1], false);
$generateCert = $letsencrypt->generateSSLCertificate($params[1]);
if (!$generateCert) { if (!$generateCert) {
$errorMessage = "Erreur : La génération de certificat a échoué.<br> $errorMessage = "Erreur : La génération de certificat a échoué.<br>

4
scripts/web-add.sh
View File

@ -909,7 +909,7 @@ op_generatesslcertificate() {
if [ "$test_mode" = "false" ]; then if [ "$test_mode" = "false" ]; then
evoacme "$vhost" evoacme "$vhost"
else else
TEST=1 evoacme "$vhost" DRY_RUN=1 evoacme "$vhost"
fi fi
else usage else usage
fi fi
@ -917,7 +917,7 @@ op_generatesslcertificate() {
op_updatesslvhost() { op_updatesslvhost() {
if [ $# -eq 1 ]; then if [ $# -eq 1 ]; then
vhostfile="/etc/apache2/sites-enabled/$1.conf" vhostfile="/etc/apache2/sites-available/$1.conf"
sed -i "s/:80>/:80 *:443>/" "$vhostfile" sed -i "s/:80>/:80 *:443>/" "$vhostfile"