Skip to content
Prev Previous commit
Next Next commit
Add SSL support
  • Loading branch information
dspinellis committed Feb 20, 2017
commit 9a6e5c4b8d319d4f9557ff2793c6421979c9a4db
24 changes: 21 additions & 3 deletions manifests/instance.pp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
$db_name = $name,
$db_user = "${name}_user",
$ip = '*',
$port = '80',
$port = '',
$server_aliases = '',
$ensure = 'present',
$vhost_type = 'path',
Expand All @@ -58,8 +58,22 @@
$admin_password = 'puppet',
$language = 'en',
$images_dir = '',
$ssl = false,
$ssl_chain = '',
$ssl_key = '',
$ssl_cert = '',
) {


if $port == '' {
if $ssl {
$server_port = 443
} else {
$server_port = 80
}
} else {
$server_port = $port
}

validate_re($ensure, '^(present|absent|deleted)$',
"${ensure} is not supported for ensure.
Allowed values are 'present', 'absent', and 'deleted'.")
Expand Down Expand Up @@ -165,13 +179,17 @@

# Each instance has a separate vhost configuration
apache::vhost { $name:
port => $port,
port => $server_port,
docroot => $vhost_root,
serveradmin => $admin_email,
servername => $server_name,
vhost_name => $ip,
serveraliases => $server_aliases,
ensure => $ensure,
ssl => $ssl,
ssl_chain => $ssl_chain,
ssl_key => $ssl_key,
ssl_cert => $ssl_cert,
}
}
'deleted': {
Expand Down