diff --git a/ncac/package/cac.conf b/ncac/package/cac.conf index 2976450..45bfa3c 100644 --- a/ncac/package/cac.conf +++ b/ncac/package/cac.conf @@ -5,11 +5,16 @@ server { proxy_set_header Connection "upgrade"; location / { - root /home/xydl/static; + root /home/xydl/ncac/static; index index.html index.htm; } location /cac-api/ { proxy_pass http://127.0.0.1:8099/; } + + location /data { + alias /home/xydl/ncac/data; + autoindex on; + } } diff --git a/ncac/setup.sh b/ncac/setup.sh index 4229243..804f6b3 100644 --- a/ncac/setup.sh +++ b/ncac/setup.sh @@ -145,7 +145,7 @@ installNewCAC(){ cp package/${APP_NAME}.jar ${CAC_DIR}/ unzip -q package/static.zip -d ${CAC_DIR}/ cp package/cac.conf ${BASE_DIR}/conf/ - sed -i 's#/home/xydl/static#'${CAC_DIR}'/static#g' ${BASE_DIR}/conf/cac.conf + sed -i 's#/home/xydl/ncac#'${CAC_DIR}'#g' ${BASE_DIR}/conf/cac.conf echo ${CAC_DIR}" installed." unzip -qj package/${APP_NAME}.jar BOOT-INF/classes/application-prod.yml -d ${CAC_DIR}/config sleep 1 @@ -153,6 +153,7 @@ installNewCAC(){ sed -i 's/127.0.0.1:3306/'${DB_IP}':'${DB_PORT}'/' ${CAC_DIR}/config/application-prod.yml sed -i 's/username: iec/username: '${DB_USER}'/' ${CAC_DIR}/config/application-prod.yml sed -i 's/password: Iec@1043/password: '${DB_PASS}'/' ${CAC_DIR}/config/application-prod.yml + sed -i 's#/home/xydl/ncac#'${CAC_DIR}'#' ${CAC_DIR}/config/application-prod.yml echo '#!/bin/bash' > ${BIN_DIR}/startCac.sh echo 'if [ -n "$(ps -ef | grep '${APP_NAME}' | grep -v grep | awk '"'"'{print $2}'"'"')" ]; then' >> ${BIN_DIR}/startCac.sh