Merge pull request #838 from OneZoom/install-fixes-via-eric

Install fixes via eric

install-nginx.sh

@@ -11,18 +11,17 @@ WWW_IMAGES_SERVER_NAME="$(echo ${WWW_SERVER_NAME} | sed 's/^w*/images/')"  # ima
 [ -d "/etc/nginx" ] && NGINX_PATH="/etc/nginx"
 [ -d "/usr/local/etc/nginx" ] && NGINX_PATH="/usr/local/etc/nginx"
 mkdir -p "${NGINX_PATH}/conf.d/"
-NGINX_LOG_PATH="/var/log/nginx"
+NGINX_LOG_PATH="/var/log/http"
 NGINX_CERT_PATH="/var/db/acme/live"
 NGINX_DHPARAM_PATH="${NGINX_PATH}/dhparam.pem"
-[ -d "/var/acme" ] && NGINX_CHALLENGE_PATH="/var/acme"
+NGINX_CHALLENGE_PATH="${NGINX_CHALLENGE_PATH-/var/acme}"
 
 # Generate NGINX_DHPARAM
 [ -e "${NGINX_DHPARAM_PATH}" ] || openssl dhparam -out "${NGINX_DHPARAM_PATH}" 4096
 
 if [ ! -f "${NGINX_CERT_PATH}/${WWW_SERVER_NAME}/privkey" ]; then
     # Fall back to self-signed bootstrap-cert
     NGINX_CERT_PATH="${NGINX_PATH}/snakeoil-certs"
-    NGINX_CHALLENGE_PATH="/dev/null"
     for SN in onezoom.org ${WWW_SERVER_NAME} ${WWW_IMAGES_SERVER_NAME}; do
         mkdir -p "${NGINX_CERT_PATH}/${SN}"
         if [ ! -e "${NGINX_CERT_PATH}/${SN}/privkey.pem" ]; then
@@ -35,6 +34,16 @@ if [ ! -f "${NGINX_CERT_PATH}/${WWW_SERVER_NAME}/privkey" ]; then
     done
 fi
 
+if [ ! -d "${NGINX_CHALLENGE_PATH}" ]; then
+    # No challenge path, acmetool is probably not installed
+    NGINX_CHALLENGE_PATH="/dev/null"
+fi
+
+if [ ! -d "${NGINX_LOG_PATH}" ]; then
+    # Ensure log dir exists
+    mkdir -p -- "${NGINX_LOG_PATH}"
+fi
+
 # Create NGINX config
 cat <<EOF > ${NGINX_PATH}/nginx.conf
 #### Generated by $0 - DO NOT EDIT