Commit ed68a9f4 authored by Robert Butora's avatar Robert Butora
Browse files

docker: fixes DB-driver loading and disables Resolver-by-DB (forces direct resolve from ivoid)

parent dc8dc4b9

data-access/servlet/src/main/java/cutout/webapi/ServletCutout.java

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class ServletCutout extends HttpServlet 
   protected static final Settings    settings   = Settings.getInstance();

   protected static final Subsurvey[] subsurveys = Subsurvey.loadSubsurveys(settings.fitsPaths.surveysMetadataAbsPathname());



   protected boolean resolveFromId    = settings.dbConn.isDbUriEmpty(); 

   protected boolean resolveFromId    = true;//FIXME separate setting authz is separate table settings.dbConn.isDbUriEmpty(); 

   protected boolean useEngineOverCli = settings.amqpConn.isHostnameEmpty();



   final String RESPONSE_ENCODING      = "utf-8";

docker/Dockerfile.soda

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ COPY deps/context.xml ${WEBAPP_DIR}/META-INF/context.xml 


# DB used for authorization

# Tomcat must load DB-driver (postgresql_*.jar), vlkb-soda does not explicitely load DB-drivers

COPY deps/postgresql-*.jar  /var/lib/tomcat9/lib

COPY deps/postgresql-*.jar  ${CATALINA_BASE}/lib





# modif permissions to allow run as non-root: need to config TSL and ROOT-CONTEXT

docker/deps/soda.logging.properties

+1 −1
Original line number Diff line number Diff line
@@ -68,4 +68,4 @@ ServletCutout.level = CONFIG 
ResolverFromId.level = INFO

SodaImpl.level = INFO

VlkbCli.level = INFO

AuthPolicyDb.level = INFO

docker/start-soda.sh.soda

+2 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ else 
      echo "db_schema=$AUTHZ_DB_SCHEMA"

      echo "db_user_name=$AUTHZ_DB_USERNAME"

      echo "db_password=$AUTHZ_DB_PASSWORD"

   } > $WEBAPP_DIR/WEB-INF/classes/authpolicy.properties

   } >> $WEBAPP_DIR/WEB-INF/classes/cutout.properties

   # cp $WEBAPP_DIR/WEB-INF/web-cutout-ia2token.xml $WEBAPP_DIR/WEB-INF/web.xml

fi
@@ -127,6 +127,7 @@ sed -i "s/.*ServletCutout\.level.*=.*/ServletCutout.level = $DBG_LEVEL/g" $CATAL 
sed -i "s/.*ResolverFromId\.level.*=.*/ResolverFromId.level = $DBG_LEVEL/g" $CATALINA_BASE/conf/soda.logging.properties

sed -i "s/.*SodaImpl\.level.*=.*/SodaImpl.level = $DBG_LEVEL/g" $CATALINA_BASE/conf/soda.logging.properties

sed -i "s/.*VlkbCli\.level.*=.*/VlkbCli.level = $DBG_LEVEL/g" $CATALINA_BASE/conf/soda.logging.properties

sed -i "s/.*AuthPolicyDb\.level.*=.*/AuthPolicyDb.level = $DBG_LEVEL/g" $CATALINA_BASE/conf/soda.logging.properties





date