Commit 9f5cb199 authored by Robert Butora's avatar Robert Butora
Browse files

docker/db: removes db_schema from params (set by db-user at db init)

parent b8d0d86d

data-discovery/src/main/java/search/DbConnArgs.java

+1 −3
Original line number Diff line number Diff line
@@ -2,18 +2,16 @@ 
class DbConnArgs

{

   public String uri;

   public String schema;

   public String user_name;

   public String password;



   public String uri() {return uri;}

   public String schema() {return schema;}

   public String userName() {return user_name;}

   public String password() {return password;}



   public String toString()

   {

      return uri + "  schema[" + schema +  "] " + user_name;

      return uri +  " " + user_name;

   }

}

data-discovery/src/main/java/webapi/SearchSettings.java

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ class SearchSettings 
   {

      DbConnArgs dbConnArgs = new DbConnArgs();

      dbConnArgs.uri       = properties.getProperty("db_uri","jdbc:postgresql://localhost:5432/vialactea").strip();

      dbConnArgs.schema    = properties.getProperty("db_schema","ivoa").strip();

      dbConnArgs.user_name = properties.getProperty("db_user_name","").strip();

      dbConnArgs.password  = properties.getProperty("db_password","").strip();

data-discovery/src/main/resources/search.properties

+0 −1
Original line number Diff line number Diff line 


# database with 'obscore' table

# db_uri=jdbc:postgresql://localhost:5432/vialactea

# db_schema=ivoa

db_user_name=

db_password=

docker/start-siav2.sh

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ echo "<Context docBase=\"$WEBAPP_DIR\"/>" > $CATALINA_BASE/conf/Catalina/localho 
# configure DB with ObsTAP

{

   echo "db_uri=$DB_URI"

   echo "db_schema=$DB_SCHEMA"

   echo "db_user_name=$DB_USERNAME"

   echo "db_password=$DB_PASSWORD"

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