reworked constants into configurable settings

src/Lib/Registry.hs

@@ -14,25 +14,9 @@ import           System.Directory
 import           System.FilePath
 import           Yesod.Core
 
-import           Constants
 import           Lib.Semver
 import           Lib.Types.Semver
 
-appResourceDir :: FilePath
-appResourceDir = resourcesDir </> "apps"
-
-sysResourceDir :: FilePath
-sysResourceDir = resourcesDir </> "sys"
-
-iconsResourceDir :: FilePath
-iconsResourceDir = resourcesDir </> "icons"
-
-appManifestPath :: FilePath
-appManifestPath = appResourceDir </> appManifestFile
-
-appManifestFile :: FilePath
-appManifestFile = "apps.yaml"
-
 type Registry = HashMap String (HashMap AppVersion FilePath)
 
 newtype RegisteredAppVersion = RegisteredAppVersion (AppVersion, FilePath) deriving (Eq, Show)

src/Lib/Ssl.hs

@@ -1,58 +1,49 @@
 {-# LANGUAGE QuasiQuotes #-}
+{-# LANGUAGE RecordWildCards #-}
+
 module Lib.Ssl where
 
 import           Startlude
 
 import           Data.String.Interpolate.IsString
 import           System.Directory
-import           System.FilePath
 import           System.Process
-
-import           Constants
+import           Settings
 
 -- openssl genrsa -out key.pem 2048
 -- openssl req -new -key key.pem -out certificate.csr
 -- openssl x509 -req -in certificate.csr -signkey key.pem -out certificate.pem
 
-sslKeyLocation :: FilePath
-sslKeyLocation = sslPath </> "key.pem"
-
-sslCsrLocation :: FilePath
-sslCsrLocation = sslPath </> "certificate.csr"
-
-sslCertLocation :: FilePath
-sslCertLocation = sslPath </> "certificate.pem"
-
-checkForSslCert :: IO Bool
-checkForSslCert =
-    doesPathExist sslKeyLocation <&&> doesPathExist sslCertLocation
-
-generateSslKey :: IO ExitCode
-generateSslKey = rawSystem "openssl" ["genrsa", "-out", sslKeyLocation, "2048"]
-
-generateSslCert :: Text -> IO ExitCode
-generateSslCert name = rawSystem
-    "openssl"
-    ["req", "-new", "-key", sslKeyLocation, "-out", sslCsrLocation, "-subj", [i|/CN=#{name}.local|]]
-
-selfSignSslCert :: IO ExitCode
-selfSignSslCert = rawSystem
-    "openssl"
-    [ "x509"
-    , "-req"
-    , "-in"
-    , sslCsrLocation
-    , "-signkey"
-    , sslKeyLocation
-    , "-out"
-    , sslCertLocation
-    ]
-
-setupSsl :: IO ()
-setupSsl = do
+setupSsl :: AppSettings -> IO ()
+setupSsl AppSettings{..} = do
     exists <- checkForSslCert
     unless exists $ do
         void $ system $ "mkdir -p " <> sslPath
         void generateSslKey
-        void $ generateSslCert getRegistryHostname
+        void $ generateSslCert registryHostname
         void selfSignSslCert
+    where
+        checkForSslCert :: IO Bool
+        checkForSslCert =
+            doesPathExist sslKeyLocation <&&> doesPathExist sslCertLocation
+
+        generateSslKey :: IO ExitCode
+        generateSslKey = rawSystem "openssl" ["genrsa", "-out", sslKeyLocation, "2048"]
+
+        generateSslCert :: Text -> IO ExitCode
+        generateSslCert name = rawSystem
+            "openssl"
+            ["req", "-new", "-key", sslKeyLocation, "-out", sslCsrLocation, "-subj", [i|/CN=#{name}.local|]]
+
+        selfSignSslCert :: IO ExitCode
+        selfSignSslCert = rawSystem
+            "openssl"
+            [ "x509"
+            , "-req"
+            , "-in"
+            , sslCsrLocation
+            , "-signkey"
+            , sslKeyLocation
+            , "-out"
+            , sslCertLocation
+            ]