From bced7561c96b74248a97cc2c45fc062eb155d446 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Fri, 13 Oct 2017 11:16:21 +0200
Subject: [PATCH] make-csr: extract a few functions

---
 evoacme/files/make-csr.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/evoacme/files/make-csr.sh b/evoacme/files/make-csr.sh
index f4a53533..1e39bef9 100755
--- a/evoacme/files/make-csr.sh
+++ b/evoacme/files/make-csr.sh
@@ -10,6 +10,9 @@
 real_ip_for_domain() {
   dig +short "$1" | grep -oE "([0-9]+\.){3}[0-9]+"
 }
+local_ip() {
+  ip a | grep brd | cut -d'/' -f1 | grep -oE "([0-9]+\.){3}[0-9]+"
+}
 
 get_domains() {
     echo "$vhostfile" | grep -q nginx
@@ -174,11 +177,11 @@ main() {
     LIVE_DIR="${CRT_DIR}/${VHOST}/live"
     CSR_FILE="${CSR_DIR}/${VHOST}.csr"
 
-    local_ip=$(ip a | grep brd | cut -d'/' -f1 | grep -oE "([0-9]+\.){3}[0-9]+")
+    LOCAL_IP=$(local_ip)
     if [ -n "${SRV_IP}" ]; then
-        SRV_IP="${SRV_IP} ${local_ip}"
+        SRV_IP="${SRV_IP} ${LOCAL_IP}"
     else
-        SRV_IP="${local_ip}"
+        SRV_IP="${LOCAL_IP}"
     fi
 
     vhostfile=$(first_vhost_file_found "${VHOST}")