diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-02-07 19:33:57 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-02-07 19:33:57 -0400 |
| commit | 42042aefc13e235b36a28d5235a37ab4326a2400 (patch) | |
| tree | db8545f52189e9411fad63e049411657b3039c5d | |
| parent | 293732fa1b9979b5c92b77edef11627f29477433 (diff) | |
propellor spin
| -rw-r--r-- | config-joey.hs | 6 | ||||
| -rw-r--r-- | src/Propellor/Property/Apache.hs | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/config-joey.hs b/config-joey.hs index 75333d78..5c3d376b 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -19,6 +19,7 @@ import qualified Propellor.Property.OpenId as OpenId import qualified Propellor.Property.Git as Git import qualified Propellor.Property.Postfix as Postfix import qualified Propellor.Property.Apache as Apache +import qualified Propellor.Property.LetsEncrypt as LetsEncrypt import qualified Propellor.Property.Grub as Grub import qualified Propellor.Property.Obnam as Obnam import qualified Propellor.Property.Gpg as Gpg @@ -332,6 +333,11 @@ kite = standardSystemUnhardened "kite.kitenet.net" Testing "amd64" & branchableSecondary & Dns.secondaryFor ["animx"] hosts "animx.eu.org" + -- testing + & Apache.httpsVirtualHost "letsencrypt.joeyh.name" "/var/www/html" + (LetsEncrypt.AgreeTOS (Just "id@joeyh.name")) + & alias "letsencrypt.joeyh.name" + elephant :: Host elephant = standardSystem "elephant.kitenet.net" Unstable "amd64" [ "Storage, big data, and backups, omnomnom!" diff --git a/src/Propellor/Property/Apache.hs b/src/Propellor/Property/Apache.hs index e841be9e..aba5770e 100644 --- a/src/Propellor/Property/Apache.hs +++ b/src/Propellor/Property/Apache.hs @@ -155,7 +155,7 @@ virtualHost' domain (Port p) docroot addedcfg = siteEnabled domain $ -- Example: -- -- > httpsVirtualHost "example.com" "/var/www" --- > (LetsEncrypt.AgreeTos (Just "me@my.domain")) +-- > (LetsEncrypt.AgreeTOS (Just "me@my.domain")) httpsVirtualHost :: Domain -> WebRoot -> LetsEncrypt.AgreeTOS -> Property NoInfo httpsVirtualHost domain docroot letos = httpsVirtualHost' domain docroot letos [] |