Compare commits

...
Sign in to create a new pull request.

5 commits

Author SHA1 Message Date
cbe6a7b6a7
changed submodule url to forgejo 2025-05-10 14:42:07 +02:00
Dennis Frieberg
9a3183d239 made all config params start lower case 2022-01-04 23:44:06 +01:00
Dennis Frieberg
5dfca68212 changes propagated to cabal 2022-01-03 00:02:41 +01:00
Dennis Frieberg
9bf0157575 removed lib dependency from test 2022-01-02 23:59:36 +01:00
Dennis Frieberg
60ed3e8f51 cleaned up some dependencies 2021-04-11 14:51:05 +02:00
5 changed files with 13 additions and 13 deletions

2
.gitmodules vendored
View file

@ -1,3 +1,3 @@
[submodule "tickLeiste"]
path = tickLeiste
url = ssh://gitolite@nerfingen.de:39999/tickLeiste
url = https://git.nerfingen.de/Splittertech/tickLeiste.git

View file

@ -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"

View file

@ -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'

View file

@ -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

View file

@ -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