Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 04:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix hostname vs server id delineation

Browse Source
This commit is contained in:
Keagan McClelland
2020-12-01 11:59:49 -07:00
parent f14493a93c
commit b5b6afbeef
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agent/src/Daemon/SslRenew.hs
View File

@@ -25,7 +25,7 @@ import Constants
renewSslLeafCert :: AgentCtx -> IO () renewSslLeafCert :: AgentCtx -> IO ()
renewSslLeafCert ctx = do renewSslLeafCert ctx = do
let base = appFilesystemBase . appSettings $ ctx let base = appFilesystemBase . appSettings $ ctx
hn <- injectFilesystemBase base getStart9AgentHostname hn <- (<> ".local") <$> injectFilesystemBase base getStart9AgentHostname
tor <- injectFilesystemBase base getAgentHiddenServiceUrl tor <- injectFilesystemBase base getAgentHiddenServiceUrl
putStr @Text "SSL Renewal Required? " putStr @Text "SSL Renewal Required? "
needsRenew <- doesSslNeedRenew (toS $ entityCertPath hn `relativeTo` base) needsRenew <- doesSslNeedRenew (toS $ entityCertPath hn `relativeTo` base)

2
agent/src/Lib/Synchronizers.hs
View File

@@ -467,7 +467,7 @@ syncConvertEcdsaCerts = SyncOp "Convert Intermediate Cert to ECDSA P256" check m
replaceDerivativeCerts :: (HasFilesystemBase sig m, Fused.Has (Error S9Error) sig m, MonadIO m) => m () replaceDerivativeCerts :: (HasFilesystemBase sig m, Fused.Has (Error S9Error) sig m, MonadIO m) => m ()
replaceDerivativeCerts = do replaceDerivativeCerts = do
hn <- getStart9AgentHostname hn <- (<> ".local") <$> getStart9AgentHostname
tor <- getAgentHiddenServiceUrl tor <- getAgentHiddenServiceUrl
caKeyPath <- toS <$> getAbsoluteLocationFor rootCaKeyPath caKeyPath <- toS <$> getAbsoluteLocationFor rootCaKeyPath