@@ -72,12 +72,6 @@ deployInit thunkPtr deployDir sshKeyPath hostnames route adminEmail enableHttps
7272 --accidentally create a production deployment that uses development
7373 --credentials to connect to some resources. This could result in, e.g.,
7474 --production data backed up to a dev environment.
75− putLog Notice "Writing default module.nix"
76− writeDeployConfig deployDir "module.nix"
77− "{ obeliskPkgs, ... }: {...}: {\n\
78− \ imports = [(obeliskPkgs.path + /nixos/modules/virtualisation/amazon-image.nix)];\n\
79− \ ec2.hvm = true;\n\
80− \}"
8175 withSpinner "Creating project configuration directories" $ do
8276 callProcessAndLogOutput (Notice, Error) $
8377 proc "mkdir" [ "-p"
@@ -85,14 +79,20 @@ deployInit thunkPtr deployDir sshKeyPath hostnames route adminEmail enableHttps
8579 , deployDir </> "config" </> "common"
8680 , deployDir </> "config" </> "frontend"
8781 ]
82+
83+ let srcDir = deployDir </> "src"
84+ withSpinner ("Creating source thunk (" <> T.pack srcDir <> ")") $ liftIO $ do
85+ createThunk srcDir thunkPtr
86+ setupObeliskImpl deployDir
87+
8888 withSpinner "Writing deployment configuration" $ do
8989 writeDeployConfig deployDir "backend_hosts" $ unlines hostnames
9090 writeDeployConfig deployDir "enable_https" $ show enableHttps
9191 writeDeployConfig deployDir "admin_email" adminEmail
9292 writeDeployConfig deployDir ("config" </> "common" </> "route") route
93− withSpinner "Creating source thunk (./src)" $ liftIO $ do
94− createThunk (deployDir </> "src") thunkPtr
95− setupObeliskImpl deployDir
93+ writeDeployConfig deployDir "module.nix" $
94+ "(import " <> toNixPath srcDir <> " {}).obelisk.serverModules.mkBaseEc2"
95+
9696 withSpinner ("Initializing git repository (" <> T.pack deployDir <> ")") $
9797 initGit deployDir
9898