No OneTemporary
Actions

Size

30 KB

Subscribers

None

View Options

	diff --git a/manifests/resource/upstream.pp b/manifests/resource/upstream.pp
	index bfdfa3a..c74492a 100644
	--- a/manifests/resource/upstream.pp
	+++ b/manifests/resource/upstream.pp
	@@ -1,100 +1,99 @@
	# define: nginx::resource::upstream
	#
	# This definition creates a new upstream proxy entry for NGINX
	#
	# Parameters:
	# [members] - Array of member URIs for NGINX to connect to. Must follow valid NGINX syntax.
	# If omitted, individual members should be defined with nginx::resource::upstream::member
	# [ensure] - Enables or disables the specified location (present\|absent)
	# [upstream_cfg_prepend] - It expects a hash with custom directives to put before anything else inside upstream
	# [upstream_fail_timeout] - Set the fail_timeout for the upstream. Default is 10 seconds - As that is what Nginx does normally.
	#
	# Actions:
	#
	# Requires:
	#
	# Sample Usage:
	# nginx::resource::upstream { 'proxypass':
	# ensure => present,
	# members => [
	# 'localhost:3000',
	# 'localhost:3001',
	# 'localhost:3002',
	# ],
	# }
	#
	# Custom config example to use ip_hash, and 20 keepalive connections
	# create a hash with any extra custom config you want.
	# $my_config = {
	# 'ip_hash' => '',
	# 'keepalive' => '20',
	# }
	# nginx::resource::upstream { 'proxypass':
	# ensure => present,
	# members => [
	# 'localhost:3000',
	# 'localhost:3001',
	# 'localhost:3002',
	# ],
	# upstream_cfg_prepend => $my_config,
	# }
	define nginx::resource::upstream (
	$members = undef,
	$ensure = 'present',
	$upstream_cfg_prepend = undef,
	$upstream_fail_timeout = '10s',
	) {

	if $members != undef {
	validate_array($members)
	}
	validate_re($ensure, '^(present\|absent)$',
	"${ensure} is not supported for ensure. Allowed values are 'present' and 'absent'.")
	if ($upstream_cfg_prepend != undef) {
	validate_hash($upstream_cfg_prepend)
	}

	$root_group = $::nginx::config::root_group

	$ensure_real = $ensure ? {
	'absent' => absent,
	default => present,
	}

	Concat {
	owner => 'root',
	group => $root_group,
	mode => '0644',
	}

	concat { "${::nginx::config::conf_dir}/conf.d/${name}-upstream.conf":
	- ensure => $ensure_real,
	- notify => Class['::nginx::service'],
	- require => File["${::nginx::config::conf_dir}/conf.d"]
	+ ensure => $ensure_real,
	+ notify => Class['::nginx::service'],
	}

	# Uses: $name, $upstream_cfg_prepend
	concat::fragment { "${name}_upstream_header":
	target => "${::nginx::config::conf_dir}/conf.d/${name}-upstream.conf",
	order => '10',
	content => template('nginx/conf.d/upstream_header.erb'),
	}

	if $members != undef {
	# Uses: $members, $upstream_fail_timeout
	concat::fragment { "${name}_upstream_members":
	target => "${::nginx::config::conf_dir}/conf.d/${name}-upstream.conf",
	order => '50',
	content => template('nginx/conf.d/upstream_members.erb'),
	}
	} else {
	# Collect exported members:
	::Nginx::Resource::Upstream::Member <<\| upstream == $name \|>>
	}

	concat::fragment { "${name}_upstream_footer":
	target => "${::nginx::config::conf_dir}/conf.d/${name}-upstream.conf",
	order => '90',
	content => "}\n",
	}
	}
	diff --git a/manifests/resource/vhost.pp b/manifests/resource/vhost.pp
	index 95a55f5..629be52 100644
	--- a/manifests/resource/vhost.pp
	+++ b/manifests/resource/vhost.pp
	@@ -1,648 +1,647 @@
	# define: nginx::resource::vhost
	#
	# This definition creates a virtual host
	#
	# Parameters:
	# [ensure] - Enables or disables the specified vhost
	# (present\|absent)
	# [listen_ip] - Default IP Address for NGINX to listen with this
	# vHost on. Defaults to all interfaces (*)
	# [listen_port] - Default IP Port for NGINX to listen with this
	# vHost on. Defaults to TCP 80
	# [listen_options] - Extra options for listen directive like
	# 'default' to catchall. Undef by default.
	# [location_allow] - Array: Locations to allow connections from.
	# [location_deny] - Array: Locations to deny connections from.
	# [ipv6_enable] - BOOL value to enable/disable IPv6 support
	# (false\|true). Module will check to see if IPv6 support exists on your
	# system before enabling.
	# [ipv6_listen_ip] - Default IPv6 Address for NGINX to listen with
	# this vHost on. Defaults to all interfaces (::)
	# [ipv6_listen_port] - Default IPv6 Port for NGINX to listen with this
	# vHost on. Defaults to TCP 80
	# [ipv6_listen_options] - Extra options for listen directive like 'default'
	# to catchall. Template will allways add ipv6only=on. While issue
	# jfryman/puppet-nginx#30 is discussed, default value is 'default'.
	# [add_header] - Hash: Adds headers to the HTTP response when
	# response code is equal to 200, 204, 301, 302 or 304.
	# [index_files] - Default index files for NGINX to read when
	# traversing a directory
	# [autoindex] - Set it on 'on' or 'off 'to activate/deactivate
	# autoindex directory listing. Undef by default.
	# [proxy] - Proxy server(s) for the root location to connect
	# to. Accepts a single value, can be used in conjunction with
	# nginx::resource::upstream
	# [proxy_read_timeout] - Override the default the proxy read timeout value
	# of 90 seconds
	# [proxy_redirect] - Override the default proxy_redirect value of off.
	# [resolver] - Array: Configures name servers used to resolve
	# names of upstream servers into addresses.
	# [fastcgi] - location of fastcgi (host:port)
	# [fastcgi_params] - optional alternative fastcgi_params file to use
	# [fastcgi_script] - optional SCRIPT_FILE parameter
	# [ssl] - Indicates whether to setup SSL bindings for this
	# vhost.
	# [ssl_cert] - Pre-generated SSL Certificate file to reference
	# for SSL Support. This is not generated by this module.
	# [ssl_client_cert] - Pre-generated SSL Certificate file to reference
	# for client verify SSL Support. This is not generated by this module.
	# [ssl_crl] - String: Specifies CRL path in file system
	# [ssl_dhparam] - This directive specifies a file containing
	# Diffie-Hellman key agreement protocol cryptographic parameters, in PEM
	# format, utilized for exchanging session keys between server and client.
	# [ssl_key] - Pre-generated SSL Key file to reference for SSL
	# Support. This is not generated by this module.
	# [ssl_port] - Default IP Port for NGINX to listen with this SSL
	# vHost on. Defaults to TCP 443
	# [ssl_protocols] - SSL protocols enabled. Defaults to 'TLSv1 TLSv1.1
	# TLSv1.2'.
	# [ssl_ciphers] - SSL ciphers enabled. Defaults to
	# 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA'.
	# [ssl_stapling] - Bool: Enables or disables stapling of OCSP
	# responses by the server. Defaults to false.
	# [ssl_stapling_file] - String: When set, the stapled OCSP response
	# will be taken from the specified file instead of querying the OCSP
	# responder specified in the server certificate.
	# [ssl_stapling_responder] - String: Overrides the URL of the OCSP
	# responder specified in the Authority Information Access certificate
	# extension.
	# [ssl_stapling_verify] - Bool: Enables or disables verification of
	# OCSP responses by the server. Defaults to false.
	# [ssl_session_timeout] - String: Specifies a time during which a client
	# may reuse the session parameters stored in a cache. Defaults to 5m.
	# [ssl_trusted_cert] - String: Specifies a file with trusted CA
	# certificates in the PEM format used to verify client certificates and
	# OCSP responses if ssl_stapling is enabled.
	# [spdy] - Toggles SPDY protocol.
	# [server_name] - List of vhostnames for which this vhost will
	# respond. Default [$name].
	# [www_root] - Specifies the location on disk for files to be
	# read from. Cannot be set in conjunction with $proxy
	# [rewrite_www_to_non_www] - Adds a server directive and rewrite rule to
	# rewrite www.domain.com to domain.com in order to avoid duplicate
	# content (SEO);
	# [try_files] - Specifies the locations for files to be
	# checked as an array. Cannot be used in conjuction with $proxy.
	# [proxy_cache] - This directive sets name of zone for caching.
	# The same zone can be used in multiple places.
	# [proxy_cache_key] - Override the default proxy_cache_key of
	# $scheme$proxy_host$request_uri
	# [proxy_cache_use_stale] - Override the default proxy_cache_use_stale value
	# of off.
	# [proxy_cache_valid] - This directive sets the time for caching
	# different replies.
	# [proxy_method] - If defined, overrides the HTTP method of the
	# request to be passed to the backend.
	# [proxy_set_body] - If defined, sets the body passed to the backend.
	# [auth_basic] - This directive includes testing name and
	# password with HTTP Basic Authentication.
	# [auth_basic_user_file] - This directive sets the htpasswd filename for
	# the authentication realm.
	# [client_max_body_size] - This directive sets client_max_body_size.
	# [client_body_timeout] - Sets how long the server will wait for a
	# client body. Default is 60s
	# [client_header_timeout] - Sets how long the server will wait for a
	# client header. Default is 60s
	# [raw_prepend] - A single string, or an array of strings to
	# prepend to the server directive (after cfg prepend directives). NOTE:
	# YOU are responsible for a semicolon on each line that requires one.
	# [raw_append] - A single string, or an array of strings to
	# append to the server directive (after cfg append directives). NOTE:
	# YOU are responsible for a semicolon on each line that requires one.
	# [location_raw_prepend] - A single string, or an array of strings
	# to prepend to the location directive (after custom_cfg directives). NOTE:
	# YOU are responsible for a semicolon on each line that requires one.
	# [location_raw_append] - A single string, or an array of strings
	# to append to the location directive (after custom_cfg directives). NOTE:
	# YOU are responsible for a semicolon on each line that requires one.
	# [vhost_cfg_append] - It expects a hash with custom directives to
	# put after everything else inside vhost
	# [vhost_cfg_prepend] - It expects a hash with custom directives to
	# put before everything else inside vhost
	# [vhost_cfg_ssl_append] - It expects a hash with custom directives to
	# put after everything else inside vhost ssl
	# [vhost_cfg_ssl_prepend] - It expects a hash with custom directives to
	# put before everything else inside vhost ssl
	# [rewrite_to_https] - Adds a server directive and rewrite rule to
	# rewrite to ssl
	# [include_files] - Adds include files to vhost
	# [access_log] - Where to write access log. May add additional
	# options like log format to the end.
	# [error_log] - Where to write error log. May add additional
	# options like error level to the end.
	# [passenger_cgi_param] - Allows one to define additional CGI environment
	# variables to pass to the backend application
	# [passenger_set_header] - Allows one to set headers to pass to the
	# backend application (Passenger 5.0+)
	# [passenger_env_var] - Allows one to set environemnt variables to pass
	# to the backend application (Passenger 5.0+)
	# [log_by_lua] - Run the Lua source code inlined as the
	# <lua-script-str> at the log request processing phase.
	# This does not replace the current access logs, but runs after.
	# [log_by_lua_file] - Equivalent to log_by_lua, except that the file
	# specified by <path-to-lua-script-file> contains the Lua code, or, as from
	# the v0.5.0rc32 release, the Lua/LuaJIT bytecode to be executed.
	# [gzip_types] - Defines gzip_types, nginx default is text/html
	# [owner] - Defines owner of the .conf file
	# [group] - Defines group of the .conf file
	# [mode] - Defines mode of the .conf file
	# [maintenance] - A boolean value to set a vhost in maintenance
	# [maintenance_value] - Value to return when maintenance is on.
	# Default to return 503
	# Actions:
	#
	# Requires:
	#
	# Sample Usage:
	# nginx::resource::vhost { 'test2.local':
	# ensure => present,
	# www_root => '/var/www/nginx-default',
	# ssl => true,
	# ssl_cert => '/tmp/server.crt',
	# ssl_key => '/tmp/server.pem',
	# }
	define nginx::resource::vhost (
	$ensure = 'present',
	$listen_ip = '*',
	$listen_port = '80',
	$listen_options = undef,
	$location_allow = [],
	$location_deny = [],
	$ipv6_enable = false,
	$ipv6_listen_ip = '::',
	$ipv6_listen_port = '80',
	$ipv6_listen_options = 'default ipv6only=on',
	$add_header = undef,
	$ssl = false,
	$ssl_listen_option = true,
	$ssl_cert = undef,
	$ssl_client_cert = undef,
	$ssl_dhparam = undef,
	$ssl_key = undef,
	$ssl_port = '443',
	$ssl_protocols = 'TLSv1 TLSv1.1 TLSv1.2',
	$ssl_ciphers = 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA',
	$ssl_cache = 'shared:SSL:10m',
	$ssl_crl = undef,
	$ssl_stapling = false,
	$ssl_stapling_file = undef,
	$ssl_stapling_responder = undef,
	$ssl_stapling_verify = false,
	$ssl_session_timeout = '5m',
	$ssl_trusted_cert = undef,
	$spdy = $::nginx::config::spdy,
	$proxy = undef,
	$proxy_redirect = undef,
	$proxy_read_timeout = $::nginx::config::proxy_read_timeout,
	$proxy_connect_timeout = $::nginx::config::proxy_connect_timeout,
	$proxy_set_header = [],
	$proxy_cache = false,
	$proxy_cache_key = undef,
	$proxy_cache_use_stale = undef,
	$proxy_cache_valid = false,
	$proxy_method = undef,
	$proxy_set_body = undef,
	$resolver = [],
	$fastcgi = undef,
	$fastcgi_params = "${::nginx::config::conf_dir}/fastcgi_params",
	$fastcgi_script = undef,
	$uwsgi = undef,
	$uwsgi_params = "${nginx::config::conf_dir}/uwsgi_params",
	$index_files = [
	'index.html',
	'index.htm',
	'index.php'],
	$autoindex = undef,
	$server_name = [$name],
	$www_root = undef,
	$rewrite_www_to_non_www = false,
	$rewrite_to_https = undef,
	$location_custom_cfg = undef,
	$location_cfg_prepend = undef,
	$location_cfg_append = undef,
	$location_custom_cfg_prepend = undef,
	$location_custom_cfg_append = undef,
	$try_files = undef,
	$auth_basic = undef,
	$auth_basic_user_file = undef,
	$client_body_timeout = undef,
	$client_header_timeout = undef,
	$client_max_body_size = undef,
	$raw_prepend = undef,
	$raw_append = undef,
	$location_raw_prepend = undef,
	$location_raw_append = undef,
	$vhost_cfg_prepend = undef,
	$vhost_cfg_append = undef,
	$vhost_cfg_ssl_prepend = undef,
	$vhost_cfg_ssl_append = undef,
	$include_files = undef,
	$access_log = undef,
	$error_log = undef,
	$format_log = 'combined',
	$passenger_cgi_param = undef,
	$passenger_set_header = undef,
	$passenger_env_var = undef,
	$log_by_lua = undef,
	$log_by_lua_file = undef,
	$use_default_location = true,
	$rewrite_rules = [],
	$string_mappings = {},
	$geo_mappings = {},
	$gzip_types = undef,
	$owner = $::nginx::config::global_owner,
	$group = $::nginx::config::global_group,
	$mode = $::nginx::config::global_mode,
	$maintenance = false,
	$maintenance_value = 'return 503'
	) {

	validate_re($ensure, '^(present\|absent)$',
	"${ensure} is not supported for ensure. Allowed values are 'present' and 'absent'.")
	if !(is_array($listen_ip) or is_string($listen_ip)) {
	fail('$listen_ip must be a string or array.')
	}
	if !is_integer($listen_port) {
	fail('$listen_port must be an integer.')
	}
	if ($listen_options != undef) {
	validate_string($listen_options)
	}
	validate_array($location_allow)
	validate_array($location_deny)
	validate_bool($ipv6_enable)
	if !(is_array($ipv6_listen_ip) or is_string($ipv6_listen_ip)) {
	fail('$ipv6_listen_ip must be a string or array.')
	}
	if !is_integer($ipv6_listen_port) {
	fail('$ipv6_listen_port must be an integer.')
	}
	validate_string($ipv6_listen_options)
	if ($add_header != undef) {
	validate_hash($add_header)
	}
	validate_bool($ssl)
	if ($ssl_cert != undef) {
	validate_string($ssl_cert)
	}
	if ($ssl_client_cert != undef) {
	validate_string($ssl_client_cert)
	}
	if ($ssl_crl != undef) {
	validate_string($ssl_crl)
	}
	validate_bool($ssl_listen_option)
	if ($ssl_dhparam != undef) {
	validate_string($ssl_dhparam)
	}
	if ($ssl_key != undef) {
	validate_string($ssl_key)
	}
	if !is_integer($ssl_port) {
	fail('$ssl_port must be an integer.')
	}
	validate_string($ssl_protocols)
	validate_string($ssl_ciphers)
	validate_string($ssl_cache)
	validate_bool($ssl_stapling)
	if ($ssl_stapling_file != undef) {
	validate_string($ssl_stapling_file)
	}
	if ($ssl_stapling_responder != undef) {
	validate_string($ssl_stapling_responder)
	}
	validate_bool($ssl_stapling_verify)
	validate_string($ssl_session_timeout)
	if ($ssl_trusted_cert != undef) {
	validate_string($ssl_trusted_cert)
	}
	validate_string($spdy)
	if ($proxy != undef) {
	validate_string($proxy)
	}
	validate_string($proxy_read_timeout)
	if ($proxy_redirect != undef) {
	validate_string($proxy_redirect)
	}
	validate_array($proxy_set_header)
	if ($proxy_cache != false) {
	validate_string($proxy_cache)
	}
	if ($proxy_cache_key != undef) {
	validate_string($proxy_cache_key)
	}
	if ($proxy_cache_use_stale != undef) {
	validate_string($proxy_cache_use_stale)
	}
	if ($proxy_cache_valid != false) {
	validate_string($proxy_cache_valid)
	}
	if ($proxy_method != undef) {
	validate_string($proxy_method)
	}
	if ($proxy_set_body != undef) {
	validate_string($proxy_set_body)
	}
	validate_array($resolver)
	if ($fastcgi != undef) {
	validate_string($fastcgi)
	}
	validate_string($fastcgi_params)
	if ($fastcgi_script != undef) {
	validate_string($fastcgi_script)
	}
	if ($uwsgi != undef) {
	validate_string($uwsgi)
	}
	validate_string($uwsgi_params)
	validate_array($index_files)
	if ($autoindex != undef) {
	validate_string($autoindex)
	}
	validate_array($server_name)
	if ($www_root != undef) {
	validate_string($www_root)
	}
	validate_bool($rewrite_www_to_non_www)
	if ($rewrite_to_https != undef) {
	validate_bool($rewrite_to_https)
	}
	if ($raw_prepend != undef) {
	if (is_array($raw_prepend)) {
	validate_array($raw_prepend)
	} else {
	validate_string($raw_prepend)
	}
	}
	if ($raw_append != undef) {
	if (is_array($raw_append)) {
	validate_array($raw_append)
	} else {
	validate_string($raw_append)
	}
	}
	if ($location_raw_prepend != undef) {
	if (is_array($location_raw_prepend)) {
	validate_array($location_raw_prepend)
	} else {
	validate_string($location_raw_prepend)
	}
	}
	if ($location_raw_append != undef) {
	if (is_array($location_raw_append)) {
	validate_array($location_raw_append)
	} else {
	validate_string($location_raw_append)
	}
	}
	if ($location_custom_cfg != undef) {
	validate_hash($location_custom_cfg)
	}
	if ($location_cfg_prepend != undef) {
	validate_hash($location_cfg_prepend)
	}
	if ($location_cfg_append != undef) {
	validate_hash($location_cfg_append)
	}
	if ($try_files != undef) {
	validate_array($try_files)
	}
	if ($auth_basic != undef) {
	validate_string($auth_basic)
	}
	if ($auth_basic_user_file != undef) {
	validate_string($auth_basic_user_file)
	}
	if ($vhost_cfg_prepend != undef) {
	validate_hash($vhost_cfg_prepend)
	}
	if ($vhost_cfg_append != undef) {
	validate_hash($vhost_cfg_append)
	}
	if ($vhost_cfg_ssl_prepend != undef) {
	validate_hash($vhost_cfg_ssl_prepend)
	}
	if ($vhost_cfg_ssl_append != undef) {
	validate_hash($vhost_cfg_ssl_append)
	}
	if ($include_files != undef) {
	validate_array($include_files)
	}
	if ($access_log != undef) {
	validate_string($access_log)
	}
	if ($error_log != undef) {
	validate_string($error_log)
	}
	if ($passenger_cgi_param != undef) {
	validate_hash($passenger_cgi_param)
	}
	if ($passenger_set_header != undef) {
	validate_hash($passenger_set_header)
	}
	if ($passenger_env_var != undef) {
	validate_hash($passenger_env_var)
	}
	if ($log_by_lua != undef) {
	validate_string($log_by_lua)
	}
	if ($log_by_lua_file != undef) {
	validate_string($log_by_lua_file)
	}
	if ($client_body_timeout != undef) {
	validate_string($client_body_timeout)
	}
	if ($client_header_timeout != undef) {
	validate_string($client_header_timeout)
	}
	if ($gzip_types != undef) {
	validate_string($gzip_types)
	}
	validate_bool($use_default_location)
	validate_array($rewrite_rules)
	validate_hash($string_mappings)
	validate_hash($geo_mappings)

	validate_string($owner)
	validate_string($group)
	validate_re($mode, '^\d{4}$',
	"${mode} is not valid. It should be 4 digits (0644 by default).")

	# Variables
	$vhost_dir = "${::nginx::config::conf_dir}/sites-available"
	$vhost_enable_dir = "${::nginx::config::conf_dir}/sites-enabled"
	$vhost_symlink_ensure = $ensure ? {
	'absent' => absent,
	default => 'link',
	}

	$name_sanitized = regsubst($name, ' ', '_', 'G')
	$config_file = "${vhost_dir}/${name_sanitized}.conf"

	File {
	ensure => $ensure ? {
	'absent' => absent,
	default => 'file',
	},
	notify => Class['::nginx::service'],
	owner => $owner,
	group => $group,
	mode => $mode,
	}

	# Add IPv6 Logic Check - Nginx service will not start if ipv6 is enabled
	# and support does not exist for it in the kernel.
	if ($ipv6_enable == true) and (!$::ipaddress6) {
	warning('nginx: IPv6 support is not enabled or configured properly')
	}

	# Check to see if SSL Certificates are properly defined.
	if ($ssl == true) {
	if ($ssl_cert == undef) or ($ssl_key == undef) {
	fail('nginx: SSL certificate/key (ssl_cert/ssl_key) and/or SSL Private must be defined and exist on the target system(s)')
	}
	}

	# This was a lot to add up in parameter list so add it down here
	# Also opted to add more logic here and keep template cleaner which
	# unfortunately means resorting to the $varname_real thing
	$access_log_real = $access_log ? {
	'off' => 'off',
	undef => "${::nginx::config::log_dir}/${name_sanitized}.access.log ${format_log}",
	default => "${access_log} ${format_log}",
	}

	$error_log_real = $error_log ? {
	undef => "${::nginx::config::log_dir}/${name_sanitized}.error.log",
	default => $error_log,
	}

	concat { $config_file:
	- owner => $owner,
	- group => $group,
	- mode => $mode,
	- notify => Class['::nginx::service'],
	- require => File[$vhost_dir]
	+ owner => $owner,
	+ group => $group,
	+ mode => $mode,
	+ notify => Class['::nginx::service'],
	}

	$ssl_only = ($ssl == true) and ($ssl_port == $listen_port)

	if $use_default_location == true {
	# Create the default location reference for the vHost
	::nginx::resource::location {"${name_sanitized}-default":
	ensure => $ensure,
	vhost => $name_sanitized,
	ssl => $ssl,
	ssl_only => $ssl_only,
	location => '/',
	location_allow => $location_allow,
	location_deny => $location_deny,
	proxy => $proxy,
	proxy_redirect => $proxy_redirect,
	proxy_read_timeout => $proxy_read_timeout,
	proxy_connect_timeout => $proxy_connect_timeout,
	proxy_cache => $proxy_cache,
	proxy_cache_key => $proxy_cache_key,
	proxy_cache_use_stale => $proxy_cache_use_stale,
	proxy_cache_valid => $proxy_cache_valid,
	proxy_method => $proxy_method,
	proxy_set_header => $proxy_set_header,
	proxy_set_body => $proxy_set_body,
	fastcgi => $fastcgi,
	fastcgi_params => $fastcgi_params,
	fastcgi_script => $fastcgi_script,
	uwsgi => $uwsgi,
	uwsgi_params => $uwsgi_params,
	try_files => $try_files,
	www_root => $www_root,
	autoindex => $autoindex,
	index_files => $index_files,
	location_custom_cfg => $location_custom_cfg,
	location_cfg_prepend => $location_cfg_prepend,
	location_cfg_append => $location_cfg_append,
	location_custom_cfg_prepend => $location_custom_cfg_prepend,
	location_custom_cfg_append => $location_custom_cfg_append,
	rewrite_rules => $rewrite_rules,
	raw_prepend => $location_raw_prepend,
	raw_append => $location_raw_append,
	notify => Class['nginx::service'],
	}
	$root = undef
	} else {
	$root = $www_root
	}

	if $fastcgi != undef and !defined(File[$fastcgi_params]) {
	file { $fastcgi_params:
	ensure => present,
	mode => '0770',
	content => template('nginx/vhost/fastcgi_params.erb'),
	}
	}

	if $uwsgi != undef and !defined(File[$uwsgi_params]) {
	file { $uwsgi_params:
	ensure => present,
	mode => '0770',
	content => template('nginx/vhost/uwsgi_params.erb'),
	}
	}

	if ($listen_port != $ssl_port) {
	concat::fragment { "${name_sanitized}-header":
	target => $config_file,
	content => template('nginx/vhost/vhost_header.erb'),
	order => '001',
	}
	}

	# Create a proper file close stub.
	if ($listen_port != $ssl_port) {
	concat::fragment { "${name_sanitized}-footer":
	target => $config_file,
	content => template('nginx/vhost/vhost_footer.erb'),
	order => '699',
	}
	}

	# Create SSL File Stubs if SSL is enabled
	if ($ssl == true) {
	# Access and error logs are named differently in ssl template

	# This was a lot to add up in parameter list so add it down here
	# Also opted to add more logic here and keep template cleaner which
	# unfortunately means resorting to the $varname_real thing
	$ssl_access_log_real = $access_log ? {
	'off' => 'off',
	undef => "${::nginx::config::log_dir}/ssl-${name_sanitized}.access.log ${format_log}",
	default => "${access_log} ${format_log}",
	}

	$ssl_error_log_real = $error_log ? {
	undef => "${::nginx::config::log_dir}/ssl-${name_sanitized}.error.log",
	default => $error_log,
	}

	concat::fragment { "${name_sanitized}-ssl-header":
	target => $config_file,
	content => template('nginx/vhost/vhost_ssl_header.erb'),
	order => '700',
	}
	concat::fragment { "${name_sanitized}-ssl-footer":
	target => $config_file,
	content => template('nginx/vhost/vhost_ssl_footer.erb'),
	order => '999',
	}
	}

	file{ "${name_sanitized}.conf symlink":
	ensure => $vhost_symlink_ensure,
	path => "${vhost_enable_dir}/${name_sanitized}.conf",
	target => $config_file,
	require => Concat[$config_file],
	notify => Class['::nginx::service'],
	}

	create_resources('::nginx::resource::map', $string_mappings)
	create_resources('::nginx::resource::geo', $geo_mappings)
	}

File Metadata

Mime Type: text/x-diff
Expires: Mon, Aug 18, 9:56 PM (20 h, 35 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 3463933

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions