diff --git a/.env b/.env deleted file mode 100644 index 555aa27..0000000 --- a/.env +++ /dev/null @@ -1,70 +0,0 @@ -# localtion for configuration files -ISS_FILEPATH=./config/iss.json -CONFIG_FILEPATH=./config/config.yaml - -### services ### - -# credentials -credentials_PGPASSWORD=rootpass - -# auth -auth_ELIXIR_ID=XC56EL11xx -auth_ELIXIR_SECRET=wHPVQaYXmdDHg - -# rabbitmq -rabbitmq_MQ_PASSWORD=test -rabbitmq_MQ_USER=test - -# postgres -postgres_POSTGRES_PASSWORD=rootpass - -# s3 -s3_MINIO_ROOT_USER=access -s3_MINIO_ROOT_PASSWORD=secretkey -s3_MINIO_SERVER_URL=http://127.0.0.1:9000 - -# data ingest pipeline # - -# download -download_DB_PASSWORD=download -download_DB_USER=download - -# finalize -finalize_BROKER_PASSWORD=finalize -finalize_BROKER_QUEUE=accession -finalize_BROKER_ROUTINGKEY=completed -finalize_BROKER_USER=finalize -finalize_DB_PASSWORD=finalize -finalize_DB_USER=finalize - -# ingest -ingest_BROKER_PASSWORD=ingest -ingest_BROKER_QUEUE=ingest -ingest_BROKER_ROUTINGKEY=archived -ingest_BROKER_USER=ingest -ingest_DB_PASSWORD=ingest -ingest_DB_USER=ingest -ingest_SCHEMA_TYPE=federated - -# mapper -mapper_BROKER_PASSWORD=mapper -mapper_BROKER_QUEUE=mappings -mapper_BROKER_USER=mapper -mapper_DB_PASSWORD=mapper -mapper_DB_USER=mapper - -# verify -verify_BROKER_PASSWORD=verify -verify_BROKER_QUEUE=archived -verify_BROKER_ROUTINGKEY=verified -verify_BROKER_USER=verify -verify_DB_PASSWORD=verify -verify_DB_USER=verify -verify_SCHEMA_TYPE=federated - -# s3inbox -s3inbox_BROKER_PASSWORD=inbox -s3inbox_BROKER_ROUTINGKEY=inbox -s3inbox_BROKER_USER=inbox -s3inbox_DB_PASSWORD=inbox -s3inbox_DB_USER=inbox diff --git a/config/config.yaml b/config/config.yaml deleted file mode 100644 index bcf9b23..0000000 --- a/config/config.yaml +++ /dev/null @@ -1,86 +0,0 @@ -app: # this is for download - host: "0.0.0.0" - port: "8443" - -archive: - type: "s3" - url: "http://s3" - port: 9000 - accesskey: "access" - secretkey: "secretkey" - bucket: "archive" - chunksize: 32 - -broker: - host: "rabbitmq" - port: 5672 - user: "" - password: "" - vhost: "sda" - queue: "" - exchange: "sda" - routingKey: "" - routingError: "error" - ssl: "false" - -c4gh: - passphrase: "c4ghpass" - filepath: "/shared/c4gh.sec.pem" - -db: - host: "postgres" - port: 5432 - user: "" - password: "" - database: "sda" - sslmode: "disable" - -inbox: - type: "s3" - url: "http://s3" - port: 9000 - accesskey: "access" - secretkey: "secretkey" - bucket: "inbox" - chunksize: 32 - -log: - level: "info" - format: "json" - -oidc: - # oidc configuration API must have values for "userinfo_endpoint" and "jwks_uri" - cacert: "/shared/cert/ca.crt" - trusted: - iss: "/iss.json" - -grpc: - host: "reencrypt" - port: 50443 - cacert: "/shared/cert/ca.crt" - serverkey: "/shared/cert/server.key" - servercert: "/shared/cert/server.crt" - clientkey: "/shared/cert/client.key" - clientcert: "/shared/cert/client.crt" - timeout: 5 - -schema: - type: isolated - -session: - # session key expiration time in seconds - # default value = -1 for disabled state - # a positive integer enables sessions - # a negative integer disables sessions - expiration: 28800 - # domain name must be set to the hostname (FQDN) of the service - domain: "localhost" - # session cookie Secure value, if true, TLS must be active - # default value = true - secure: true - # session cookie HttpOnly value, if true, TLS must be active - # default value = true - httponly: true - # name of session cookie - # default value = sda_session_key - name: "sda_session_key" diff --git a/config/config.yaml.example b/config/config.yaml.example index 23e02f0..bcf9b23 100644 --- a/config/config.yaml.example +++ b/config/config.yaml.example @@ -54,6 +54,16 @@ oidc: trusted: iss: "/iss.json" +grpc: + host: "reencrypt" + port: 50443 + cacert: "/shared/cert/ca.crt" + serverkey: "/shared/cert/server.key" + servercert: "/shared/cert/server.crt" + clientkey: "/shared/cert/client.key" + clientcert: "/shared/cert/client.crt" + timeout: 5 + schema: type: isolated @@ -73,4 +83,4 @@ session: httponly: true # name of session cookie # default value = sda_session_key - name: "sda_session_key" \ No newline at end of file + name: "sda_session_key" diff --git a/config/iss.json b/config/iss.json deleted file mode 100644 index 9d8e95d..0000000 --- a/config/iss.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "iss": "https://oidc:8080/", - "jku": "https://oidc:8080/jwk" - }, - { - "iss": "http://aai-mock:8080/oidc/", - "jku": "http://aai-mock:8080/oidc/jwk" - }, - { - "iss": "http://demo1.example", - "jku": "htts://mockauth:8080/jwk" - } -] \ No newline at end of file