diff options
| author | Peter Stadler <peter.stadler@student.uibk.ac.at> | 2021-02-05 21:39:54 +0100 |
|---|---|---|
| committer | Peter Stadler <peter.stadler@student.uibk.ac.at> | 2021-02-08 23:25:29 +0100 |
| commit | 36576c4c6342994ffdd12e73c09642ec6a15b7fa (patch) | |
| tree | 6be2e2c439de17429e983169b52e6c98adbcc8ba /net | |
| parent | d58304047f2c443462633d580730c2aa721b70bd (diff) | |
uacme: adopt to new behavior of nginx
Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
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 |