diff --git a/app/main.hs b/app/main.hs new file mode 100644 index 0000000..b94ea16 --- /dev/null +++ b/app/main.hs @@ -0,0 +1,5 @@ +import Application (appMain) +import Startlude + +main :: IO () +main = appMain diff --git a/config/ssl/certificate.csr b/config/ssl/certificate.csr new file mode 100644 index 0000000..4609edd --- /dev/null +++ b/config/ssl/certificate.csr @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICUjCCAToCAQAwDTELMAkGA1UEBhMCVVMwggEiMA0GCSqGSIb3DQEBAQUAA4IB +DwAwggEKAoIBAQDSOYNM9J2YS3la8G8CeGAJN+7CFf6C6SSOrLoW51NI8hEOR2AR +2Bnjszb5UFEVGi0WAUlIvanmKqCSyP7ks2ky964xjkHOO+CkDAxd36VexgJwqRau +sPngEya8nyvSVl3uoiSb2NkX9w0U0O7zfwUytrJI34m1EJIc+B22edG6anRLPKJ+ +1GXbb7tdl/OqCH9EzAxV6l6qTJIIDY5nahkx9GEPMXov3zBg76jnbpcruE0N+8hW +YCyLUdPChsLVn35rsmpG3LRN5RKGx1gNgPcq1o4ENW8WKB9QMMfE7vhzioWFwawG +7WqRFKY2R6c9/5o3ZDBs2PLO0pZNLjuh6rZfAgMBAAGgADANBgkqhkiG9w0BAQsF +AAOCAQEAwy2bsYQVchzJ48MmDRFve/NbcBu/Jwh8kDalDt1ugN6TfrHqqqVSz+hp +F7XeyS8K8Lu94e8azIMnhNKxG67yLJUkSFFALBJO2PnHN4jxjK5VXlWNtEc4bL0x +L0QGHOLduIXn9uCm0o5Q3j0k8twPK9k1+FcVCc4aNoHsB9Ub/H1T/9l4IjNKwIEW +uMoIENRPlFBZ4SZ/UYyx9Cka23JzU4J6bZsTlWJNnt8/lR+D3Ug9xPQoTlR9loRw +NgQQlhF+sqs0kXlriaXR+y93HH2uxZV6gugKcs2ckp3KM/Qax0fxWU6Siir+t7Ib +pBaz7Xb0NDIt7uktQm4ySfVyeQWzQg== +-----END CERTIFICATE REQUEST----- diff --git a/config/ssl/certificate.pem b/config/ssl/certificate.pem new file mode 100644 index 0000000..f42e8a2 --- /dev/null +++ b/config/ssl/certificate.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE----- +MIICljCCAX4CCQCUVP/RJvKF1DANBgkqhkiG9w0BAQUFADANMQswCQYDVQQGEwJV +UzAeFw0xOTEyMjEyMDM1MDBaFw0yMDAxMjAyMDM1MDBaMA0xCzAJBgNVBAYTAlVT +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0jmDTPSdmEt5WvBvAnhg +CTfuwhX+gukkjqy6FudTSPIRDkdgEdgZ47M2+VBRFRotFgFJSL2p5iqgksj+5LNp +MveuMY5BzjvgpAwMXd+lXsYCcKkWrrD54BMmvJ8r0lZd7qIkm9jZF/cNFNDu838F +MraySN+JtRCSHPgdtnnRump0SzyiftRl22+7XZfzqgh/RMwMVepeqkySCA2OZ2oZ +MfRhDzF6L98wYO+o526XK7hNDfvIVmAsi1HTwobC1Z9+a7JqRty0TeUShsdYDYD3 +KtaOBDVvFigfUDDHxO74c4qFhcGsBu1qkRSmNkenPf+aN2QwbNjyztKWTS47oeq2 +XwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQCTwhvM7g7SWI8XIOJRa3FKHq+IXCi5 +YQQkXqZH4v82UQNhhR6dNLBKu66ZGEflr0HnaqXl8iZnuUxI3iBTLUUOEK2xVggt +YBVkf7/nnGl0Y6RqUz8lPhJ5ySloR99FvBuN4k3ldO3pjKdJ+h9r9heVbVcurLxN +f/pU6J1Y4soVG7yBkDHQrZUjcqwEvjC7DKeJDTS9sVxfDRkIB+85adXlS1pRwFxP +zhjRr/YEHB3OxS/9znyNPv1Ltxamhow9AWyMJF2MlDpBJGirM/msbOp/EgU+72TB +UnL4KP+r/tjiE1JanhJkgCC5Gj1p9Hgw4k4Y2zW3PWxUtsCm39LoVJfH +-----END CERTIFICATE----- diff --git a/config/ssl/key.pem b/config/ssl/key.pem new file mode 100644 index 0000000..fd7c01b --- /dev/null +++ b/config/ssl/key.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEowIBAAKCAQEA0jmDTPSdmEt5WvBvAnhgCTfuwhX+gukkjqy6FudTSPIRDkdg +EdgZ47M2+VBRFRotFgFJSL2p5iqgksj+5LNpMveuMY5BzjvgpAwMXd+lXsYCcKkW +rrD54BMmvJ8r0lZd7qIkm9jZF/cNFNDu838FMraySN+JtRCSHPgdtnnRump0Szyi +ftRl22+7XZfzqgh/RMwMVepeqkySCA2OZ2oZMfRhDzF6L98wYO+o526XK7hNDfvI +VmAsi1HTwobC1Z9+a7JqRty0TeUShsdYDYD3KtaOBDVvFigfUDDHxO74c4qFhcGs +Bu1qkRSmNkenPf+aN2QwbNjyztKWTS47oeq2XwIDAQABAoIBAFKhiJqXC9rwz6KP +HxM5fYYiFhbzzjZmrZfnDL4z7uidPVb/dyOMbaCysMkOaNCCmXYsy0FsS3vNBZCs +sIP0gUUnVbDk2bjWkFXq5nF/luDJs+vUirXfmlgZLwC1D+R9Ti6eTQV1Ft/0m4+z +EDlllAV7CljahKZG/Sel3wf6mhVLTBrWgh0vEZJ2p88uGsMEGTIMCHQZAU+Dv67W +dHKULLL32N+ec1J7FJfZX+gws+nT4EX1KVkFPg2OJq3rts/sx84MqUles8uftdne +BdPfgJCnfPsiWNeV9obTA2q20FLs6ejVRXM3EziC9x2woN6inEFbtQsQfin3Hkx7 +oqKNyQECgYEA8tUoz0GzhSykwrjQ6EjGr7+tptor1/b3OwbH1JvdYyzpSM71xWro +eojFSk9Q74aIke0LoTKZIOq6NZChkEsALdlWLPbW+xSGWPyQ6YMYnFy7OsnHCa0v +gplDzSCIvKgPbbjOTlN6a3ourfnYLKpiN3y8O5X/+NEqfZw+akS+fRUCgYEA3Z+2 +CrH8ekR+tIfwSYpKwKvdQi7FT0gc5o/XBlipVtztuEvElMzFWR1aeKfZ9PoEsuvv +XWECSNEgeu8/d0aILpiEZSnIDqq05DemYA1gM4dtjgjT9ip+Wur8JFMLpjty2ymA +GoQZkiye5cjrhJnwwXUXWywFFqrDC53qlFLVSqMCgYAQWQFSUp3/TS4aXc7SlHOr +yT+rh+yDsYCbXK1/Rq70ykU6PZSWIchc13BQvF46gdgX2tl5lKpyaNr4WDBIQoRU +kdkXVdbLOGqC+x3WWpkBjcyc/JCFuj8Ej8Tcvl/2M2o2fMaGx1/qdGNIGxXOi/no +umEBset1mL8/jZE2HkKksQKBgALLEoZL+/ymhFpOJE8o+Qw4nk9JO59mL0cQpQsl +buzzV+OswMuHUS1wW0WOCAc4Z3rB0oCAyoCUci5aeZhNQUYlEfYccrMMn78InIY1 +ZPMBT/YsUk+V9YW71HW4vjrYIPh2K3EqHRBkk5Qd1ioTrp8hlKvHgEDq4g5xbRV1 +fc61AoGBALfH4KqPqDcJNRvomHE4LQagn63nYyt7R3rIdA+AsvxRKF/uP8w8dTeB +lMDM7S/UzGwsxNU/bCAyrazoNGd/zQ1N7Da5cl54fJ08yV8t68v5Y0kVzmweMyya +tFCnAJF0BTnqHx2MApsipgPvY6Z/oWXsLGdCTY+ILmR7Ej1PWyUA +-----END RSA PRIVATE KEY----- diff --git a/package.yaml b/package.yaml index ec125c5..8a025c2 100644 --- a/package.yaml +++ b/package.yaml @@ -102,8 +102,8 @@ name: start9-registry version: 0.0.0 executables: start9-registry: - source-dirs: src - main: Main.hs + source-dirs: app + main: main.hs ghc-options: - -threaded - -rtsopts diff --git a/src/Constants.hs b/src/Constants.hs index 8d5ae4f..9fa3bff 100644 --- a/src/Constants.hs +++ b/src/Constants.hs @@ -9,7 +9,7 @@ import Paths_start9_registry (version) import Startlude configBasePath :: FilePath -configBasePath = "/root/registry" +configBasePath = "./config" registryVersion :: AppVersion registryVersion = fromJust . parseMaybe parseJSON . String . toS . showVersion $ version diff --git a/src/Settings.hs b/src/Settings.hs index 755248c..822f50c 100644 --- a/src/Settings.hs +++ b/src/Settings.hs @@ -45,7 +45,6 @@ instance FromJSON AppSettings where appHost <- fromString <$> o .: "host" appPort <- o .: "port" appIpFromHeader <- o .: "ip-from-header" - appDetailedRequestLogging <- o .:? "detailed-logging" .!= True appShouldLogAll <- o .:? "should-log-all" .!= False