Start9/registry
2
0
Fork 0
mirror of https://github.com/Start9Labs/registry.git synced 2026-03-26 10:21:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes key issues

Browse Source
This commit is contained in:
Keagan McClelland
2020-08-04 16:33:21 -06:00
parent c75c9fd250
commit 5df3523f87
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Application.hs
View File

@@ -185,11 +185,11 @@ startApp foundation = do
void . forkIO $ forever $ do
putStrLn $ "DOMAIN: " <> registryHostname (appSettings foundation)
putStrLn $ "CERT: " <> sslCertLocation (appSettings foundation)
runReaderT (renewSslCerts (sslCertLocation $ appSettings foundation)) foundation
runReaderT renewSslCerts foundation
shouldRenew <- doesSslNeedRenew (sslCertLocation $ appSettings foundation)
when shouldRenew $ do
putStrLn @Text "Renewing SSL Certs."
runReaderT (renewSslCerts (sslCertLocation $ appSettings foundation)) foundation
runReaderT renewSslCerts foundation
sleep 86_400
startWeb foundation

8
src/Lib/Ssl.hs
View File

@@ -46,8 +46,10 @@ doesSslNeedRenew cert = do
ec <- liftIO $ system [i|openssl x509 -checkend 2592000 -noout -in #{cert}|]
pure $ ec /= ExitSuccess
renewSslCerts :: FilePath -> ReaderT RegistryCtx IO ()
renewSslCerts cert = do
domain <- asks $ registryHostname . appSettings
renewSslCerts :: ReaderT RegistryCtx IO ()
renewSslCerts = do
domain <- asks $ registryHostname . appSettings
(cert, key) <- asks $ (sslCertLocation &&& sslKeyLocation) . appSettings
void . liftIO $ system [i|certbot renew --dry-run|]
void . liftIO $ system [i|cp /etc/letsencrypt/live/#{domain}/fullchain.pem #{cert}|]
void . liftIO $ system [i|cp /etc/letsencrypt/live/#{domain}/privkey.pem #{key}|]