diff options
author | Micah Anderson <micah@riseup.net> | 2015-04-17 15:32:01 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2015-04-17 15:32:01 -0400 |
commit | 36fd84c3d17355afa05b519764c37a3e45efc40d (patch) | |
tree | c6f5dbc4651875a147607c788b37c5c973573330 /manifests/init.pp | |
parent | ffa03fb9f13bcd78b7e22f47b224c5a7244328ef (diff) | |
parent | 8074127b8d8913314c90c3fe6131d078a858f7b6 (diff) |
Merge remote-tracking branch 'immerda/master'
Diffstat (limited to 'manifests/init.pp')
-rw-r--r-- | manifests/init.pp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 542e7aa..1079d85 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -3,7 +3,7 @@ # # Copyright 2008, admin(at)immerda.ch # Copyright 2008, Puzzle ITC GmbH -# Marcel Härry haerry+puppet(at)puzzle.ch +# Marcel Haerry haerry+puppet(at)puzzle.ch # Simon Josi josi+puppet(at)puzzle.ch # # This program is free software; you can redistribute @@ -14,11 +14,15 @@ # manage a simple apache class apache( - $cluster_node = '', - $manage_shorewall = false, - $manage_munin = false, - $no_default_site = false, - $ssl = false + $cluster_node = '', + $manage_shorewall = false, + $manage_munin = false, + $no_default_site = false, + $ssl = false, + $default_ssl_certificate_file = absent, + $default_ssl_certificate_key_file = absent, + $default_ssl_certificate_chain_file = absent, + $ssl_cipher_suite = $certs::ssl_config::ciphers_http ) { case $::operatingsystem { centos: { include apache::centos } |