From 60ed3e8f512510d595848b9488aec93c5495c7a5 Mon Sep 17 00:00:00 2001 From: Dennis Frieberg Date: Sun, 11 Apr 2021 14:51:05 +0200 Subject: [PATCH 1/5] cleaned up some dependencies --- package.yaml | 5 ++++- tickLeisteServer.cabal | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package.yaml b/package.yaml index b902fa2..30c4809 100644 --- a/package.yaml +++ b/package.yaml @@ -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 diff --git a/tickLeisteServer.cabal b/tickLeisteServer.cabal index c14f24d..b1e69e3 100644 --- a/tickLeisteServer.cabal +++ b/tickLeisteServer.cabal @@ -63,7 +63,6 @@ executable tickLeisteServer , unliftio , unliftio-core , uuid - , validation-selective , wai , wai-websockets , websockets @@ -105,7 +104,6 @@ test-suite tickLeisteServer-test , unliftio , unliftio-core , uuid - , validation-selective , wai , wai-websockets , websockets From 9bf0157575761f48a1dbf0baf5704e1533bf2e9a Mon Sep 17 00:00:00 2001 From: Dennis Frieberg Date: Sun, 2 Jan 2022 23:59:36 +0100 Subject: [PATCH 2/5] removed lib dependency from test --- package.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.yaml b/package.yaml index 30c4809..4ad753d 100644 --- a/package.yaml +++ b/package.yaml @@ -86,5 +86,5 @@ tests: - -threaded - -rtsopts - -with-rtsopts=-N - dependencies: - - tickLeisteServer +# dependencies: +# - tickLeisteServer From 5dfca682120e291f8940563932f03cc0583eae05 Mon Sep 17 00:00:00 2001 From: Dennis Frieberg Date: Mon, 3 Jan 2022 00:02:41 +0100 Subject: [PATCH 3/5] changes propagated to cabal --- tickLeisteServer.cabal | 1 - 1 file changed, 1 deletion(-) diff --git a/tickLeisteServer.cabal b/tickLeisteServer.cabal index b1e69e3..c3823b5 100644 --- a/tickLeisteServer.cabal +++ b/tickLeisteServer.cabal @@ -99,7 +99,6 @@ test-suite tickLeisteServer-test , text , tickLeiste , tickLeiste-aeson - , tickLeisteServer , tomland , unliftio , unliftio-core From 9a3183d2393d219dfab5381cbfc83d4c0295ce9f Mon Sep 17 00:00:00 2001 From: Dennis Frieberg Date: Tue, 4 Jan 2022 23:44:06 +0100 Subject: [PATCH 4/5] made all config params start lower case --- app/Backend/Http.hs | 6 +++--- app/Backend/Https.hs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Backend/Http.hs b/app/Backend/Http.hs index e99c8be..4b6f813 100644 --- a/app/Backend/Http.hs +++ b/app/Backend/Http.hs @@ -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" diff --git a/app/Backend/Https.hs b/app/Backend/Https.hs index 69afa1e..01f2181 100644 --- a/app/Backend/Https.hs +++ b/app/Backend/Https.hs @@ -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' From cbe6a7b6a7b6a8a74b98e63c487cdcf6b871d5f6 Mon Sep 17 00:00:00 2001 From: Dennis Frieberg Date: Sat, 10 May 2025 14:42:07 +0200 Subject: [PATCH 5/5] changed submodule url to forgejo --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 9548495..166aaf1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "tickLeiste"] path = tickLeiste - url = ssh://gitolite@nerfingen.de:39999/tickLeiste + url = https://git.nerfingen.de/Splittertech/tickLeiste.git