diff --git a/.env b/.env index 3f34a90..b702edb 100644 --- a/.env +++ b/.env @@ -2,7 +2,7 @@ TimeZone=America/New_York OLS_VERSION=1.6.8 -PHP_VERSION=lsphp72 +PHP_VERSION=lsphp73 MYSQL_DATABASE=wordpress MYSQL_ROOT_PASSWORD=password diff --git a/bin/acme.sh b/bin/acme.sh index 86de124..f649ba0 100755 --- a/bin/acme.sh +++ b/bin/acme.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -docker-compose exec litespeed su -c "/root/.acme.sh/acme.sh -issue ${1} -w /var/www/vhosts/${1}/html/" \ No newline at end of file +docker-compose exec litespeed su -c "/root/.acme.sh/acme.sh --issue -d ${1} -w /var/www/vhosts/${1}/html/" \ No newline at end of file diff --git a/bin/container/domainctl.sh b/bin/container/domainctl.sh index 0446cc3..b3e9825 100755 --- a/bin/container/domainctl.sh +++ b/bin/container/domainctl.sh @@ -67,7 +67,7 @@ add_ls_domain(){ } add_ols_domain(){ - perl -0777 -p -i -e 's/(vhTemplate centralConfigLog \{[^}]+)\}*(^.*listeners.*$)/\1$2 + perl -0777 -p -i -e 's/(vhTemplate docker \{[^}]+)\}*(^.*listeners.*$)/\1$2 member '${DOMAIN}' { vhDomain '${DOMAIN},${WWW_DOMAIN}' }/gmi' ${OLS_HTTPD_CONF}