Start9/registry
2
0
Fork 0
mirror of https://github.com/Start9Labs/registry.git synced 2026-03-30 19:54:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes image path

Browse Source
This commit is contained in:
Aaron Greenspan
2020-01-02 15:01:06 -07:00
parent dd095b7a6e
commit 05dbc367a7
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Constants.hs
View File

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

3
src/Handler/Apps.hs
View File

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

6
src/Lib/Registry.hs
View File

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