mirror of
https://github.com/Start9Labs/registry.git
synced 2026-03-26 02:11:53 +00:00
fixes path dependence
This commit is contained in:
@@ -170,12 +170,6 @@ appMain = do
|
||||
-- allow environment variables to override
|
||||
useEnv
|
||||
|
||||
void . forkIO $ forever $ do
|
||||
shouldRenew <- doesSslNeedRenew (sslCertLocation settings)
|
||||
when shouldRenew $ do
|
||||
putStrLn @Text "Renewing SSL Certs."
|
||||
renewSslCerts (sslCertLocation settings)
|
||||
sleep 86_400
|
||||
|
||||
-- Generate the foundation from the settings
|
||||
makeFoundation settings >>= startApp
|
||||
@@ -186,6 +180,15 @@ startApp foundation = do
|
||||
putStrLn @Text "Setting up SSL"
|
||||
_ <- setupSsl $ appSettings foundation
|
||||
putStrLn @Text "SSL Setup Complete"
|
||||
|
||||
-- certbot renew loop
|
||||
void . forkIO $ forever $ do
|
||||
shouldRenew <- doesSslNeedRenew (sslCertLocation $ appSettings foundation)
|
||||
when shouldRenew $ do
|
||||
putStrLn @Text "Renewing SSL Certs."
|
||||
runReaderT (renewSslCerts (sslCertLocation $ appSettings foundation)) foundation
|
||||
sleep 86_400
|
||||
|
||||
startWeb foundation
|
||||
|
||||
startWeb :: RegistryCtx -> IO ()
|
||||
|
||||
@@ -9,6 +9,7 @@ import Data.String.Interpolate.IsString
|
||||
import System.Directory
|
||||
import System.Process
|
||||
|
||||
import Foundation
|
||||
import Settings
|
||||
|
||||
-- openssl genrsa -out key.pem 2048
|
||||
@@ -45,7 +46,8 @@ doesSslNeedRenew cert = do
|
||||
ec <- liftIO $ system [i|openssl x509 -checkend 2592000 -noout -in #{cert}|]
|
||||
pure $ ec /= ExitSuccess
|
||||
|
||||
renewSslCerts :: FilePath -> IO ()
|
||||
renewSslCerts :: FilePath -> ReaderT RegistryCtx IO ()
|
||||
renewSslCerts cert = do
|
||||
domain <- asks $ registryHostname . appSettings
|
||||
void . liftIO $ system [i|certbot renew|]
|
||||
void . liftIO $ system [i|cp /etc/letsencrypt/live/beta-registry.start9labs.com/fullchain.pem #{cert}|]
|
||||
void . liftIO $ system [i|cp /etc/letsencrypt/live/#{domain}/fullchain.pem #{cert}|]
|
||||
|
||||
Reference in New Issue
Block a user