From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 25 Sep 2019 12:21:32 +0000 (+0200)
Subject: List non-optional params first
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=33d8a6c91f60158a8d6aeaa5f911c000f0bcc280;p=mirror%2Fdsa-puppet.git

List non-optional params first
---

diff --git a/modules/bacula/manifests/init.pp b/modules/bacula/manifests/init.pp
index 1b88a49ce..dfbc9ce33 100644
--- a/modules/bacula/manifests/init.pp
+++ b/modules/bacula/manifests/init.pp
@@ -1,26 +1,25 @@
 # bacula class -- defines all the variables we care about in our bacula deployment
 #
-# @param operator_email   email address for reports
 # @param ssl_ca_path      full path and filename specifying a PEM encoded TLS CA certificate(s)
 # @param ssl_client_cert  path to TLS client certificate
 # @param ssl_client_key   path to TLS client certificate key
 # @param ssl_server_cert  path to TLS server certificate
 # @param ssl_server_key   path to TLS server certificate key
+# @param operator_email   email address for reports
 # @param public_addresses this host's public IP addresses.  The ones it connects out from and is reachable from outsite.
 # @param has_ipv4         daemons should listen on ipv4
 # @param has_ipv6         daemons should listen on ipv6
 class bacula (
-  String  $operator_email          = 'root@localhost',
   String $ssl_ca_path,
   String $ssl_client_cert,
   String $ssl_client_key,
   String $ssl_server_cert,
   String $ssl_server_key,
 
+  String $operator_email                       = 'root@localhost',
   Array[Stdlib::IP::Address] $public_addresses = $base::public_addresses,
-
-  Boolean $has_ipv4        = $bacula::public_addresses.any |$addr| { $addr =~ Stdlib::IP::Address::V4 },
-  Boolean $has_ipv6        = $bacula::public_addresses.any |$addr| { $addr =~ Stdlib::IP::Address::V6 },
+  Boolean $has_ipv4                            = $bacula::public_addresses.any |$addr| { $addr =~ Stdlib::IP::Address::V4 },
+  Boolean $has_ipv6                            = $bacula::public_addresses.any |$addr| { $addr =~ Stdlib::IP::Address::V6 },
 ) {
   # This file is used by our helper scripts on the director
   $bacula_dsa_client_list     = '/etc/bacula/dsa-clients'