fixes image path

This commit is contained in:
Aaron Greenspan
2020-01-02 15:01:06 -07:00
parent e7b9a54990
commit f341f8ebaf
3 changed files with 7 additions and 6 deletions

View File

@@ -11,8 +11,8 @@ import Startlude
sslPath :: FilePath
sslPath = "/var/ssl"
resourcesPath :: FilePath
resourcesPath = "/var/www/html/resources"
resourcesDir :: FilePath
resourcesDir = "/var/www/html/resources"
registryVersion :: AppVersion
registryVersion = fromJust . parseMaybe parseJSON . String . toS . showVersion $ version

View File

@@ -17,6 +17,7 @@ import qualified GHC.Show (Show (..))
import System.Directory
import Yesod.Core
import Constants
import Foundation
import Handler.Types.Status
import Lib.Registry
@@ -39,7 +40,7 @@ getAppsManifestR :: Handler TypedContent
getAppsManifestR = respondSource typePlain $ CB.sourceFile appManifestPath .| awaitForever sendChunkBS
getImageR :: Handler TypedContent
getImageR = getApp sysResourceDir ("image" :: Extension "")
getImageR = getApp resourcesDir ("sys" :: Extension "tar.gz")
getAgentR :: Handler TypedContent
getAgentR = getApp sysResourceDir ("agent" :: Extension "")

View File

@@ -21,13 +21,13 @@ import Lib.Semver
import Lib.Types.Semver
appResourceDir :: FilePath
appResourceDir = resourcesPath </> "apps"
appResourceDir = resourcesDir </> "apps"
sysResourceDir :: FilePath
sysResourceDir = resourcesPath </> "sys"
sysResourceDir = resourcesDir </> "sys"
iconsResourceDir :: FilePath
iconsResourceDir = resourcesPath </> "icons"
iconsResourceDir = resourcesDir </> "icons"
appManifestPath :: FilePath
appManifestPath = appResourceDir </> appManifestFile