Skip to content

Commit d1bf96b

Browse files
sebastianrakelsebastianrakel
authored
Merge pull request #1692 from sebastianrakel/remove-whitespaces
remove whitespaces
2 parents f7c2c8b + 3616ae1 commit d1bf96b

19 files changed

Lines changed: 579 additions & 580 deletions

‎REFERENCE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5485,7 +5485,7 @@ Default value: `undef`
54855485

54865486
##### <a name="-nginx--resource--upstream--member--state"></a>`state`
54875487

5488-
Data type: `Optional[Enum['drain','down']]`
5488+
Data type: `Optional[Enum['drain', 'down']]`
54895489

54905490
Set the state for this upstream member
54915491

‎manifests/config.pp‎

Lines changed: 141 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -3,153 +3,153 @@
33
class nginx::config {
44
assert_private()
55

6-
$client_body_temp_path = $nginx::client_body_temp_path
7-
$confd_only = $nginx::confd_only
8-
$confd_purge = $nginx::confd_purge
9-
$conf_dir = $nginx::conf_dir
10-
$daemon = $nginx::daemon
11-
$daemon_user = $nginx::daemon_user
12-
$daemon_group = $nginx::daemon_group
13-
$dynamic_modules = $nginx::dynamic_modules
14-
$global_owner = $nginx::global_owner
15-
$global_group = $nginx::global_group
16-
$global_mode = $nginx::global_mode
17-
$limit_req_zone = $nginx::limit_req_zone
18-
$log_dir = $nginx::log_dir
19-
$log_user = $nginx::log_user
20-
$log_group = $nginx::log_group
21-
$log_mode = $nginx::log_mode
22-
$http_access_log = $nginx::http_access_log
23-
$http_format_log = $nginx::http_format_log
24-
$stream_access_log = $nginx::stream_access_log
25-
$stream_custom_format_log = $nginx::stream_custom_format_log
26-
$nginx_error_log = $nginx::nginx_error_log
27-
$nginx_error_log_severity = $nginx::nginx_error_log_severity
28-
$pid = $nginx::pid
29-
$proxy_temp_path = $nginx::proxy_temp_path
30-
$root_group = $nginx::root_group
31-
$sites_available_owner = $nginx::sites_available_owner
32-
$sites_available_group = $nginx::sites_available_group
33-
$sites_available_mode = $nginx::sites_available_mode
34-
$super_user = $nginx::super_user
35-
$temp_dir = $nginx::temp_dir
36-
$server_purge = $nginx::server_purge
37-
$absolute_redirect = $nginx::absolute_redirect
38-
$accept_mutex = $nginx::accept_mutex
39-
$accept_mutex_delay = $nginx::accept_mutex_delay
40-
$client_body_buffer_size = $nginx::client_body_buffer_size
41-
$client_max_body_size = $nginx::client_max_body_size
42-
$client_body_timeout = $nginx::client_body_timeout
43-
$send_timeout = $nginx::send_timeout
44-
$lingering_timeout = $nginx::lingering_timeout
45-
$lingering_close = $nginx::lingering_close
46-
$lingering_time = $nginx::lingering_time
47-
$reset_timedout_connection = $nginx::reset_timedout_connection
48-
$etag = $nginx::etag
49-
$events_use = $nginx::events_use
50-
$debug_connections = $nginx::debug_connections
51-
$fastcgi_cache_inactive = $nginx::fastcgi_cache_inactive
52-
$fastcgi_cache_key = $nginx::fastcgi_cache_key
53-
$fastcgi_cache_keys_zone = $nginx::fastcgi_cache_keys_zone
54-
$fastcgi_cache_levels = $nginx::fastcgi_cache_levels
55-
$fastcgi_cache_max_size = $nginx::fastcgi_cache_max_size
56-
$fastcgi_cache_path = $nginx::fastcgi_cache_path
57-
$fastcgi_cache_use_stale = $nginx::fastcgi_cache_use_stale
58-
$gzip = $nginx::gzip
59-
$gzip_buffers = $nginx::gzip_buffers
60-
$gzip_comp_level = $nginx::gzip_comp_level
61-
$gzip_disable = $nginx::gzip_disable
62-
$gzip_min_length = $nginx::gzip_min_length
63-
$gzip_http_version = $nginx::gzip_http_version
64-
$gzip_proxied = $nginx::gzip_proxied
65-
$gzip_types = $nginx::gzip_types
66-
$gzip_vary = $nginx::gzip_vary
67-
$gzip_static = $nginx::gzip_static
68-
$http_raw_prepend = $nginx::http_raw_prepend
69-
$http_raw_append = $nginx::http_raw_append
70-
$http_cfg_prepend = $nginx::http_cfg_prepend
71-
$http_cfg_append = $nginx::http_cfg_append
72-
$http_tcp_nodelay = $nginx::http_tcp_nodelay
73-
$http_tcp_nopush = $nginx::http_tcp_nopush
74-
$keepalive_timeout = $nginx::keepalive_timeout
75-
$keepalive_requests = $nginx::keepalive_requests
76-
$log_format = $nginx::log_format
77-
$stream_log_format = $nginx::stream_log_format
78-
$mail = $nginx::mail
79-
$mime_types_path = $nginx::mime_types_path
80-
$stream = $nginx::stream
81-
$map_hash_bucket_size = $nginx::map_hash_bucket_size
82-
$map_hash_max_size = $nginx::map_hash_max_size
83-
$mime_types = $nginx::mime_types_preserve_defaults ? {
6+
$client_body_temp_path = $nginx::client_body_temp_path
7+
$confd_only = $nginx::confd_only
8+
$confd_purge = $nginx::confd_purge
9+
$conf_dir = $nginx::conf_dir
10+
$daemon = $nginx::daemon
11+
$daemon_user = $nginx::daemon_user
12+
$daemon_group = $nginx::daemon_group
13+
$dynamic_modules = $nginx::dynamic_modules
14+
$global_owner = $nginx::global_owner
15+
$global_group = $nginx::global_group
16+
$global_mode = $nginx::global_mode
17+
$limit_req_zone = $nginx::limit_req_zone
18+
$log_dir = $nginx::log_dir
19+
$log_user = $nginx::log_user
20+
$log_group = $nginx::log_group
21+
$log_mode = $nginx::log_mode
22+
$http_access_log = $nginx::http_access_log
23+
$http_format_log = $nginx::http_format_log
24+
$stream_access_log = $nginx::stream_access_log
25+
$stream_custom_format_log = $nginx::stream_custom_format_log
26+
$nginx_error_log = $nginx::nginx_error_log
27+
$nginx_error_log_severity = $nginx::nginx_error_log_severity
28+
$pid = $nginx::pid
29+
$proxy_temp_path = $nginx::proxy_temp_path
30+
$root_group = $nginx::root_group
31+
$sites_available_owner = $nginx::sites_available_owner
32+
$sites_available_group = $nginx::sites_available_group
33+
$sites_available_mode = $nginx::sites_available_mode
34+
$super_user = $nginx::super_user
35+
$temp_dir = $nginx::temp_dir
36+
$server_purge = $nginx::server_purge
37+
$absolute_redirect = $nginx::absolute_redirect
38+
$accept_mutex = $nginx::accept_mutex
39+
$accept_mutex_delay = $nginx::accept_mutex_delay
40+
$client_body_buffer_size = $nginx::client_body_buffer_size
41+
$client_max_body_size = $nginx::client_max_body_size
42+
$client_body_timeout = $nginx::client_body_timeout
43+
$send_timeout = $nginx::send_timeout
44+
$lingering_timeout = $nginx::lingering_timeout
45+
$lingering_close = $nginx::lingering_close
46+
$lingering_time = $nginx::lingering_time
47+
$reset_timedout_connection = $nginx::reset_timedout_connection
48+
$etag = $nginx::etag
49+
$events_use = $nginx::events_use
50+
$debug_connections = $nginx::debug_connections
51+
$fastcgi_cache_inactive = $nginx::fastcgi_cache_inactive
52+
$fastcgi_cache_key = $nginx::fastcgi_cache_key
53+
$fastcgi_cache_keys_zone = $nginx::fastcgi_cache_keys_zone
54+
$fastcgi_cache_levels = $nginx::fastcgi_cache_levels
55+
$fastcgi_cache_max_size = $nginx::fastcgi_cache_max_size
56+
$fastcgi_cache_path = $nginx::fastcgi_cache_path
57+
$fastcgi_cache_use_stale = $nginx::fastcgi_cache_use_stale
58+
$gzip = $nginx::gzip
59+
$gzip_buffers = $nginx::gzip_buffers
60+
$gzip_comp_level = $nginx::gzip_comp_level
61+
$gzip_disable = $nginx::gzip_disable
62+
$gzip_min_length = $nginx::gzip_min_length
63+
$gzip_http_version = $nginx::gzip_http_version
64+
$gzip_proxied = $nginx::gzip_proxied
65+
$gzip_types = $nginx::gzip_types
66+
$gzip_vary = $nginx::gzip_vary
67+
$gzip_static = $nginx::gzip_static
68+
$http_raw_prepend = $nginx::http_raw_prepend
69+
$http_raw_append = $nginx::http_raw_append
70+
$http_cfg_prepend = $nginx::http_cfg_prepend
71+
$http_cfg_append = $nginx::http_cfg_append
72+
$http_tcp_nodelay = $nginx::http_tcp_nodelay
73+
$http_tcp_nopush = $nginx::http_tcp_nopush
74+
$keepalive_timeout = $nginx::keepalive_timeout
75+
$keepalive_requests = $nginx::keepalive_requests
76+
$log_format = $nginx::log_format
77+
$stream_log_format = $nginx::stream_log_format
78+
$mail = $nginx::mail
79+
$mime_types_path = $nginx::mime_types_path
80+
$stream = $nginx::stream
81+
$map_hash_bucket_size = $nginx::map_hash_bucket_size
82+
$map_hash_max_size = $nginx::map_hash_max_size
83+
$mime_types = $nginx::mime_types_preserve_defaults ? {
8484
true => $nginx::params::mime_types + $nginx::mime_types,
8585
default => $nginx::mime_types,
8686
}
87-
$multi_accept = $nginx::multi_accept
88-
$names_hash_bucket_size = $nginx::names_hash_bucket_size
89-
$names_hash_max_size = $nginx::names_hash_max_size
90-
$nginx_cfg_prepend = $nginx::nginx_cfg_prepend
91-
$proxy_buffers = $nginx::proxy_buffers
92-
$proxy_buffer_size = $nginx::proxy_buffer_size
93-
$proxy_busy_buffers_size = $nginx::proxy_busy_buffers_size
94-
$proxy_cache_inactive = $nginx::proxy_cache_inactive
95-
$proxy_cache_keys_zone = $nginx::proxy_cache_keys_zone
96-
$proxy_cache_levels = $nginx::proxy_cache_levels
97-
$proxy_cache_max_size = $nginx::proxy_cache_max_size
98-
$proxy_cache_path = $nginx::proxy_cache_path
99-
$proxy_cache_loader_files = $nginx::proxy_cache_loader_files
100-
$proxy_cache_loader_sleep = $nginx::proxy_cache_loader_sleep
101-
$proxy_cache_loader_threshold = $nginx::proxy_cache_loader_threshold
102-
$proxy_use_temp_path = $nginx::proxy_use_temp_path
103-
$proxy_connect_timeout = $nginx::proxy_connect_timeout
87+
$multi_accept = $nginx::multi_accept
88+
$names_hash_bucket_size = $nginx::names_hash_bucket_size
89+
$names_hash_max_size = $nginx::names_hash_max_size
90+
$nginx_cfg_prepend = $nginx::nginx_cfg_prepend
91+
$proxy_buffers = $nginx::proxy_buffers
92+
$proxy_buffer_size = $nginx::proxy_buffer_size
93+
$proxy_busy_buffers_size = $nginx::proxy_busy_buffers_size
94+
$proxy_cache_inactive = $nginx::proxy_cache_inactive
95+
$proxy_cache_keys_zone = $nginx::proxy_cache_keys_zone
96+
$proxy_cache_levels = $nginx::proxy_cache_levels
97+
$proxy_cache_max_size = $nginx::proxy_cache_max_size
98+
$proxy_cache_path = $nginx::proxy_cache_path
99+
$proxy_cache_loader_files = $nginx::proxy_cache_loader_files
100+
$proxy_cache_loader_sleep = $nginx::proxy_cache_loader_sleep
101+
$proxy_cache_loader_threshold = $nginx::proxy_cache_loader_threshold
102+
$proxy_use_temp_path = $nginx::proxy_use_temp_path
103+
$proxy_connect_timeout = $nginx::proxy_connect_timeout
104104
$proxy_headers_hash_bucket_size = $nginx::proxy_headers_hash_bucket_size
105-
$proxy_headers_hash_max_size = $nginx::proxy_headers_hash_max_size
106-
$proxy_http_version = $nginx::proxy_http_version
107-
$proxy_max_temp_file_size = $nginx::proxy_max_temp_file_size
108-
$proxy_read_timeout = $nginx::proxy_read_timeout
109-
$proxy_redirect = $nginx::proxy_redirect
110-
$proxy_send_timeout = $nginx::proxy_send_timeout
111-
$proxy_set_header = $nginx::proxy_set_header
112-
$proxy_hide_header = $nginx::proxy_hide_header
113-
$proxy_pass_header = $nginx::proxy_pass_header
114-
$real_ip_header = $nginx::real_ip_header
115-
$real_ip_recursive = $nginx::real_ip_recursive
116-
$set_real_ip_from = $nginx::set_real_ip_from
117-
$sendfile = $nginx::sendfile
118-
$server_tokens = $nginx::server_tokens
119-
$spdy = $nginx::spdy
120-
$http2 = $nginx::http2
121-
$ssl_buffer_size = $nginx::ssl_buffer_size
122-
$ssl_ciphers = $nginx::ssl_ciphers
123-
$ssl_crl = $nginx::ssl_crl
124-
$ssl_dhparam = $nginx::ssl_dhparam
125-
$ssl_ecdh_curve = $nginx::ssl_ecdh_curve
126-
$ssl_session_cache = $nginx::ssl_session_cache
127-
$ssl_session_timeout = $nginx::ssl_session_timeout
128-
$ssl_session_tickets = $nginx::ssl_session_tickets
129-
$ssl_session_ticket_key = $nginx::ssl_session_ticket_key
130-
$ssl_stapling = $nginx::ssl_stapling
131-
$ssl_stapling_file = $nginx::ssl_stapling_file
132-
$ssl_stapling_responder = $nginx::ssl_stapling_responder
133-
$ssl_stapling_verify = $nginx::ssl_stapling_verify
134-
$ssl_trusted_certificate = $nginx::ssl_trusted_certificate
135-
$ssl_password_file = $nginx::ssl_password_file
136-
$ssl_prefer_server_ciphers = $nginx::ssl_prefer_server_ciphers
137-
$ssl_protocols = $nginx::ssl_protocols
138-
$ssl_verify_depth = $nginx::ssl_verify_depth
139-
$types_hash_bucket_size = $nginx::types_hash_bucket_size
140-
$types_hash_max_size = $nginx::types_hash_max_size
141-
$worker_connections = $nginx::worker_connections
142-
$worker_processes = $nginx::worker_processes
143-
$worker_rlimit_nofile = $nginx::worker_rlimit_nofile
144-
$pcre_jit = $nginx::pcre_jit
145-
$include_modules_enabled = $nginx::include_modules_enabled
146-
$variables_hash_bucket_size = $nginx::variables_hash_bucket_size
147-
$variables_hash_max_size = $nginx::variables_hash_max_size
105+
$proxy_headers_hash_max_size = $nginx::proxy_headers_hash_max_size
106+
$proxy_http_version = $nginx::proxy_http_version
107+
$proxy_max_temp_file_size = $nginx::proxy_max_temp_file_size
108+
$proxy_read_timeout = $nginx::proxy_read_timeout
109+
$proxy_redirect = $nginx::proxy_redirect
110+
$proxy_send_timeout = $nginx::proxy_send_timeout
111+
$proxy_set_header = $nginx::proxy_set_header
112+
$proxy_hide_header = $nginx::proxy_hide_header
113+
$proxy_pass_header = $nginx::proxy_pass_header
114+
$real_ip_header = $nginx::real_ip_header
115+
$real_ip_recursive = $nginx::real_ip_recursive
116+
$set_real_ip_from = $nginx::set_real_ip_from
117+
$sendfile = $nginx::sendfile
118+
$server_tokens = $nginx::server_tokens
119+
$spdy = $nginx::spdy
120+
$http2 = $nginx::http2
121+
$ssl_buffer_size = $nginx::ssl_buffer_size
122+
$ssl_ciphers = $nginx::ssl_ciphers
123+
$ssl_crl = $nginx::ssl_crl
124+
$ssl_dhparam = $nginx::ssl_dhparam
125+
$ssl_ecdh_curve = $nginx::ssl_ecdh_curve
126+
$ssl_session_cache = $nginx::ssl_session_cache
127+
$ssl_session_timeout = $nginx::ssl_session_timeout
128+
$ssl_session_tickets = $nginx::ssl_session_tickets
129+
$ssl_session_ticket_key = $nginx::ssl_session_ticket_key
130+
$ssl_stapling = $nginx::ssl_stapling
131+
$ssl_stapling_file = $nginx::ssl_stapling_file
132+
$ssl_stapling_responder = $nginx::ssl_stapling_responder
133+
$ssl_stapling_verify = $nginx::ssl_stapling_verify
134+
$ssl_trusted_certificate = $nginx::ssl_trusted_certificate
135+
$ssl_password_file = $nginx::ssl_password_file
136+
$ssl_prefer_server_ciphers = $nginx::ssl_prefer_server_ciphers
137+
$ssl_protocols = $nginx::ssl_protocols
138+
$ssl_verify_depth = $nginx::ssl_verify_depth
139+
$types_hash_bucket_size = $nginx::types_hash_bucket_size
140+
$types_hash_max_size = $nginx::types_hash_max_size
141+
$worker_connections = $nginx::worker_connections
142+
$worker_processes = $nginx::worker_processes
143+
$worker_rlimit_nofile = $nginx::worker_rlimit_nofile
144+
$pcre_jit = $nginx::pcre_jit
145+
$include_modules_enabled = $nginx::include_modules_enabled
146+
$variables_hash_bucket_size = $nginx::variables_hash_bucket_size
147+
$variables_hash_max_size = $nginx::variables_hash_max_size
148148

149149
# Non-configurable settings
150-
$conf_template = 'nginx/conf.d/nginx.conf.erb'
151-
$mime_template = 'nginx/conf.d/mime.types.epp'
152-
$proxy_conf_template = undef
150+
$conf_template = 'nginx/conf.d/nginx.conf.erb'
151+
$mime_template = 'nginx/conf.d/mime.types.epp'
152+
$proxy_conf_template = undef
153153

154154
File {
155155
owner => $global_owner,

‎manifests/init.pp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -446,14 +446,14 @@
446446
contain 'nginx::config'
447447
contain 'nginx::service'
448448

449-
create_resources( 'nginx::resource::geo', $geo_mappings, $geo_mappings_defaults)
450-
create_resources( 'nginx::resource::snippet', $nginx_snippets, $nginx_snippets_defaults)
451-
create_resources( 'nginx::resource::location', $nginx_locations, $nginx_locations_defaults)
452-
create_resources( 'nginx::resource::mailhost', $nginx_mailhosts, $nginx_mailhosts_defaults)
453-
create_resources( 'nginx::resource::map', $string_mappings, $string_mappings_defaults)
454-
create_resources( 'nginx::resource::server', $nginx_servers, $nginx_servers_defaults)
455-
create_resources( 'nginx::resource::streamhost', $nginx_streamhosts, $nginx_streamhosts_defaults)
456-
create_resources( 'nginx::resource::upstream', $nginx_upstreams, $nginx_upstreams_defaults)
449+
create_resources('nginx::resource::geo', $geo_mappings, $geo_mappings_defaults)
450+
create_resources('nginx::resource::snippet', $nginx_snippets, $nginx_snippets_defaults)
451+
create_resources('nginx::resource::location', $nginx_locations, $nginx_locations_defaults)
452+
create_resources('nginx::resource::mailhost', $nginx_mailhosts, $nginx_mailhosts_defaults)
453+
create_resources('nginx::resource::map', $string_mappings, $string_mappings_defaults)
454+
create_resources('nginx::resource::server', $nginx_servers, $nginx_servers_defaults)
455+
create_resources('nginx::resource::streamhost', $nginx_streamhosts, $nginx_streamhosts_defaults)
456+
create_resources('nginx::resource::upstream', $nginx_upstreams, $nginx_upstreams_defaults)
457457

458458
# Allow the end user to establish relationships to the "main" class
459459
# and preserve the relationship to the implementation classes through

‎manifests/package.pp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# @summary Manage NGINX package installation
22
# @api private
33
class nginx::package {
4-
$package_name = $nginx::package_name
5-
$package_source = $nginx::package_source
6-
$package_ensure = $nginx::package_ensure
7-
$package_flavor = $nginx::package_flavor
4+
$package_name = $nginx::package_name
5+
$package_source = $nginx::package_source
6+
$package_ensure = $nginx::package_ensure
7+
$package_flavor = $nginx::package_flavor
88
$passenger_package_ensure = $nginx::passenger_package_ensure
9-
$manage_repo = $nginx::manage_repo
9+
$manage_repo = $nginx::manage_repo
1010

1111
assert_private()
1212

‎manifests/package/debian.pp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# @summary Manage NGINX package installation on debian based systems
22
# @api private
33
class nginx::package::debian {
4-
$package_name = $nginx::package_name
5-
$package_source = $nginx::package_source
6-
$package_ensure = $nginx::package_ensure
7-
$package_flavor = $nginx::package_flavor
4+
$package_name = $nginx::package_name
5+
$package_source = $nginx::package_source
6+
$package_ensure = $nginx::package_ensure
7+
$package_flavor = $nginx::package_flavor
88
$passenger_package_ensure = $nginx::passenger_package_ensure
9-
$passenger_package_name = $nginx::passenger_package_name
10-
$manage_repo = $nginx::manage_repo
11-
$release = $nginx::repo_release
12-
$repo_source = $nginx::repo_source
9+
$passenger_package_name = $nginx::passenger_package_name
10+
$manage_repo = $nginx::manage_repo
11+
$release = $nginx::repo_release
12+
$repo_source = $nginx::repo_source
1313

1414
$distro = downcase($facts['os']['name'])
1515

@@ -25,7 +25,7 @@
2525
case $package_source {
2626
'nginx', 'nginx-stable': {
2727
$stable_repo_source = $repo_source ? {
28-
undef => "https://nginx.org/packages/${distro}",
28+
undef => "https://nginx.org/packages/${distro}",
2929
default => $repo_source,
3030
}
3131
apt::source { 'nginx':
@@ -41,7 +41,7 @@
4141
}
4242
'nginx-mainline': {
4343
$mainline_repo_source = $repo_source ? {
44-
undef => "https://nginx.org/packages/mainline/${distro}",
44+
undef => "https://nginx.org/packages/mainline/${distro}",
4545
default => $repo_source,
4646
}
4747
apt::source { 'nginx':
@@ -57,7 +57,7 @@
5757
}
5858
'passenger': {
5959
$passenger_repo_source = $repo_source ? {
60-
undef => 'https://oss-binaries.phusionpassenger.com/apt/passenger',
60+
undef => 'https://oss-binaries.phusionpassenger.com/apt/passenger',
6161
default => $repo_source,
6262
}
6363
apt::source { 'nginx':

0 commit comments

Comments
 (0)