diff --git a/manifests/config.pp b/manifests/config.pp index 6414dcd..c305c2a 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -1,280 +1,281 @@ # Class: nginx::config # # This module manages NGINX bootstrap and configuration # # Parameters: # # There are no default parameters for this class. # # Actions: # # Requires: # # Sample Usage: # # This class file is not called directly class nginx::config { assert_private() $client_body_temp_path = $nginx::client_body_temp_path $confd_only = $nginx::confd_only $confd_purge = $nginx::confd_purge $conf_dir = $nginx::conf_dir $daemon = $nginx::daemon $daemon_user = $nginx::daemon_user $daemon_group = $nginx::daemon_group $dynamic_modules = $nginx::dynamic_modules $global_owner = $nginx::global_owner $global_group = $nginx::global_group $global_mode = $nginx::global_mode $limit_req_zone = $nginx::limit_req_zone $log_dir = $nginx::log_dir $log_user = $nginx::log_user $log_group = $nginx::log_group $log_mode = $nginx::log_mode $http_access_log = $nginx::http_access_log $http_format_log = $nginx::http_format_log $nginx_error_log = $nginx::nginx_error_log $nginx_error_log_severity = $nginx::nginx_error_log_severity $pid = $nginx::pid $proxy_temp_path = $nginx::proxy_temp_path $root_group = $nginx::root_group $run_dir = $nginx::run_dir $sites_available_owner = $nginx::sites_available_owner $sites_available_group = $nginx::sites_available_group $sites_available_mode = $nginx::sites_available_mode $super_user = $nginx::super_user $temp_dir = $nginx::temp_dir $server_purge = $nginx::server_purge $absolute_redirect = $nginx::absolute_redirect $accept_mutex = $nginx::accept_mutex $accept_mutex_delay = $nginx::accept_mutex_delay $client_body_buffer_size = $nginx::client_body_buffer_size $client_max_body_size = $nginx::client_max_body_size $client_body_timeout = $nginx::client_body_timeout $send_timeout = $nginx::send_timeout $lingering_timeout = $nginx::lingering_timeout $etag = $nginx::etag $events_use = $nginx::events_use $fastcgi_cache_inactive = $nginx::fastcgi_cache_inactive $fastcgi_cache_key = $nginx::fastcgi_cache_key $fastcgi_cache_keys_zone = $nginx::fastcgi_cache_keys_zone $fastcgi_cache_levels = $nginx::fastcgi_cache_levels $fastcgi_cache_max_size = $nginx::fastcgi_cache_max_size $fastcgi_cache_path = $nginx::fastcgi_cache_path $fastcgi_cache_use_stale = $nginx::fastcgi_cache_use_stale $gzip = $nginx::gzip $gzip_buffers = $nginx::gzip_buffers $gzip_comp_level = $nginx::gzip_comp_level $gzip_disable = $nginx::gzip_disable $gzip_min_length = $nginx::gzip_min_length $gzip_http_version = $nginx::gzip_http_version $gzip_proxied = $nginx::gzip_proxied $gzip_types = $nginx::gzip_types $gzip_vary = $nginx::gzip_vary $http_raw_prepend = $nginx::http_raw_prepend $http_raw_append = $nginx::http_raw_append $http_cfg_prepend = $nginx::http_cfg_prepend $http_cfg_append = $nginx::http_cfg_append $http_tcp_nodelay = $nginx::http_tcp_nodelay $http_tcp_nopush = $nginx::http_tcp_nopush $keepalive_timeout = $nginx::keepalive_timeout $keepalive_requests = $nginx::keepalive_requests $log_format = $nginx::log_format $mail = $nginx::mail $mime_types_path = $nginx::mime_types_path $stream = $nginx::stream $mime_types = $nginx::mime_types_preserve_defaults ? { true => merge($nginx::params::mime_types,$nginx::mime_types), default => $nginx::mime_types, } $multi_accept = $nginx::multi_accept $names_hash_bucket_size = $nginx::names_hash_bucket_size $names_hash_max_size = $nginx::names_hash_max_size $nginx_cfg_prepend = $nginx::nginx_cfg_prepend $proxy_buffers = $nginx::proxy_buffers $proxy_buffer_size = $nginx::proxy_buffer_size $proxy_busy_buffers_size = $nginx::proxy_busy_buffers_size $proxy_cache_inactive = $nginx::proxy_cache_inactive $proxy_cache_keys_zone = $nginx::proxy_cache_keys_zone $proxy_cache_levels = $nginx::proxy_cache_levels $proxy_cache_max_size = $nginx::proxy_cache_max_size $proxy_cache_path = $nginx::proxy_cache_path $proxy_cache_loader_files = $nginx::proxy_cache_loader_files $proxy_cache_loader_sleep = $nginx::proxy_cache_loader_sleep $proxy_cache_loader_threshold = $nginx::proxy_cache_loader_threshold $proxy_use_temp_path = $nginx::proxy_use_temp_path $proxy_connect_timeout = $nginx::proxy_connect_timeout $proxy_headers_hash_bucket_size = $nginx::proxy_headers_hash_bucket_size $proxy_http_version = $nginx::proxy_http_version $proxy_max_temp_file_size = $nginx::proxy_max_temp_file_size $proxy_read_timeout = $nginx::proxy_read_timeout $proxy_redirect = $nginx::proxy_redirect $proxy_send_timeout = $nginx::proxy_send_timeout $proxy_set_header = $nginx::proxy_set_header $proxy_hide_header = $nginx::proxy_hide_header $proxy_pass_header = $nginx::proxy_pass_header $sendfile = $nginx::sendfile $server_tokens = $nginx::server_tokens $spdy = $nginx::spdy $http2 = $nginx::http2 $ssl_stapling = $nginx::ssl_stapling $types_hash_bucket_size = $nginx::types_hash_bucket_size $types_hash_max_size = $nginx::types_hash_max_size $worker_connections = $nginx::worker_connections $worker_processes = $nginx::worker_processes $worker_rlimit_nofile = $nginx::worker_rlimit_nofile $ssl_prefer_server_ciphers = $nginx::ssl_prefer_server_ciphers $ssl_protocols = $nginx::ssl_protocols $ssl_ciphers = $nginx::ssl_ciphers + $include_modules_enabled = $nginx::include_modules_enabled # Non-configurable settings $conf_template = 'nginx/conf.d/nginx.conf.erb' $mime_template = 'nginx/conf.d/mime.types.epp' $proxy_conf_template = undef File { owner => $global_owner, group => $global_group, mode => $global_mode, } file { $conf_dir: ensure => directory, } file { "${conf_dir}/conf.stream.d": ensure => directory, } file { "${conf_dir}/conf.d": ensure => directory, } if $confd_purge { # Err on the side of caution - make sure *both* $server_purge and # $confd_purge are set if $confd_only is set, before purging files # ${conf_dir}/conf.d if (($confd_only and $server_purge) or !$confd_only) { File["${conf_dir}/conf.d"] { purge => true, recurse => true, notify => Class['nginx::service'], } File["${conf_dir}/conf.stream.d"] { purge => true, recurse => true, notify => Class['nginx::service'], } } } file { "${conf_dir}/conf.mail.d": ensure => directory, } if $confd_purge == true { File["${conf_dir}/conf.mail.d"] { purge => true, recurse => true, } } file {$run_dir: ensure => directory, } if $nginx::manage_snippets_dir { file { $nginx::snippets_dir: ensure => directory, } } file { $log_dir: ensure => directory, mode => $log_mode, owner => $log_user, group => $log_group, } if $client_body_temp_path { file {$client_body_temp_path: ensure => directory, owner => $daemon_user, } } if $proxy_temp_path { file {$proxy_temp_path: ensure => directory, owner => $daemon_user, } } unless $confd_only { file { "${conf_dir}/sites-available": ensure => directory, owner => $sites_available_owner, group => $sites_available_group, mode => $sites_available_mode, } file { "${conf_dir}/sites-enabled": ensure => directory, owner => $sites_available_owner, group => $sites_available_group, mode => $sites_available_mode, } if $server_purge { File["${conf_dir}/sites-available"] { purge => true, recurse => true, } File["${conf_dir}/sites-enabled"] { purge => true, recurse => true, } } # No real reason not to make these even if $stream is not enabled. file { "${conf_dir}/streams-enabled": ensure => directory, owner => $sites_available_owner, group => $sites_available_group, mode => $sites_available_mode, } file { "${conf_dir}/streams-available": ensure => directory, owner => $sites_available_owner, group => $sites_available_group, mode => $sites_available_mode, } if $server_purge { File["${conf_dir}/streams-enabled"] { purge => true, recurse => true, } } } file { "${conf_dir}/nginx.conf": ensure => file, content => template($conf_template), } file { "${conf_dir}/mime.types": ensure => file, content => epp($mime_template), } file { "${temp_dir}/nginx.d": ensure => absent, purge => true, recurse => true, force => true, } file { "${temp_dir}/nginx.mail.d": ensure => absent, purge => true, recurse => true, force => true, } } diff --git a/manifests/init.pp b/manifests/init.pp index ef23e5d..f3a6f16 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,220 +1,221 @@ # Class: nginx # # This module manages NGINX. # # Parameters: # # Actions: # # Requires: # puppetlabs-stdlib - https://github.com/puppetlabs/puppetlabs-stdlib # # Packaged NGINX # - RHEL: EPEL or custom package # - Debian/Ubuntu: Default Install or custom package # - SuSE: Default Install or custom package # # stdlib # - puppetlabs-stdlib module >= 0.1.6 # # Sample Usage: # # The module works with sensible defaults: # # node default { # include nginx # } # # @param nginx_version # The version of nginx installed (or being installed). # Unfortunately, different versions of nginx may need configuring # differently. The default is derived from the version of nginx # already installed. If the fact is unavailable, it defaults to '1.6.0'. # You may need to set this manually to get a working and idempotent # configuration. class nginx ( ### START Nginx Configuration ### Variant[Stdlib::Absolutepath, Boolean] $client_body_temp_path = $nginx::params::client_body_temp_path, Boolean $confd_only = false, Boolean $confd_purge = false, $conf_dir = $nginx::params::conf_dir, Optional[Enum['on', 'off']] $daemon = undef, $daemon_user = $nginx::params::daemon_user, $daemon_group = undef, Array[String] $dynamic_modules = [], $global_owner = $nginx::params::global_owner, $global_group = $nginx::params::global_group, $global_mode = $nginx::params::global_mode, Optional[Variant[String[1], Array[String[1]]]] $limit_req_zone = undef, Stdlib::Absolutepath $log_dir = $nginx::params::log_dir, String[1] $log_user = $nginx::params::log_user, String[1] $log_group = $nginx::params::log_group, Stdlib::Filemode $log_mode = $nginx::params::log_mode, Variant[String, Array[String]] $http_access_log = "${log_dir}/${nginx::params::http_access_log_file}", $http_format_log = undef, Variant[String, Array[String]] $nginx_error_log = "${log_dir}/${nginx::params::nginx_error_log_file}", Nginx::ErrorLogSeverity $nginx_error_log_severity = 'error', $pid = $nginx::params::pid, Variant[Stdlib::Absolutepath, Boolean] $proxy_temp_path = $nginx::params::proxy_temp_path, $root_group = $nginx::params::root_group, $run_dir = $nginx::params::run_dir, $sites_available_owner = $nginx::params::sites_available_owner, $sites_available_group = $nginx::params::sites_available_group, $sites_available_mode = $nginx::params::sites_available_mode, Boolean $super_user = $nginx::params::super_user, $temp_dir = $nginx::params::temp_dir, Boolean $server_purge = false, + Boolean $include_modules_enabled = $nginx::params::include_modules_enabled, # Primary Templates $conf_template = 'nginx/conf.d/nginx.conf.erb', ### START Nginx Configuration ### Optional[Enum['on', 'off']] $absolute_redirect = undef, Enum['on', 'off'] $accept_mutex = 'on', $accept_mutex_delay = '500ms', $client_body_buffer_size = '128k', String $client_max_body_size = '10m', $client_body_timeout = '60s', $send_timeout = '60s', $lingering_timeout = '5s', Optional[Enum['on', 'off']] $etag = undef, Optional[String] $events_use = undef, String $fastcgi_cache_inactive = '20m', Optional[String] $fastcgi_cache_key = undef, String $fastcgi_cache_keys_zone = 'd3:100m', String $fastcgi_cache_levels = '1', String $fastcgi_cache_max_size = '500m', Optional[String] $fastcgi_cache_path = undef, Optional[String] $fastcgi_cache_use_stale = undef, Enum['on', 'off'] $gzip = 'off', $gzip_buffers = undef, $gzip_comp_level = 1, $gzip_disable = 'msie6', $gzip_min_length = 20, $gzip_http_version = 1.1, $gzip_proxied = 'off', $gzip_types = undef, Enum['on', 'off'] $gzip_vary = 'off', Optional[Variant[Hash, Array]] $http_cfg_prepend = undef, Optional[Variant[Hash, Array]] $http_cfg_append = undef, Optional[Variant[Array[String], String]] $http_raw_prepend = undef, Optional[Variant[Array[String], String]] $http_raw_append = undef, Enum['on', 'off'] $http_tcp_nodelay = 'on', Enum['on', 'off'] $http_tcp_nopush = 'off', $keepalive_timeout = '65s', $keepalive_requests = '100', $log_format = {}, Boolean $mail = false, Variant[String, Boolean] $mime_types_path = 'mime.types', Boolean $stream = false, String $multi_accept = 'off', Integer $names_hash_bucket_size = 64, Integer $names_hash_max_size = 512, $nginx_cfg_prepend = false, String $proxy_buffers = '32 4k', String $proxy_buffer_size = '8k', String $proxy_cache_inactive = '20m', String $proxy_cache_keys_zone = 'd2:100m', String $proxy_cache_levels = '1', String $proxy_cache_max_size = '500m', Optional[Variant[Hash, String]] $proxy_cache_path = undef, Optional[Integer] $proxy_cache_loader_files = undef, Optional[String] $proxy_cache_loader_sleep = undef, Optional[String] $proxy_cache_loader_threshold = undef, Optional[Enum['on', 'off']] $proxy_use_temp_path = undef, $proxy_connect_timeout = '90s', Integer $proxy_headers_hash_bucket_size = 64, Optional[String] $proxy_http_version = undef, $proxy_read_timeout = '90s', $proxy_redirect = undef, $proxy_send_timeout = '90s', Array $proxy_set_header = [ 'Host $host', 'X-Real-IP $remote_addr', 'X-Forwarded-For $proxy_add_x_forwarded_for', 'Proxy ""', ], Array $proxy_hide_header = [], Array $proxy_pass_header = [], Array $proxy_ignore_header = [], Optional[Nginx::Size] $proxy_max_temp_file_size = undef, Optional[Nginx::Size] $proxy_busy_buffers_size = undef, Enum['on', 'off'] $sendfile = 'on', Enum['on', 'off'] $server_tokens = 'on', Enum['on', 'off'] $spdy = 'off', Enum['on', 'off'] $http2 = 'off', Enum['on', 'off'] $ssl_stapling = 'off', Stdlib::Absolutepath $snippets_dir = $nginx::params::snippets_dir, Boolean $manage_snippets_dir = true, $types_hash_bucket_size = '512', $types_hash_max_size = '1024', Integer $worker_connections = 1024, Enum['on', 'off'] $ssl_prefer_server_ciphers = 'on', Variant[Integer, Enum['auto']] $worker_processes = 'auto', Integer $worker_rlimit_nofile = 1024, $ssl_protocols = 'TLSv1 TLSv1.1 TLSv1.2', $ssl_ciphers = 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS', # lint:ignore:140chars Optional[Stdlib::Unixpath] $ssl_dhparam = undef, ### START Package Configuration ### $package_ensure = present, $package_name = $nginx::params::package_name, $package_source = 'nginx', $package_flavor = undef, Boolean $manage_repo = $nginx::params::manage_repo, Hash[String[1], String[1]] $mime_types = $nginx::params::mime_types, Boolean $mime_types_preserve_defaults = false, Optional[String] $repo_release = undef, $passenger_package_ensure = 'present', String $passenger_package_name = $nginx::params::passenger_package_name, Optional[Stdlib::HTTPUrl] $repo_source = undef, ### END Package Configuration ### ### START Service Configuation ### $service_ensure = running, $service_enable = true, $service_flags = undef, $service_restart = undef, $service_name = 'nginx', $service_manage = true, ### END Service Configuration ### ### START Hiera Lookups ### Hash $geo_mappings = {}, Hash $geo_mappings_defaults = {}, Hash $string_mappings = {}, Hash $string_mappings_defaults = {}, Hash $nginx_locations = {}, Hash $nginx_locations_defaults = {}, Hash $nginx_mailhosts = {}, Hash $nginx_mailhosts_defaults = {}, Hash $nginx_servers = {}, Hash $nginx_servers_defaults = {}, Hash $nginx_streamhosts = {}, Hash $nginx_streamhosts_defaults = {}, Hash $nginx_upstreams = {}, Nginx::UpstreamDefaults $nginx_upstreams_defaults = {}, Boolean $purge_passenger_repo = true, String[1] $nginx_version = pick(fact('nginx_version'), '1.6.0'), ### END Hiera Lookups ### ) inherits nginx::params { contain 'nginx::package' contain 'nginx::config' contain 'nginx::service' create_resources( 'nginx::resource::geo', $geo_mappings, $geo_mappings_defaults ) create_resources( 'nginx::resource::location', $nginx_locations, $nginx_locations_defaults ) create_resources( 'nginx::resource::mailhost', $nginx_mailhosts, $nginx_mailhosts_defaults ) create_resources( 'nginx::resource::map', $string_mappings, $string_mappings_defaults ) create_resources( 'nginx::resource::server', $nginx_servers, $nginx_servers_defaults ) create_resources( 'nginx::resource::streamhost', $nginx_streamhosts, $nginx_streamhosts_defaults ) create_resources( 'nginx::resource::upstream', $nginx_upstreams, $nginx_upstreams_defaults ) # Allow the end user to establish relationships to the "main" class # and preserve the relationship to the implementation classes through # a transitive relationship to the composite class. Class['nginx::package'] -> Class['nginx::config'] ~> Class['nginx::service'] Class['nginx::package'] ~> Class['nginx::service'] } diff --git a/manifests/params.pp b/manifests/params.pp index 0ec7b2b..39c27f1 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -1,246 +1,249 @@ # Class: nginx::params # ==================== # # nginx default settings and according to operating system # class nginx::params { ### Operating System Configuration ## This is my hacky... no hiera system. Oh well. :) $_module_defaults = { - 'conf_dir' => '/etc/nginx', - 'daemon_user' => 'nginx', - 'pid' => '/var/run/nginx.pid', - 'root_group' => 'root', - 'log_dir' => '/var/log/nginx', - 'log_user' => 'nginx', - 'log_group' => 'root', - 'log_mode' => '0750', - 'run_dir' => '/var/nginx', - 'package_name' => 'nginx', - 'passenger_package_name' => 'passenger', - 'manage_repo' => false, - 'mime_types' => { + 'conf_dir' => '/etc/nginx', + 'daemon_user' => 'nginx', + 'pid' => '/var/run/nginx.pid', + 'root_group' => 'root', + 'log_dir' => '/var/log/nginx', + 'log_user' => 'nginx', + 'log_group' => 'root', + 'log_mode' => '0750', + 'run_dir' => '/var/nginx', + 'package_name' => 'nginx', + 'passenger_package_name' => 'passenger', + 'manage_repo' => false, + 'include_modules_enabled' => false, + 'mime_types' => { 'text/html' => 'html htm shtml', 'text/css' => 'css', 'text/xml' => 'xml', 'image/gif' => 'gif', 'image/jpeg' => 'jpeg jpg', 'application/javascript' => 'js', 'application/atom+xml' => 'atom', 'application/rss+xml' => 'rss', 'text/mathml' => 'mml', 'text/plain' => 'txt', 'text/vnd.sun.j2me.app-descriptor' => 'jad', 'text/vnd.wap.wml' => 'wml', 'text/x-component' => 'htc', 'image/png' => 'png', 'image/tiff' => 'tif tiff', 'image/vnd.wap.wbmp' => 'wbmp', 'image/x-icon' => 'ico', 'image/x-jng' => 'jng', 'image/x-ms-bmp' => 'bmp', 'image/svg+xml' => 'svg svgz', 'image/webp' => 'webp', 'application/font-woff' => 'woff', 'application/java-archive' => 'jar war ear', 'application/json' => 'json', 'application/mac-binhex40' => 'hqx', 'application/msword' => 'doc', 'application/pdf' => 'pdf', 'application/postscript' => 'ps eps ai', 'application/rtf' => 'rtf', 'application/vnd.apple.mpegurl' => 'm3u8', 'application/vnd.ms-excel' => 'xls', 'application/vnd.ms-fontobject' => 'eot', 'application/vnd.ms-powerpoint' => 'ppt', 'application/vnd.wap.wmlc' => 'wmlc', 'application/vnd.google-earth.kml+xml' => 'kml', 'application/vnd.google-earth.kmz' => 'kmz', 'application/x-7z-compressed' => '7z', 'application/x-cocoa' => 'cco', 'application/x-java-archive-diff' => 'jardiff', 'application/x-java-jnlp-file' => 'jnlp', 'application/x-makeself' => 'run', 'application/x-perl' => 'pl pm', 'application/x-pilot' => 'prc pdb', 'application/x-rar-compressed' => 'rar', 'application/x-redhat-package-manager' => 'rpm', 'application/x-sea' => 'sea', 'application/x-shockwave-flash' => 'swf', 'application/x-stuffit' => 'sit', 'application/x-tcl' => 'tcl tk', 'application/x-x509-ca-cert' => 'der pem crt', 'application/x-xpinstall' => 'xpi', 'application/xhtml+xml' => 'xhtml', 'application/xspf+xml' => 'xspf', 'application/zip' => 'zip', 'application/octet-stream' => 'bin exe dll deb dmg iso img msi msp msm', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' => 'docx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' => 'xlsx', 'application/vnd.openxmlformats-officedocument.presentationml.presentation' => 'pptx', 'audio/midi' => 'mid midi kar', 'audio/mpeg' => 'mp3', 'audio/ogg' => 'ogg', 'audio/x-m4a' => 'm4a', 'audio/x-realaudio' => 'ra', 'video/3gpp' => '3gpp 3gp', 'video/mp2t' => 'ts', 'video/mp4' => 'mp4', 'video/mpeg' => 'mpeg mpg', 'video/quicktime' => 'mov', 'video/webm' => 'webm', 'video/x-flv' => 'flv', 'video/x-m4v' => 'm4v', 'video/x-mng' => 'mng', 'video/x-ms-asf' => 'asx asf', 'video/x-ms-wmv' => 'wmv', 'video/x-msvideo' => 'avi', }, } case $facts['os']['family'] { 'ArchLinux': { $_module_os_overrides = { 'pid' => false, 'daemon_user' => 'http', 'log_user' => 'http', 'log_group' => 'log', 'package_name' => 'nginx-mainline', } } 'Debian': { if ($facts['os']['name'] == 'ubuntu' and $facts['lsbdistcodename'] in ['bionic']) or ($facts['os']['name'] == 'debian' and $facts['os']['release']['major'] in ['9', '10']) { $_module_os_overrides = { - 'manage_repo' => true, - 'daemon_user' => 'www-data', - 'log_user' => 'root', - 'log_group' => 'adm', - 'log_mode' => '0755', - 'run_dir' => '/run/nginx', - 'passenger_package_name' => 'libnginx-mod-http-passenger', + 'manage_repo' => true, + 'daemon_user' => 'www-data', + 'log_user' => 'root', + 'log_group' => 'adm', + 'log_mode' => '0755', + 'run_dir' => '/run/nginx', + 'passenger_package_name' => 'libnginx-mod-http-passenger', + 'include_modules_enabled' => true, } } elsif ($facts['os']['name'] == 'ubuntu' and $facts['lsbdistcodename'] in ['lucid', 'precise', 'trusty', 'xenial']) or ($facts['os']['name'] == 'debian' and $facts['os']['release']['major'] in ['6', '7', '8']) { $_module_os_overrides = { 'manage_repo' => true, 'daemon_user' => 'www-data', 'log_user' => 'root', 'log_group' => 'adm', 'log_mode' => '0755', 'run_dir' => '/run/nginx', } } else { $_module_os_overrides = { 'daemon_user' => 'www-data', 'log_user' => 'root', 'log_group' => 'adm', 'log_mode' => '0755', 'run_dir' => '/run/nginx', } } } 'DragonFly', 'FreeBSD': { $_module_os_overrides = { 'conf_dir' => '/usr/local/etc/nginx', 'daemon_user' => 'www', 'root_group' => 'wheel', 'log_group' => 'wheel', 'log_user' => 'root', } } 'Gentoo': { $_module_os_overrides = { 'package_name' => 'www-servers/nginx', } } 'RedHat': { if ($facts['os']['name'] in ['RedHat', 'CentOS', 'Oracle', 'virtuozzolinux'] and $facts['os']['release']['major'] in ['6', '7']) { $_module_os_overrides = { 'manage_repo' => true, 'log_group' => 'nginx', } } else { $_module_os_overrides = { 'log_group' => 'nginx', } } } 'Solaris': { case $facts['os']['name'] { 'SmartOS': { $_module_os_overrides = { 'conf_dir' => '/opt/local/etc/nginx', 'daemon_user' => 'www', 'log_user' => 'www', 'log_group' => 'root', } } default: { $_module_os_overrides = { 'daemon_user' => 'webservd', 'package_name' => undef, } } } } 'OpenBSD': { $_module_os_overrides = { 'daemon_user' => 'www', 'root_group' => 'wheel', 'log_dir' => '/var/www/logs', 'log_user' => 'www', 'log_group' => 'wheel', 'run_dir' => '/var/www', } } 'AIX': { $_module_os_overrides = { 'daemon_user' => 'nginx', 'root_group' => 'system', 'conf_dir' => '/opt/freeware/etc/nginx/', 'log_dir' => '/opt/freeware/var/log/nginx/', 'log_group' => 'system', 'run_dir' => '/opt/freeware/share/nginx/html', } } default: { ## For cases not covered in $::osfamily case $facts['os']['name'] { default: { $_module_os_overrides = {} } } } } $_module_parameters = merge($_module_defaults, $_module_os_overrides) ### END Operating System Configuration ### Referenced Variables - $conf_dir = $_module_parameters['conf_dir'] - $snippets_dir = "${conf_dir}/snippets" - $log_dir = $_module_parameters['log_dir'] - $log_user = $_module_parameters['log_user'] - $log_group = $_module_parameters['log_group'] - $log_mode = $_module_parameters['log_mode'] - $run_dir = $_module_parameters['run_dir'] - $temp_dir = '/tmp' - $pid = $_module_parameters['pid'] + $conf_dir = $_module_parameters['conf_dir'] + $snippets_dir = "${conf_dir}/snippets" + $log_dir = $_module_parameters['log_dir'] + $log_user = $_module_parameters['log_user'] + $log_group = $_module_parameters['log_group'] + $log_mode = $_module_parameters['log_mode'] + $run_dir = $_module_parameters['run_dir'] + $temp_dir = '/tmp' + $pid = $_module_parameters['pid'] + $include_modules_enabled = $_module_parameters['include_modules_enabled'] - $client_body_temp_path = "${run_dir}/client_body_temp" - $daemon_user = $_module_parameters['daemon_user'] - $global_owner = 'root' - $global_group = $_module_parameters['root_group'] - $global_mode = '0644' - $http_access_log_file = 'access.log' - $manage_repo = $_module_parameters['manage_repo'] - $mime_types = $_module_parameters['mime_types'] - $nginx_error_log_file = 'error.log' - $root_group = $_module_parameters['root_group'] - $package_name = $_module_parameters['package_name'] - $passenger_package_name = $_module_parameters['passenger_package_name'] - $proxy_temp_path = "${run_dir}/proxy_temp" - $sites_available_owner = 'root' - $sites_available_group = $_module_parameters['root_group'] - $sites_available_mode = '0644' - $super_user = true + $client_body_temp_path = "${run_dir}/client_body_temp" + $daemon_user = $_module_parameters['daemon_user'] + $global_owner = 'root' + $global_group = $_module_parameters['root_group'] + $global_mode = '0644' + $http_access_log_file = 'access.log' + $manage_repo = $_module_parameters['manage_repo'] + $mime_types = $_module_parameters['mime_types'] + $nginx_error_log_file = 'error.log' + $root_group = $_module_parameters['root_group'] + $package_name = $_module_parameters['package_name'] + $passenger_package_name = $_module_parameters['passenger_package_name'] + $proxy_temp_path = "${run_dir}/proxy_temp" + $sites_available_owner = 'root' + $sites_available_group = $_module_parameters['root_group'] + $sites_available_mode = '0644' + $super_user = true ### END Referenced Variables } diff --git a/templates/conf.d/nginx.conf.erb b/templates/conf.d/nginx.conf.erb index 64c1170..9583580 100644 --- a/templates/conf.d/nginx.conf.erb +++ b/templates/conf.d/nginx.conf.erb @@ -1,254 +1,257 @@ # MANAGED BY PUPPET <% @dynamic_modules.each do |mod_item| -%> <%- if mod_item =~ /^\/.*/ -%> load_module "<%= mod_item -%>"; <%- else -%> load_module "modules/<%= mod_item -%>.so"; <%- end -%> <%- end -%> <% if @daemon -%> daemon <%= @daemon %>; <% end -%> <% if @super_user -%> user <%= @daemon_user %><% if @daemon_group -%> <%= @daemon_group %><% end -%>; <% end -%> worker_processes <%= @worker_processes %>; <% if @worker_rlimit_nofile -%> worker_rlimit_nofile <%= @worker_rlimit_nofile %>; <% end -%> <% if @pid -%> pid <%= @pid %>; <% end -%> +<% if @include_modules_enabled -%> +include /etc/nginx/modules-enabled/*.conf; +<% end -%> <% if @nginx_cfg_prepend -%> <%- field_width = @nginx_cfg_prepend.inject(0) { |l,(k,v)| k.size > l ? k.size : l } -%> <%- @nginx_cfg_prepend.sort_by{|k,v| k}.each do |key,value| -%> <%- Array(value).each do |asubvalue| -%> <%= sprintf("%-*s", field_width, key) %> <%= asubvalue %>; <%- end -%> <%- end -%> <% end -%> events { accept_mutex <%= @accept_mutex %>; <%- if @accept_mutex_delay -%> accept_mutex_delay <%= @accept_mutex_delay %>; <%- end -%> worker_connections <%= @worker_connections -%>; <%- if @multi_accept == 'on' -%> multi_accept on; <%- end -%> <%- if @events_use -%> use <%= @events_use %>; <%- end -%> } http { <% if @http_raw_prepend && Array(@http_raw_prepend).size > 0 -%> <%- Array(@http_raw_prepend).each do |line| -%> <%= line %> <%- end -%> <% end -%> <% if @http_cfg_prepend -%> <%- field_width = @http_cfg_prepend.inject(0) { |l,(k,v)| k.size > l ? k.size : l } -%> <%- @http_cfg_prepend.sort_by{|k,v| k}.each do |key,value| -%> <%- Array(value).each do |asubvalue| -%> <%= sprintf("%-*s", field_width, key) %> <%= asubvalue %>; <%- end -%> <%- end -%> <% end -%> <% if @mime_types_path.is_a? String and @mime_types_path.empty? == false -%> include <%= @mime_types_path %>; <% end -%> default_type application/octet-stream; <% if @log_format -%> <% @log_format.sort_by{|k,v| k}.each do |key,value| -%> log_format <%= key %> '<%= value %>'; <% end -%> <% end -%> <% if @absolute_redirect -%> absolute_redirect <%= @absolute_redirect %>; <% end -%> <% if @http_access_log.is_a?(Array) -%> <%- @http_access_log.each do |log_item| -%> access_log <%= log_item %><% if @http_format_log %> <%= @http_format_log%><% end %>; <%- end -%> <% else -%> access_log <%= @http_access_log %><% if @http_format_log %> <%= @http_format_log%><% end %>; <% end -%> <% if @nginx_error_log.is_a?(Array) -%> <%- @nginx_error_log.each do |log_item| -%> error_log <%= log_item %> <%= @nginx_error_log_severity %>; <%- end -%> <% else -%> error_log <%= @nginx_error_log %> <%= @nginx_error_log_severity %>; <% end -%> <% if @limit_req_zone -%> <% if @limit_req_zone.is_a?(Array) -%> <%- @limit_req_zone.each do |limit_req_zone_item| -%> limit_req_zone <%= limit_req_zone_item %>; <% end -%> <% else -%> limit_req_zone <%= @limit_req_zone %>; <% end -%> <% end -%> <% if @sendfile == 'on' -%> sendfile on; <%- if @http_tcp_nopush == 'on' -%> tcp_nopush on; <%- end -%> <% end -%> server_tokens <%= @server_tokens %>; types_hash_max_size <%= @types_hash_max_size %>; types_hash_bucket_size <%= @types_hash_bucket_size %>; server_names_hash_bucket_size <%= @names_hash_bucket_size %>; server_names_hash_max_size <%= @names_hash_max_size %>; keepalive_timeout <%= @keepalive_timeout %>; keepalive_requests <%= @keepalive_requests %>; client_body_timeout <%= @client_body_timeout %>; send_timeout <%= @send_timeout %>; lingering_timeout <%= @lingering_timeout %>; tcp_nodelay <%= @http_tcp_nodelay %>; <% if @etag -%> etag <%= @etag %>; <% end -%> <% if @gzip == 'on' -%> gzip on; <% if @gzip_buffers -%> gzip_buffers <%= @gzip_buffers %>; <% end -%> gzip_comp_level <%= @gzip_comp_level %>; <% if @gzip_disable -%> gzip_disable <%= @gzip_disable %>; <% end -%> gzip_min_length <%= @gzip_min_length %>; gzip_http_version <%= @gzip_http_version %>; <% if @gzip_proxied -%> gzip_proxied <%= @gzip_proxied %>; <% end -%> <% if @gzip_types -%> gzip_types <%= @gzip_types.kind_of?(Array) ? @gzip_types.join(' ') : @gzip_types %>; <% end -%> gzip_vary <%= @gzip_vary %>; <% end -%> <% if @client_body_temp_path -%> client_body_temp_path <%= @client_body_temp_path %>; <% end -%> <% if @client_max_body_size -%> client_max_body_size <%= @client_max_body_size %>; <% end -%> <% if @client_body_buffer_size -%> client_body_buffer_size <%= @client_body_buffer_size %>; <% end -%> <% if @proxy_redirect -%> proxy_redirect <%= @proxy_redirect %>; <% end -%> <% if @proxy_temp_path -%> proxy_temp_path <%= @proxy_temp_path %>; <% end -%> <% if @proxy_connect_timeout -%> proxy_connect_timeout <%= @proxy_connect_timeout %>; <% end -%> <% if @proxy_send_timeout -%> proxy_send_timeout <%= @proxy_send_timeout %>; <% end -%> <% if @proxy_read_timeout -%> proxy_read_timeout <%= @proxy_read_timeout %>; <% end -%> <% if @proxy_buffers -%> proxy_buffers <%= @proxy_buffers %>; <% end -%> <% if @proxy_buffer_size -%> proxy_buffer_size <%= @proxy_buffer_size %>; <% end -%> <% if @proxy_busy_buffers_size -%> proxy_busy_buffers_size <%= @proxy_busy_buffers_size %>; <% end -%> <% if @proxy_max_temp_file_size -%> proxy_max_temp_file_size <%= @proxy_max_temp_file_size %>; <% end -%> <% if @proxy_http_version -%> proxy_http_version <%= @proxy_http_version %>; <% end -%> <% @proxy_set_header.each do |header| -%> proxy_set_header <%= header %>; <% end -%> <% @proxy_hide_header.each do |header| -%> proxy_hide_header <%= header %>; <% end -%> <% @proxy_pass_header.each do |header| -%> proxy_pass_header <%= header %>; <% end -%> <% if @proxy_headers_hash_bucket_size -%> proxy_headers_hash_bucket_size <%= @proxy_headers_hash_bucket_size %>; <% end -%> <% if @proxy_cache_path.is_a?(Hash) -%> <% @proxy_cache_path.sort_by{|k,v| k}.each do |key,value| -%> proxy_cache_path <%= key %> keys_zone=<%= value %> levels=<%= @proxy_cache_levels %> max_size=<%= @proxy_cache_max_size %> inactive=<%= @proxy_cache_inactive -%> <%- if @proxy_use_temp_path %> use_temp_path=<%= @proxy_use_temp_path %><% end -%> <%- if @proxy_cache_loader_files %> loader_files=<%= @proxy_cache_loader_files %><% end -%> <%- if @proxy_cache_loader_sleep %> loader_sleep=<%= @proxy_cache_loader_sleep %><% end -%> <%- if @proxy_cache_loader_threshold %> loader_threshold=<%= @proxy_cache_loader_threshold %><% end -%>; <% end -%> <% elsif @proxy_cache_path -%> proxy_cache_path <%= @proxy_cache_path %> levels=<%= @proxy_cache_levels %> keys_zone=<%= @proxy_cache_keys_zone %> max_size=<%= @proxy_cache_max_size %> inactive=<%= @proxy_cache_inactive -%> <%- if @proxy_use_temp_path %> use_temp_path=<%= @proxy_use_temp_path %><% end -%> <%- if @proxy_cache_loader_files %> loader_files=<%= @proxy_cache_loader_files %><% end -%> <%- if @proxy_cache_loader_sleep %> loader_sleep=<%= @proxy_cache_loader_sleep %><% end -%> <%- if @proxy_cache_loader_threshold %> loader_threshold=<%= @proxy_cache_loader_threshold %><% end -%>; <% end -%> <% if @fastcgi_cache_path -%> fastcgi_cache_path <%= @fastcgi_cache_path %> levels=<%= @fastcgi_cache_levels %> keys_zone=<%= @fastcgi_cache_keys_zone %> max_size=<%= @fastcgi_cache_max_size %> inactive=<%= @fastcgi_cache_inactive %>; <% end -%> <% if @fastcgi_cache_key -%> fastcgi_cache_key <%= @fastcgi_cache_key %>; <% end -%> <% if @fastcgi_cache_use_stale -%> fastcgi_cache_use_stale <%= @fastcgi_cache_use_stale %>; <% end -%> <% if @http_cfg_append -%> <%- field_width = @http_cfg_append.inject(0) { |l,(k,v)| k.size > l ? k.size : l } -%> <%- @http_cfg_append.sort_by{|k,v| k}.each do |key,value| -%> <%- Array(value).each do |asubvalue| -%> <%= sprintf("%-*s", field_width, key) %> <%= asubvalue %>; <%- end -%> <%- end -%> <% end -%> <% if @http_raw_append && Array(@http_raw_append).size > 0 -%> <%- Array(@http_raw_append).each do |line| -%> <%= line %> <%- end -%> <% end -%> include <%= @conf_dir %>/conf.d/*.conf; <% unless @confd_only -%> include <%= @conf_dir %>/sites-enabled/*; <% end -%> } <% if @mail -%> mail { include <%= @conf_dir %>/conf.mail.d/*.conf; } <% end -%> <% if @stream -%> stream { <%-# conf.stream.d gets included either way if $stream is enabled -%> include <%= @conf_dir %>/conf.stream.d/*.conf; <% unless @confd_only -%> include <%= @conf_dir %>/streams-enabled/*; <% end -%> } <% end -%>