Single executable

reconfig.hs → Reconfig.hs

@@ -1,4 +1,6 @@
 {-# LANGUAGE OverloadedStrings #-}
+module Reconfig where
+
 import Data.Yaml
 import Data.Text (Text, unpack)
 import Filesystem.Path.CurrentOS
@@ -13,7 +15,6 @@ import Control.Monad (mzero, foldM)
 import qualified Data.Map as Map
 import Data.Maybe (catMaybes)
 import System.Cmd (rawSystem)
-import System.Environment (getArgs)
 import qualified Prelude
 
 data Deploy = Deploy
@@ -148,19 +149,14 @@ nginxBlockStatic s = unlines
     , "}"
     ]
 
-main :: IO ()
-main = do
-    args <- getArgs
-    (rootDir, unpackedFolder, angelConfig, nginxConfig) <-
-        case args of
-            [a, b, c, d] -> return (a, b, c, d)
-            _ -> error "Invalid arguments"
-    let unpacker = unlines
-            [ "unpacker {"
+reconfig :: String -> String -> String -> String -> IO ()
+reconfig rootDir unpackedFolder angelConfig nginxConfig = do
+    let deploy = unlines
+            [ "deploy {"
             , concat
                 [ "    exec = \""
                 , rootDir
-                , "bin/unpacker "
+                , "bin/deploy "
                 , rootDir
                 , "\""
                 ]
@@ -171,7 +167,7 @@ main = do
     let statics = concatMap deployStatics $ Map.elems deploys
     let rootDir' = decodeString rootDir
     writeFile rootDir' angelConfig
-        $ unpacker ++ concatMap angelBlock was
+        $ deploy ++ concatMap angelBlock was
     writeFile rootDir' nginxConfig
         $ concatMap nginxBlockWebapp was ++
           concatMap nginxBlockStatic statics

build.sh

@@ -6,6 +6,5 @@ sudo rm -f /etc/init/yesod-deploy-angel.conf
 sudo rm -f /etc/nginx/sites-enabled/yesod-deploy.conf
 sudo /etc/init.d/nginx reload
 
-ghc -Wall -Werror --make reconfig.hs && strip reconfig
-ghc -Wall -Werror --make unpacker.hs && strip unpacker
+ghc -Wall -Werror --make deploy.hs && strip deploy
 sudo ./setup.sh

unpacker.hs → deploy.hs

@@ -10,6 +10,7 @@ import Filesystem.Path.CurrentOS
 import Filesystem
 import System.IO.Error (isAlreadyExistsError)
 import System.Cmd (rawSystem)
+import Reconfig
 
 main :: IO ()
 main = do
@@ -30,13 +31,11 @@ unpack dir = do
     dest <- getDest [1..]
     let incoming = dir </> "incoming"
     listDirectory incoming >>= mapM_ (unpack1 dest)
-    _ <- rawSystem (encodeString $ dir </> "bin" </> "reconfig")
-        [ encodeString dir
-        , encodeString dest
-        , encodeString $ dir </> "etc" </> "angel.conf"
-        , "/etc/nginx/sites-enabled/yesod-deploy.conf"
-        ]
-    return ()
+    reconfig
+        (encodeString dir)
+        (encodeString dest)
+        (encodeString $ dir </> "etc" </> "angel.conf")
+        ("/etc/nginx/sites-enabled/yesod-deploy.conf")
   where
     getDest :: [Int] -> IO FilePath
     getDest [] = error "getDest:impossible happened"

setup.sh

@@ -1,13 +1,13 @@
 #!/bin/bash -ex
 
 mkdir -p /yesod-deploy/{bin,etc,incoming,unpacked}
-cp angel reconfig unpacker /yesod-deploy/bin
+cp angel deploy /yesod-deploy/bin
 
 apt-get install nginx
 
 cat > /yesod-deploy/etc/angel.conf <<EOF
 unpacker {
-    exec = "/yesod-deploy/bin/unpacker /yesod-deploy/"
+    exec = "/yesod-deploy/bin/deploy /yesod-deploy/"
 }
 EOF