diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-03-12 16:12:36 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-03-12 16:12:36 -0400 |
| commit | b3f231c750e571795787e0f11f90a3d68720e6eb (patch) | |
| tree | 8a07f5e9924c023bc9f317715c3efffd0dfd75d4 | |
| parent | 8fca89831f7812844b240dca95e669367563fab5 (diff) | |
propellor spin
| -rw-r--r-- | config-joey.hs | 7 | ||||
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/JoeySites.hs | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/config-joey.hs b/config-joey.hs index b8bfcf70..77e93f26 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -96,7 +96,10 @@ clam = standardSystem "clam.kitenet.net" Unstable "amd64" & "/var/www/index.html" `File.hasContent` ["hello, world"] & alias "helloworld.kitenet.net" & Docker.docked oldusenetShellBox + & JoeySites.scrollBox + & alias "scroll.joeyh.name" + & alias "us.scroll.joeyh.name" -- ssh on some extra ports to deal with horrible networks -- while travelling @@ -273,6 +276,10 @@ elephant = standardSystem "elephant.kitenet.net" Unstable "amd64" & Docker.docked jerryPlay & Docker.garbageCollected `period` (Weekly (Just 1)) + & JoeySites.scrollBox + & alias "scroll.joeyh.name" + & alias "eu.scroll.joeyh.name" + -- For https port 443, shellinabox with ssh login to -- kitenet.net & alias "shell.kitenet.net" diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 1b03798a..e9bf6f52 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -24,7 +24,6 @@ import Data.String.Utils scrollBox :: Property HasInfo scrollBox = propertyList "scroll server" $ props - & alias "scroll.joeyh.name" & User.accountFor "scroll" & Git.cloned "scroll" "git://git.kitenet.net/scroll" (d </> "scroll") Nothing & Apt.installed ["ghc", "make", "cabal-install", "libghc-vector-dev", |