summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/SiteSpecific/JoeySites.hs
diff options
context:
space:
mode:
authorJoey Hess2017-02-26 16:40:34 -0400
committerJoey Hess2017-02-26 16:40:34 -0400
commitdb4121edeeba2899926333df46308ca0baf45b71 (patch)
tree3af8b426fbff2d0cb1d00a8e250f148ffcb1a3b0 /src/Propellor/Property/SiteSpecific/JoeySites.hs
parent663fb4cc4545dc25e062fb0bc4af933402923506 (diff)
use val instead of show
Diffstat (limited to 'src/Propellor/Property/SiteSpecific/JoeySites.hs')
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 445bce07..c14d1707 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -314,9 +314,9 @@ apacheSite hn middle = Apache.siteEnabled hn $ apachecfg hn middle
apachecfg :: HostName -> Apache.ConfigFile -> Apache.ConfigFile
apachecfg hn middle =
- [ "<VirtualHost *:"++show port++">"
+ [ "<VirtualHost *:" ++ val port ++ ">"
, " ServerAdmin grue@joeyh.name"
- , " ServerName "++hn++":"++show port
+ , " ServerName "++hn++":" ++ val port
]
++ middle ++
[ ""
@@ -329,7 +329,7 @@ apachecfg hn middle =
, "</VirtualHost>"
]
where
- port = 80 :: Int
+ port = Port 80
gitAnnexDistributor :: Property (HasInfo + DebianLike)
gitAnnexDistributor = combineProperties "git-annex distributor, including rsync server and signer" $ props