Browse Source

See Redmine 117756

Владимир Томишинец 5 years ago
parent
commit
9be232d024
1 changed files with 3 additions and 8 deletions
  1. 3 8
      docker-entrypoint.sh

+ 3 - 8
docker-entrypoint.sh

@@ -17,14 +17,9 @@ while [ $? -ne 0 ]; do
 done
 
 # See Redmine 108967
-admin_ip=$(dig tasks.${ADMIN_HOST}.${APPNET} +short)
-echo ${admin_ip} > /tmp/admin_ip
-
-# Для добавления логирования manager memcached. Redmine 107228
-#sed -i "s/CATALINA_OPTS=\"\$CATALINA_OPTS \$JPDA_OPTS\"/CATALINA_OPTS=\"\$CATALINA_OPTS \$JPDA_OPTS -Dnet.spy.log.LoggerImpl=net.spy.memcached.compat.log.SunLogger\"/" /opt/tomcat/bin/catalina.sh
-sed -i "s/DB_CLUSTER/\"${DB_CLUSTER}\"/" /etc/web-laboratory/application.conf
-sed -i "s/ADMIN_HOST/$(dig tasks.${ADMIN_HOST}.${APPNET} +short)/" /etc/web-laboratory/application.conf
-sed -i "s/NODE_HOST/$(dig ${HOSTNAME}.${APPNET} +short)/" /etc/web-laboratory/application.conf
+NODE_IP=$(dig ${HOSTNAME}.${APPNET} +short)
+ADMIN_IP=$(dig tasks.${ADMIN_HOST}.${APPNET} +short)
+echo ${ADMIN_IP} > /tmp/admin_ip
 
 # Добавлено логирование для manager memcached. Redmine 107228
 echo "de.javakaffee.web.msm.level = ${DEBUG}" >> /opt/tomcat/conf/logging.properties