Commit a4724adf authored by James T. Lee's avatar James T. Lee
Browse files

style: revproxy, vhost -> reverse_proxy, virtual_host

parent 08f36606
define nest::lib::revproxy ( define nest::lib::reverse_proxy (
String[1] $destination, String[1] $destination,
String[1] $servername = $name, String[1] $servername = $name,
Array[String[1]] $serveraliases = [], Array[String[1]] $serveraliases = [],
...@@ -35,7 +35,7 @@ define nest::lib::revproxy ( ...@@ -35,7 +35,7 @@ define nest::lib::revproxy (
}, },
].flatten ].flatten
$allow_encoded_slashes_vhost = $allow_encoded_slashes ? { $vhost_allow_encoded_slashes = $allow_encoded_slashes ? {
true => on, true => on,
default => undef, default => undef,
} }
...@@ -48,7 +48,7 @@ define nest::lib::revproxy ( ...@@ -48,7 +48,7 @@ define nest::lib::revproxy (
</Location> </Location>
| EOT | EOT
nest::lib::vhost { $name: nest::lib::virtual_host { $name:
servername => $servername, servername => $servername,
serveraliases => $serveraliases, serveraliases => $serveraliases,
ip => $ip, ip => $ip,
...@@ -56,7 +56,7 @@ define nest::lib::revproxy ( ...@@ -56,7 +56,7 @@ define nest::lib::revproxy (
ssl => $ssl, ssl => $ssl,
zfs_docroot => false, zfs_docroot => false,
extra_params => { extra_params => {
'allow_encoded_slashes' => $allow_encoded_slashes_vhost, 'allow_encoded_slashes' => $vhost_allow_encoded_slashes,
'proxy_preserve_host' => $preserve_host, 'proxy_preserve_host' => $preserve_host,
'proxy_pass_match' => $proxy_pass_match, 'proxy_pass_match' => $proxy_pass_match,
'proxy_dest' => "http://${destination}", 'proxy_dest' => "http://${destination}",
......
define nest::lib::vhost ( define nest::lib::virtual_host (
String[1] $servername, String[1] $servername,
Array[String[1]] $serveraliases = [], Array[String[1]] $serveraliases = [],
Optional[Variant[String[1], Array[String[1]]]] $ip = undef, Optional[Variant[String[1], Array[String[1]]]] $ip = undef,
......
...@@ -181,7 +181,7 @@ class nest::node::falcon { ...@@ -181,7 +181,7 @@ class nest::node::falcon {
], ],
} }
nest::lib::revproxy { nest::lib::reverse_proxy {
default: default:
ssl => false, ssl => false,
ip => '172.22.0.1', ip => '172.22.0.1',
......
...@@ -60,7 +60,7 @@ class nest::service::gitlab ( ...@@ -60,7 +60,7 @@ class nest::service::gitlab (
destination_ip6 => 'fc00:18::2', destination_ip6 => 'fc00:18::2',
} }
nest::lib::revproxy { nest::lib::reverse_proxy {
default: default:
ip => ['104.156.227.40', '2001:19f0:300:2005::40'], ip => ['104.156.227.40', '2001:19f0:300:2005::40'],
; ;
......
...@@ -64,7 +64,7 @@ define nest::service::wordpress ( ...@@ -64,7 +64,7 @@ define nest::service::wordpress (
], ],
} }
nest::lib::vhost { $name: nest::lib::virtual_host { $name:
priority => $priority, priority => $priority,
servername => $servername, servername => $servername,
serveraliases => $serveraliases, serveraliases => $serveraliases,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment