Merge pull request #189 from danifr/alphabetical_ordering

Order variables alphabetically
voxpupuli · Mar 2, 2016 · 4748a93 · 4748a93
2 parents 04435e8 + abbd205
commit 4748a93
Show file tree

Hide file tree

Showing 15 changed files with 254 additions and 264 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -7,47 +7,47 @@
 # This private class is called from `rundeck` to manage the configuration
 #
 class rundeck::config(
-  $auth_types                  = $rundeck::auth_types,
+  $acl_policies                = $rundeck::acl_policies,
+  $acl_template                = $rundeck::acl_template,
+  $api_policies                = $rundeck::api_policies,
+  $api_template                = $rundeck::api_template,
   $auth_template               = $rundeck::auth_template,
-  $realm_template              = $rundeck::realm_template,
-  $user                        = $rundeck::user,
-  $group                       = $rundeck::group,
-  $server_web_context          = $rundeck::server_web_context,
-  $jvm_args                    = $rundeck::jvm_args,
-  $java_home                   = $rundeck::java_home,
-  $ssl_enabled                 = $rundeck::ssl_enabled,
-  $projects                    = $rundeck::projects,
-  $projects_organization       = $rundeck::projects_default_org,
-  $projects_description        = $rundeck::projects_default_desc,
-  $rd_loglevel                 = $rundeck::rd_loglevel,
-  $rss_enabled                 = $rundeck::rss_enabled,
+  $auth_types                  = $rundeck::auth_types,
   $clustermode_enabled         = $rundeck::clustermode_enabled,
-  $grails_server_url           = $rundeck::grails_server_url,
   $database_config             = $rundeck::database_config,
-  $keystore                    = $rundeck::keystore,
-  $keystore_password           = $rundeck::keystore_password,
-  $key_password                = $rundeck::key_password,
-  $truststore                  = $rundeck::truststore,
-  $truststore_password         = $rundeck::truststore_password,
-  $service_logs_dir            = $rundeck::service_logs_dir,
   $file_keystorage_dir         = $rundeck::file_keystorage_dir,
-  $projects_storage_type       = $rundeck::projects_storage_type,
+  $file_keystorage_keys        = $rundeck::file_keystorage_keys,
+  $grails_server_url           = $rundeck::grails_server_url,
+  $group                       = $rundeck::group,
+  $java_home                   = $rundeck::java_home,
+  $jvm_args                    = $rundeck::jvm_args,
+  $key_password                = $rundeck::key_password,
   $key_storage_type            = $rundeck::key_storage_type,
-  $service_name                = $rundeck::service_name,
+  $keystore                    = $rundeck::keystore,
+  $keystore_password           = $rundeck::keystore_password,
   $mail_config                 = $rundeck::mail_config,
+  $manage_default_admin_policy = $rundeck::manage_default_admin_policy,
+  $manage_default_api_policy   = $rundeck::manage_default_api_policy,
   $preauthenticated_config     = $rundeck::preauthenticated_config,
+  $projects                    = $rundeck::projects,
+  $projects_description        = $rundeck::projects_default_desc,
+  $projects_organization       = $rundeck::projects_default_org,
+  $projects_storage_type       = $rundeck::projects_storage_type,
+  $rd_loglevel                 = $rundeck::rd_loglevel,
+  $rdeck_config_template       = $rundeck::rdeck_config_template,
+  $rdeck_profile_template      = $rundeck::rdeck_profile_template,
+  $realm_template              = $rundeck::realm_template,
+  $rss_enabled                 = $rundeck::rss_enabled,
   $security_config             = $rundeck::security_config,
   $security_role               = $rundeck::security_role,
+  $server_web_context          = $rundeck::server_web_context,
+  $service_logs_dir            = $rundeck::service_logs_dir,
+  $service_name                = $rundeck::service_name,
   $session_timeout             = $rundeck::session_timeout,
-  $acl_policies                = $rundeck::acl_policies,
-  $api_policies                = $rundeck::api_policies,
-  $rdeck_config_template       = $rundeck::rdeck_config_template,
-  $rdeck_profile_template      = $rundeck::rdeck_profile_template,
-  $file_keystorage_keys        = $rundeck::file_keystorage_keys,
-  $manage_default_admin_policy = $rundeck::manage_default_admin_policy,
-  $manage_default_api_policy   = $rundeck::manage_default_api_policy,
-  $acl_template                = $rundeck::acl_template,
-  $api_template                = $rundeck::api_template,
+  $ssl_enabled                 = $rundeck::ssl_enabled,
+  $truststore                  = $rundeck::truststore,
+  $truststore_password         = $rundeck::truststore_password,
+  $user                        = $rundeck::user,
 ) inherits rundeck::params {
 
   $framework_config = deep_merge($rundeck::params::framework_config, $rundeck::framework_config)

diff --git a/manifests/config/aclpolicyfile.pp b/manifests/config/aclpolicyfile.pp
@@ -11,13 +11,13 @@
 # [*acl_policies*]
 #  An array containing acl policies. See rundeck::params::acl_policies / rundeck::params::api_policies as an example.
 #
-# [*$owner*]
-#  The user that rundeck is installed as.
-#
-# [*$group*]
+# [*group*]
 #  The group permission that rundeck is installed as.
 #
-# [*$properties_dir*]
+# [*owner*]
+#  The user that rundeck is installed as.
+#
+# [*properties_dir*]
 #  The rundeck configuration directory.
 #
 # === Examples
@@ -64,8 +64,8 @@
 #
 define rundeck::config::aclpolicyfile(
   $acl_policies,
-  $owner          = 'rundeck',
   $group          = 'rundeck',
+  $owner          = 'rundeck',
   $properties_dir = '/etc/rundeck',
   $template_file  = "${module_name}/aclpolicy.erb",
 ) {

diff --git a/manifests/config/file_keystore.pp b/manifests/config/file_keystore.pp
@@ -7,57 +7,56 @@
 #
 # === Parameters
 #
-# [*value*]
-#   The actual value (password) of the named key
+# [*auth_created_username*]
+#   User who created the key
 #
-# [*path*]
-#   The actual value (password) of the named key
+# [*auth_modified_username*]
+#   User who last modified the key
 #
-# [*data_type*]
-#   Date type (password, public-key or private-key)
+# [*content_creation_time*]
+#   When the key was first created
+#
+# [*content_mask*]
+#   Content mask (default is 'content')
+#
+# [*content_size*]
+#   Size of the content string in bytes
 #
 # [*content_type*]
 #   MIME type of the content
 #
-# [*user*]
-#   default system user for the Rundeck framework
+# [*data_type*]
+#   Date type (password, public-key or private-key)
+#
+# [*file_keystorage_dir*]
+#   Base directory for file-based key storage (defaulted to /var/lib/rundeck/var/storage)
 #
 # [*group*]
 #   default system group for the Rundeck framework
 #
-# [*content_size*]
-#   Size of the content string in bytes
-#
-# [*content_mask*]
-#   Content mask (default is 'content')
-#
-# [*content_creation_time*]
-#   When the key was first created
-#
-# [*auth_created_username*]
-#   User who created the key
+# [*path*]
+#   The actual value (password) of the named key
 #
-# [*auth_modified_username*]
-#   User who last modified the key
+# [*user*]
+#   default system user for the Rundeck framework
 #
-# [*file_keystorage_dir*]
-#   Base directory for file-based key storage (defaulted to /var/lib/rundeck/var/storage)
+# [*value*]
+#   The actual value (password) of the named key
 #
-
 define rundeck::config::file_keystore (
-  $value,
-  $path,
-  $data_type,
   $content_type,
-  $content_size           = undef,
-  $user                   = $::rundeck::config::user,
-  $group                  = $::rundeck::config::group,
-  $content_creation_time  = chomp(generate('/bin/date', '+%Y-%m-%dT%H:%M:%SZ')),
-  $content_modify_time    = chomp(generate('/bin/date', '+%Y-%m-%dT%H:%M:%SZ')),
-  $content_mask           = 'content',
+  $data_type,
+  $path,
+  $value,
   $auth_created_username  = $::rundeck::framework_config['framework.ssh.user'],
   $auth_modified_username = $::rundeck::framework_config['framework.ssh.user'],
+  $content_creation_time  = chomp(generate('/bin/date', '+%Y-%m-%dT%H:%M:%SZ')),
+  $content_mask           = 'content',
+  $content_modify_time    = chomp(generate('/bin/date', '+%Y-%m-%dT%H:%M:%SZ')),
+  $content_size           = undef,
   $file_keystorage_dir    = $::rundeck::file_keystorage_dir,
+  $group                  = $::rundeck::config::group,
+  $user                   = $::rundeck::config::user,
 ) {
 
   validate_re($data_type, [ 'password', 'public', 'private' ])

diff --git a/manifests/config/global/file_keystore.pp b/manifests/config/global/file_keystore.pp
@@ -5,19 +5,19 @@
 #
 # === Parameters
 #
-# [*user*]
-#   The Rundeck OS user
-#
-# [*path*]
-#   The Rundeck OS user group
-#
 # [*keys*]
 #   A hash of key data values, with a minimum of the following properties:
 #  * *$value*: the actual value of the key, either the plaintext password string for passwords, or the encrypted public/priviate key
 #  * *$path*: a string representing the relative path of the key to the 'keys' directory
 #  * *$data_type*: the data type of the key, one of 'password', 'public-key' or 'private-key'
 #  * *$content_type*: MIME type of the content, either 'application/x-rundeck-data-password', 'application/pgp-keys' (for public keys)
 #
+# [*path*]
+#   The Rundeck OS user group
+#
+# [*user*]
+#   The Rundeck OS user
+#
 # Example:
 # ```
 # {
@@ -41,10 +41,10 @@
 
 
 class rundeck::config::global::file_keystore(
-  $user = $rundeck::config::user,
-  $group = $rundeck::config::group,
-  $keys = $::rundeck::config::file_keystorage_keys,
   $file_keystorage_dir = $::rundeck::file_keystorage_dir,
+  $group               = $rundeck::config::group,
+  $keys                = $::rundeck::config::file_keystorage_keys,
+  $user                = $rundeck::config::user,
 ) {
 
   File {

diff --git a/manifests/config/global/framework.pp b/manifests/config/global/framework.pp
@@ -7,9 +7,9 @@
 # This private class is called from rundeck::config used to manage the framework properties of rundeck
 #
 class rundeck::config::global::framework(
+  $group            = $rundeck::config::group,
   $properties_dir   = $rundeck::config::properties_dir,
   $user             = $rundeck::config::user,
-  $group            = $rundeck::config::group
 
 ) {
 

diff --git a/manifests/config/global/project.pp b/manifests/config/global/project.pp
@@ -7,12 +7,12 @@
 # This private class is called from rundeck::config used to manage the default project properties
 #
 class rundeck::config::global::project(
+  $group                 = $rundeck::config::group,
+  $projects_description  = $rundeck::config::projects_default_desc,
   $projects_dir          = $rundeck::config::projects_dir,
   $projects_organization = $rundeck::config::projects_default_org,
-  $projects_description  = $rundeck::config::projects_default_desc,
   $properties_dir        = $rundeck::config::properties_dir,
   $user                  = $rundeck::config::user,
-  $group                 = $rundeck::config::group
 ) {
 
   $properties_file = "${properties_dir}/project.properties"

diff --git a/manifests/config/global/rundeck_config.pp b/manifests/config/global/rundeck_config.pp
@@ -7,21 +7,21 @@
 # This private class is called from rundeck::config used to manage the rundeck-config properties
 #
 class rundeck::config::global::rundeck_config(
-  $rd_loglevel             = $rundeck::config::loglevel,
-  $rdeck_base              = $rundeck::config::rdeck_base,
-  $rss_enabled             = $rundeck::config::rss_enabled,
   $clustermode_enabled     = $rundeck::config::clustermode_enabled,
-  $grails_server_url       = $rundeck::config::grails_server_url,
-  $properties_dir          = $rundeck::config::properties_dir,
   $file_keystorage_dir     = $rundeck::config::file_keystorage_dir,
-  $projects_storage_type   = $rundeck::config::projects_storage_type,
-  $key_storage_type        = $rundeck::config::key_storage_type,
-  $user                    = $rundeck::config::user,
+  $grails_server_url       = $rundeck::config::grails_server_url,
   $group                   = $rundeck::config::group,
+  $key_storage_type        = $rundeck::config::key_storage_type,
   $mail_config             = $rundeck::config::mail_config,
   $preauthenticated_config = $rundeck::config::preauthenticated_config,
-  $security_config         = $rundeck::config::security_config,
+  $projects_storage_type   = $rundeck::config::projects_storage_type,
+  $properties_dir          = $rundeck::config::properties_dir,
+  $rd_loglevel             = $rundeck::config::loglevel,
+  $rdeck_base              = $rundeck::config::rdeck_base,
   $rdeck_config_template   = $rundeck::config::rdeck_config_template,
+  $rss_enabled             = $rundeck::config::rss_enabled,
+  $security_config         = $rundeck::config::security_config,
+  $user                    = $rundeck::config::user,
 ) {
 
   $properties_file = "${properties_dir}/rundeck-config.groovy"

diff --git a/manifests/config/global/ssl.pp b/manifests/config/global/ssl.pp
@@ -7,15 +7,15 @@
 # This private class is called from rundeck::config used to manage the ssl properties if ssl is enabled
 #
 class rundeck::config::global::ssl(
+  $group               = $rundeck::config::group,
+  $key_password        = $rundeck::config::key_password,
   $keystore            = $rundeck::config::keystore,
   $keystore_password   = $rundeck::config::keystore_password,
-  $key_password        = $rundeck::config::key_password,
+  $properties_dir      = $rundeck::config::properties_dir,
+  $service_name        = $rundeck::service_name,
   $truststore          = $rundeck::config::truststore,
   $truststore_password = $rundeck::config::truststore_password,
-  $properties_dir      = $rundeck::config::properties_dir,
   $user                = $rundeck::config::user,
-  $group               = $rundeck::config::group,
-  $service_name        = $rundeck::service_name,
 ) {
 
   $properties_file = "${properties_dir}/ssl/ssl.properties"

diff --git a/manifests/config/global/web.pp b/manifests/config/global/web.pp
@@ -18,7 +18,7 @@
 #   Session timeout is an expired time limit for a logged in Rundeck GUI user which as been inactive for a period of time.
 #
 class rundeck::config::global::web (
-  $security_role = $rundeck::params::security_role,
+  $security_role   = $rundeck::params::security_role,
   $session_timeout = $rundeck::params::session_timeout,
 ) inherits rundeck::params {
 

diff --git a/manifests/config/plugin.pp b/manifests/config/plugin.pp
@@ -8,11 +8,12 @@
 #
 # === Parameters
 #
+# [*ensure*]
+#   Set present or absent to add or remove the plugin
+#
 # [*source*]
 #   The http source or local path from which to get the jar plugin.
 #
-# [*ensure*]
-#   Set present or absent to add or remove the plugin
 # === Examples
 #
 # Install a custom plugin:

diff --git a/manifests/config/project.pp b/manifests/config/project.pp
@@ -11,27 +11,26 @@
 # [*file_copier_provider*]
 #  The type of proivder that will be used for copying files to each of the nodes
 #
-# [*node_executor_provider*]
-#  The type of provider that will be used to gather node resources
+# [*framework_config*]
+#  Rundeck config
 #
-# [*resource_sources*]
-#  A hash of rundeck::config::resource_source that will be used to specifiy the node
-#  resources for this project
+# [*group*]
+#  Rundeck group
 #
-# [*framework_config*]
-#   Rundeck config
+# [*node_executor_provider*]
+#  The type of provider that will be used to gather node resources
 #
-# [*user*]
-#   Rundeck user
+# [*projects_dir*]
+#  The directory where rundeck is configured to store project information
 #
-# [*group*]
-#   Rundeck group
+# [*resource_sources*]
+#  A hash of rundeck::config::resource_source that will be used to specifiy the node resources for this project
 #
 # [*ssh_keypath*]
-#   The path the the ssh key that will be used by the ssh/scp providers
+#  The path the the ssh key that will be used by the ssh/scp providers
 #
-# [*projects_dir*]
-#   The directory where rundeck is configured to store project information
+# [*user*]
+#  Rundeck user
 #
 # === Examples
 #
@@ -46,13 +45,13 @@
 #
 define rundeck::config::project (
   $file_copier_provider   = $rundeck::file_copier_provider,
-  $node_executor_provider = $rundeck::node_executor_provider,
-  $resource_sources       = $rundeck::resource_sources,
   $framework_config       = $rundeck::framework_config,
-  $user                   = $rundeck::user,
   $group                  = $rundeck::group,
-  $ssh_keypath            = undef,
+  $node_executor_provider = $rundeck::node_executor_provider,
   $projects_dir           = undef,
+  $resource_sources       = $rundeck::resource_sources,
+  $ssh_keypath            = undef,
+  $user                   = $rundeck::user,
 ) {
 
   include ::rundeck