diff options
| author | Rosen Penev <rosenp@gmail.com> | 2021-02-08 22:18:45 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-08 22:18:45 -0800 |
| commit | d4ea3cba6f48a0b1ef2588d0c811b1c92d0a60e3 (patch) | |
| tree | 3b6073ff683123b18b6fcd511c6ee2baee1614c3 /net | |
| parent | 9351b1a0c0cf2f574adbb1168f969caf9fbd2dd6 (diff) | |
| parent | 36576c4c6342994ffdd12e73c09642ec6a15b7fa (diff) | |
Merge pull request #14665 from peter-stadler/uacme
uacme: adopt to new behavior of nginx
Diffstat (limited to 'net')
| -rw-r--r-- | net/uacme/files/run.sh | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/net/uacme/files/run.sh b/net/uacme/files/run.sh index 20b4076a2..aafcad82f 100644 --- a/net/uacme/files/run.sh +++ b/net/uacme/files/run.sh @@ -355,7 +355,23 @@ issue_cert() # commit and reload is in post_checks fi - if [ -e /etc/init.d/nginx ] && [ "$update_nginx" -eq "1" ]; then + local nginx_updated + nginx_updated=0 + if command -v nginx-util 2>/dev/null && [ "$update_nginx" -eq "1" ]; then + nginx_updated=1 + for domain in $domains; do + if [ "$APP" = "uacme" ]; then + nginx-util add_ssl "${domain}" uacme "$STATE_DIR/${main_domain}/cert.pem" \ + "$STATE_DIR/private/${main_domain}/key.pem" || nginx_updated=0 + else + nginx-util add_ssl "${domain}" acme "$STATE_DIR/${main_domain}/fullchain.cer" \ + "$STATE_DIR/${main_domain}/${main_domain}.key" || nginx_updated=0 + fi + done + # reload is in post_checks + fi + + if [ "$nginx_updated" -eq "0" ] && [ -w /etc/nginx/nginx.conf ] && [ "$update_nginx" -eq "1" ]; then if [ "$APP" = "uacme" ]; then sed -i "s#ssl_certificate\ .*#ssl_certificate $STATE_DIR/${main_domain}/cert.pem;#g" /etc/nginx/nginx.conf sed -i "s#ssl_certificate_key\ .*#ssl_certificate_key $STATE_DIR/private/${main_domain}/key.pem;#g" /etc/nginx/nginx.conf |