fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build for no-dev

Browse Source
This commit is contained in:
Gregor Kleen 2019-04-21 17:23:18 +02:00
parent 1a44e45ea2
commit 5f70bc9951
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Settings.hs
View File

@ -21,13 +21,17 @@ import Data.Aeson.TH
import Data.FileEmbed (embedFile) import Data.FileEmbed (embedFile)
import Data.Yaml (decodeEither') import Data.Yaml (decodeEither')
import Database.Persist.Postgresql (PostgresConf) import Database.Persist.Postgresql (PostgresConf)
import Language.Haskell.TH.Syntax (Exp, Q, location, Loc(..))
import Network.Wai.Handler.Warp (HostPreference) import Network.Wai.Handler.Warp (HostPreference)
import Yesod.Default.Config2 (applyEnvValue, configSettingsYml) import Yesod.Default.Config2 (applyEnvValue, configSettingsYml)
#ifdef DEVELOPMENT #ifdef DEVELOPMENT
import Yesod.Default.Util (WidgetFileSettings, widgetFileReload) import Yesod.Default.Util (WidgetFileSettings, widgetFileReload)
import Language.Haskell.TH.Syntax (Exp, Q, location, Loc(..))
import Text.Shakespeare.Text (st)
import Text.Blaze.Html (preEscapedToHtml)
#else #else
import Yesod.Default.Util (WidgetFileSettings, widgetFileNoReload, widgetFileReload) import Yesod.Default.Util (WidgetFileSettings, widgetFileNoReload, widgetFileReload)
import Language.Haskell.TH.Syntax (Exp, Q)
#endif #endif
import qualified Yesod.Auth.Util.PasswordStore as PWStore import qualified Yesod.Auth.Util.PasswordStore as PWStore
@ -67,9 +71,6 @@ import qualified System.FilePath as FilePath
import Jose.Jwt (JwtEncoding(..)) import Jose.Jwt (JwtEncoding(..))
import Text.Shakespeare.Text (st)
import Text.Blaze.Html (preEscapedToHtml)
-- | Runtime settings to configure this application. These settings can be -- | Runtime settings to configure this application. These settings can be
-- loaded from various sources: defaults, environment variables, config files, -- loaded from various sources: defaults, environment variables, config files,
@ -431,13 +432,11 @@ widgetFile nameBase = do
toWidget $ preEscapedToHtml after toWidget $ preEscapedToHtml after
|] |]
#else #else
widgetFile nameBase = do widgetFile
let widgetFile | appReloadTemplates compileTimeAppSettings
| appReloadTemplates compileTimeAppSettings = widgetFileReload widgetFileSettings
= widgetFileReload widgetFileSettings | otherwise
| otherwise = widgetFileNoReload widgetFileSettings
= widgetFileNoReload widgetFileSettings
widgetFile nameBase
#endif #endif
-- | Raw bytes at compile time of @config/settings.yml@ -- | Raw bytes at compile time of @config/settings.yml@