Define Stylesheet and language for Squid Errorpage #83
Conversation
manifests/init.pp
Outdated
| @@ -11,6 +11,8 @@ | |||
| Pattern[/\d+ KB/] $maximum_object_size_in_memory = $squid::params::maximum_object_size_in_memory, | |||
| String $package_name = $squid::params::package_name, | |||
| String $service_name = $squid::params::service_name, | |||
| Optional[String] $error_directory = $squid::params::error_directory, | |||
There was a problem hiding this comment.
Since you've made these parameters Optional (which is a good idea), you should almost certainly default them to undef.
templates/squid.conf.header.erb
Outdated
| @@ -19,6 +19,10 @@ access_log <%= @access_log %> | |||
| coredump_dir <%= @coredump_dir %> | |||
|
|
|||
| <% end -%> | |||
|
|
|||
| error_directory <%= @error_directory %> | |||
There was a problem hiding this comment.
and wrap these in suitable ifs
manifests/init.pp
Outdated
| @@ -11,6 +11,8 @@ | |||
| Pattern[/\d+ KB/] $maximum_object_size_in_memory = $squid::params::maximum_object_size_in_memory, | |||
| String $package_name = $squid::params::package_name, | |||
| String $service_name = $squid::params::service_name, | |||
| Optional[String] $error_directory = $squid::params::error_directory, | |||
| Optional[String] $err_page_stylesheet = $squid::params::err_page_stylesheet, | |||
There was a problem hiding this comment.
You can use Stdlib::Absolutepath instead of String
|
@SourceDoctor can you remove the labels if they are addressed. |
|
@traylenator i'd like to, but i can't find a button or something on to my pull request to do so |
templates/squid.conf.header.erb
Outdated
| @@ -19,6 +19,14 @@ access_log <%= @access_log %> | |||
| coredump_dir <%= @coredump_dir %> | |||
|
|
|||
| <% end -%> | |||
|
|
|||
| <% unless @error_directory.nil? -%> | |||
There was a problem hiding this comment.
Just a simple <% if @error_directory -%> should be fine here. The default of undef will be false. THat looks to be how the other lines work.
There was a problem hiding this comment.
+1 unless @foo.nil? is only needed if the parameter is a boolean.
alexjfisher
dismissed
their stale review
Needs rebase, but otherwise looks good.
|
@alexjfisher i thought i did so ;-) |
|
It's been squashed but not rebased. |
|
now it should be :-) |
traylenator
changed the title
configure Language and Stylesheet for Squid Errorpages