Skip to content

Commit

Permalink
Merge pull request #126 from umccr/more-flexible-config-rename
Browse files Browse the repository at this point in the history
More flexible config
  • Loading branch information
mmalenic authored Dec 23, 2022
2 parents db0f39f + ad096c8 commit 5f0ea19
Show file tree
Hide file tree
Showing 36 changed files with 2,744 additions and 1,156 deletions.
13 changes: 11 additions & 2 deletions htsget-config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,18 @@ s3-storage = []
default = ["s3-storage"]

[dependencies]
noodles = { version = "0.29", features = ["core"] }
serde = { version = "1.0", features = ["derive"] }
serde_with = "2.1"
serde_regex = "1.1"
regex = "1.6"
envy = "0.4"
figment = { version = "0.10", features = ["env", "toml"] }
clap = { version = "4.0", features = ["derive", "env"] }
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["registry", "env-filter"] }
tracing-subscriber = { version = "0.3", features = ["registry", "env-filter"] }
toml = "0.5"
http = "0.2"
http-serde = "1.1"

[dev-dependencies]
figment = { version = "0.10", features = ["test"] }
337 changes: 293 additions & 44 deletions htsget-config/README.md

Large diffs are not rendered by default.

45 changes: 45 additions & 0 deletions htsget-config/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
ticket_server_addr = '127.0.0.1:8080'
ticket_server_cors_allow_credentials = false
ticket_server_cors_allow_origins = ['http://localhost:8080']
ticket_server_cors_allow_headers = 'All'
ticket_server_cors_allow_methods = 'All'
ticket_server_cors_max_age = 86400
ticket_server_cors_expose_headers = []

data_server = "None"
#data_server_disabled = true
data_server_addr = '127.0.0.1:8082'
data_server_local_path = 'data'
data_server_serve_at = '/data'
data_server_cors_allow_credentials = false
data_server_cors_allow_origins = ['http://localhost:8080']
data_server_cors_allow_headers = 'All'
data_server_cors_allow_methods = 'All'
data_server_cors_max_age = 86400
data_server_cors_expose_headers = []

[[resolvers]]
regex = '.*'
substitution_string = '$0'

[resolvers.storage_type]
type = 'Local'
scheme = 'Http'
authority = '127.0.0.1:8081'
local_path = 'data'
path_prefix = '/data'

[resolvers.guard]
allow_reference_names = 'All'
allow_fields = 'All'
allow_tags = 'All'
allow_formats = [
'BAM',
'CRAM',
'VCF',
'BCF',
]
allow_classes = [
'body',
'header',
]
286 changes: 0 additions & 286 deletions htsget-config/src/config.rs

This file was deleted.

Loading

0 comments on commit 5f0ea19

Please sign in to comment.