-
-
Notifications
You must be signed in to change notification settings - Fork 881
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fixed long names virtual hosts... #233
Changes from 1 commit
e94af12
088f141
a4ddf88
f4d543e
22b3f5a
d340eea
26cf99c
325ae7e
520b8fe
2252d96
6997df9
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -165,3 +165,66 @@ nginx::resource::vhost { 'puppet': | |
}, | ||
} | ||
``` | ||
|
||
### Example puppet class calling nginx::vhost with HTTPS FastCGI and redirection of HTTP | ||
|
||
```define web::nginx_ssl_with_redirect ( | ||
$backend_port = 9000, | ||
$php = true, | ||
$proxy = undef, | ||
$www_root = "${full_web_path}/${name}/", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Where does value for |
||
$location_cfg_append = undef, | ||
) { | ||
nginx::resource::vhost { "${name}.${::domain}": | ||
ensure => present, | ||
www_root => "${full_web_path}/${name}/", | ||
location_cfg_append => { 'rewrite' => '^ https://$server_name$request_uri? permanent' }, | ||
} | ||
|
||
if !$www_root { | ||
$tmp_www_root = undef | ||
} else { | ||
$tmp_www_root = $www_root | ||
} | ||
|
||
nginx::resource::vhost { "${name}.${::domain} ${name}": | ||
ensure => present, | ||
listen_port => 443, | ||
www_root => $tmp_www_root, | ||
proxy => $proxy, | ||
location_cfg_append => $location_cfg_append, | ||
index_files => [ 'index.php' ], | ||
ssl => true, | ||
ssl_cert => 'puppet:///modules/sslkey/whildcard_mydomain.crt', | ||
ssl_key => 'puppet:///modules/sslkey/whildcard_mydomain.key', | ||
} | ||
|
||
|
||
if $php { | ||
nginx::resource::location { "${name}_root": | ||
ensure => present, | ||
ssl => true, | ||
ssl_only => true, | ||
vhost => "${name}.${::domain} ${name}", | ||
www_root => "${full_web_path}/${name}/", | ||
location => '~ \.php$', | ||
index_files => ['index.php', 'index.html', 'index.htm'], | ||
proxy => undef, | ||
fastcgi => "127.0.0.1:${backend_port}", | ||
fastcgi_script => undef, | ||
location_cfg_append => { | ||
fastcgi_connect_timeout => '3m', | ||
fastcgi_read_timeout => '3m', | ||
fastcgi_send_timeout => '3m' | ||
} | ||
} | ||
} | ||
} | ||
``` | ||
|
||
# Call class web::nginx_ssl_with_redirect | ||
|
||
```web::nginx_ssl_whith_redirect { 'sub-domain-name': | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. As above There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There's also a typo in this example - |
||
backend_port => 9001, | ||
} | ||
``` |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -40,6 +40,12 @@ | |
# [*location_cfg_prepend*] - Expects a hash with extra directives to put | ||
# before anything else inside location (used with all other types except | ||
# custom_cfg) | ||
# [*location_custom_cfg_prepend*] - Expects a array with extra directives | ||
# to put before anything else inside location (used with all other types | ||
# except custom_cfg). Used for logical structures such as if. | ||
# [*location_custom_cfg_append*] - Expects a array with extra directives | ||
# to put before anything else inside location (used with all other types | ||
# except custom_cfg). Used for logical structures such as if. | ||
# [*location_cfg_append*] - Expects a hash with extra directives to put | ||
# after everything else inside location (used with all other types except | ||
# custom_cfg) | ||
|
@@ -114,6 +120,8 @@ | |
$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, | ||
$proxy_cache = false, | ||
$proxy_cache_valid = false, | ||
|
@@ -216,7 +224,9 @@ | |
'absent' => absent, | ||
default => file, | ||
} | ||
$config_file = "${nginx::config::nx_conf_dir}/sites-available/${vhost}.conf" | ||
|
||
$vhost_sanitized = regsubst($vhost, ' ', '_', 'G') | ||
$config_file = "${nginx::config::nx_conf_dir}/sites-available/${vhost_sanitized}.conf" | ||
|
||
$location_sanitized_tmp = regsubst($location, '\/', '_', 'G') | ||
$location_sanitized = regsubst($location_sanitized_tmp, '\\', '_', 'G') | ||
|
@@ -257,20 +267,20 @@ | |
|
||
## Create stubs for vHost File Fragment Pattern | ||
if ($ssl_only != true) { | ||
concat::fragment { "${vhost}-${priority}-${location_sanitized}": | ||
concat::fragment { "${vhost_sanitized}-${priority}-${location_sanitized}": | ||
target => $config_file, | ||
content => $content_real, | ||
order => "${priority}", | ||
order => $priority, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. concat::fragment expects a string, so this should be left as is (even though puppet-lint complains) |
||
} | ||
} | ||
|
||
## Only create SSL Specific locations if $ssl is true. | ||
if ($ssl == true) { | ||
$ssl_priority = $priority + 300 | ||
concat::fragment {"${vhost}-${ssl_priority}-${location_sanitized}-ssl": | ||
concat::fragment {"${vhost_sanitized}-${ssl_priority}-${location_sanitized}-ssl": | ||
target => $config_file, | ||
content => $content_real, | ||
order => "${ssl_priority}", | ||
order => $ssl_priority, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. concat::fragment expects a string, so this should be left as is (even though puppet-lint complains) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. tnx |
||
} | ||
} | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you preview this new section in the README? It doesn't render properly. The
must be on a line of its own, and it should read
to get proper syntax highlighting.