* force_language_priority can be now an array and language_priority a…

… string * coerce parameters to an array
xbezdick · Jun 12, 2014 · 9f19e32 · 9f19e32
1 parent 198aa99
commit 9f19e32
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/manifests/mod/negotiation.pp b/manifests/mod/negotiation.pp
@@ -5,8 +5,12 @@
                         'no', 'pl', 'pt', 'pt-BR', 'ru', 'sv', 'zh-CN',
                         'zh-TW' ],
 ) {
-  validate_string($force_language_priority)
-  validate_array($language_priority)
+  if !is_array($force_language_priority) and !is_string($force_language_priority) {
+    fail('force_languague_priority must be a string or array of strings')
+  }
+  if !is_array($language_priority) and !is_string($language_priority) {
+    fail('force_languague_priority must be a string or array of strings')
+  }
 
   ::apache::mod { 'negotiation': }
   # Template uses no variables

diff --git a/templates/mod/negotiation.conf.erb b/templates/mod/negotiation.conf.erb
@@ -1,2 +1,2 @@
-LanguagePriority <%= @language_priority.join(' ') %>
-ForceLanguagePriority <%= @force_language_priority %>
+LanguagePriority <%= Array(@language_priority).join(' ') %>
+ForceLanguagePriority <%= Array(@force_language_priority).join(' ') %>