Compare commits
5 commits
Author | SHA1 | Date | |
---|---|---|---|
cbe6a7b6a7 | |||
|
9a3183d239 | ||
|
5dfca68212 | ||
|
9bf0157575 | ||
|
60ed3e8f51 |
5 changed files with 13 additions and 13 deletions
2
.gitmodules
vendored
2
.gitmodules
vendored
|
@ -1,3 +1,3 @@
|
|||
[submodule "tickLeiste"]
|
||||
path = tickLeiste
|
||||
url = ssh://gitolite@nerfingen.de:39999/tickLeiste
|
||||
url = https://git.nerfingen.de/Splittertech/tickLeiste.git
|
||||
|
|
|
@ -67,9 +67,9 @@ httpDefaultSettings = [httpDefaultSetting]
|
|||
httpConfigCodec :: TomlCodec HttpConfiguration
|
||||
httpConfigCodec =
|
||||
HttpConfiguration
|
||||
<$> Toml.configM Toml.text "InstanceName" .= instanceName
|
||||
<*> Toml.configM Toml.int "Port" .= port
|
||||
<*> Toml.configM bindPreference "Bind" .= bindPref
|
||||
<$> Toml.configM Toml.text "instanceName" .= instanceName
|
||||
<*> Toml.configM Toml.int "port" .= port
|
||||
<*> Toml.configM bindPreference "bind" .= bindPref
|
||||
|
||||
httpConfigsCodec :: TomlCodec [HttpConfiguration]
|
||||
httpConfigsCodec = Toml.list httpConfigCodec "http"
|
||||
|
|
|
@ -55,9 +55,9 @@ httpsDefaultSettings = [httpsDefaultSetting]
|
|||
httpsConfigCodec' :: TomlCodec TLSConfiguration
|
||||
httpsConfigCodec' =
|
||||
TLSConfiguration
|
||||
<$> Toml.configM Toml.string "Certificate" .= certFile
|
||||
<*> Toml.configM (Toml.arrayOf Toml._String) "CertChain" .= certChain
|
||||
<*> Toml.configM Toml.string "KeyFile" .= keyFile
|
||||
<$> Toml.configM Toml.string "certificate" .= certFile
|
||||
<*> Toml.configM (Toml.arrayOf Toml._String) "certChain" .= certChain
|
||||
<*> Toml.configM Toml.string "keyFile" .= keyFile
|
||||
|
||||
httpsConfigCodec :: TomlCodec HttpsConfiguration
|
||||
httpsConfigCodec = Toml.pair httpConfigCodec httpsConfigCodec'
|
||||
|
|
|
@ -41,9 +41,12 @@ dependencies:
|
|||
- containers
|
||||
- wai
|
||||
- wai-websockets
|
||||
# only used for the error message on missing webclient
|
||||
- http-types
|
||||
- tomland
|
||||
- validation-selective
|
||||
# if we want more interaction with tomland errors this might
|
||||
# be practical (not used atm, there are functions to Either)
|
||||
#- validation-selective
|
||||
- optparse-applicative
|
||||
- co-log
|
||||
- unliftio-core
|
||||
|
@ -83,5 +86,5 @@ tests:
|
|||
- -threaded
|
||||
- -rtsopts
|
||||
- -with-rtsopts=-N
|
||||
dependencies:
|
||||
- tickLeisteServer
|
||||
# dependencies:
|
||||
# - tickLeisteServer
|
||||
|
|
|
@ -63,7 +63,6 @@ executable tickLeisteServer
|
|||
, unliftio
|
||||
, unliftio-core
|
||||
, uuid
|
||||
, validation-selective
|
||||
, wai
|
||||
, wai-websockets
|
||||
, websockets
|
||||
|
@ -100,12 +99,10 @@ test-suite tickLeisteServer-test
|
|||
, text
|
||||
, tickLeiste
|
||||
, tickLeiste-aeson
|
||||
, tickLeisteServer
|
||||
, tomland
|
||||
, unliftio
|
||||
, unliftio-core
|
||||
, uuid
|
||||
, validation-selective
|
||||
, wai
|
||||
, wai-websockets
|
||||
, websockets
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue