From cd6889a35906586f6701eed86b53d04f938cb538 Mon Sep 17 00:00:00 2001
From: Andrey Nikitin <anikitin@mirantis.com>
Date: Mon, 21 Mar 2016 11:45:51 +0300
Subject: [PATCH] Order of the classes parameters is refactored

Order and intendation of those parameters are changed
to follow Puppet Style Guide recommendation [0].
Moreover, it will allow to an user to find much faster
a variable in a list of variables.

[0]. https://docs.puppetlabs.com/guides/style_guide.html

Change-Id: If012896a95088ae836d5dfa35aa3cad553aee516
---
 manifests/apache.pp      | 18 +++++++++---------
 manifests/buildsource.pp |  4 ++--
 manifests/init.pp        |  8 ++++----
 manifests/mysql.pp       |  2 +-
 manifests/site.pp        |  8 ++++----
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/manifests/apache.pp b/manifests/apache.pp
index faae63c..52b1548 100644
--- a/manifests/apache.pp
+++ b/manifests/apache.pp
@@ -1,15 +1,15 @@
 # == Class: etherpad_lite::apache
 #
 class etherpad_lite::apache (
-  $vhost_name = $::fqdn,
-  $docroot = '/srv/etherpad-lite',
-  $serveradmin = "webmaster@${::fqdn}",
-  $ssl_cert_file = '',
-  $ssl_key_file = '',
-  $ssl_chain_file = '',
-  $ssl_cert_file_contents = '', # If left empty puppet will not create file.
-  $ssl_key_file_contents = '', # If left empty puppet will not create file.
-  $ssl_chain_file_contents = '' # If left empty puppet will not create file.
+  $docroot                 = '/srv/etherpad-lite',
+  $serveradmin             = "webmaster@${::fqdn}",
+  $ssl_cert_file           = '',
+  $ssl_cert_file_contents  = '', # If left empty puppet will not create file.
+  $ssl_chain_file          = '',
+  $ssl_chain_file_contents = '', # If left empty puppet will not create file.
+  $ssl_key_file            = '',
+  $ssl_key_file_contents   = '', # If left empty puppet will not create file.
+  $vhost_name              = $::fqdn,
 ) {
 
   package { 'ssl-cert':
diff --git a/manifests/buildsource.pp b/manifests/buildsource.pp
index a2ebbd0..2b0c9fd 100644
--- a/manifests/buildsource.pp
+++ b/manifests/buildsource.pp
@@ -3,10 +3,10 @@
 # define to build from source using ./configure && make && make install.
 #
 define etherpad_lite::buildsource(
+  $creates = '/nonexistant/file',
   $dir     = $title,
-  $user    = 'root',
   $timeout = 300,
-  $creates = '/nonexistant/file'
+  $user    = 'root',
 ) {
 
   exec { "./configure in ${dir}":
diff --git a/manifests/init.pp b/manifests/init.pp
index 64e377d..7c613c6 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -12,13 +12,13 @@
 #
 #
 class etherpad_lite (
-  $ep_user          = 'eplite',
-  $base_log_dir     = '/var/log',
   $base_install_dir = '/opt/etherpad-lite',
+  $base_log_dir     = '/var/log',
+  $ep_ensure        = 'present',
+  $ep_user          = 'eplite',
+  $eplite_version   = 'develop',
   # If set to system will install system package.
   $nodejs_version   = 'v0.10.21',
-  $eplite_version   = 'develop',
-  $ep_ensure        = 'present',
 ) {
 
   # where the modules are, needed to easily install modules later
diff --git a/manifests/mysql.pp b/manifests/mysql.pp
index 6014dac..2543817 100644
--- a/manifests/mysql.pp
+++ b/manifests/mysql.pp
@@ -1,10 +1,10 @@
 # == Class: puppet-etherpad_lite::mysql
 #
 class etherpad_lite::mysql(
+  $database_password,
   $mysql_root_password,
   $database_name = 'etherpad-lite',
   $database_user = 'eplite',
-  $database_password,
 ) {
   class { '::mysql::server':
     root_password    => $mysql_root_password,
diff --git a/manifests/site.pp b/manifests/site.pp
index ca2090d..cb2c3ae 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -3,11 +3,11 @@
 class etherpad_lite::site (
   $database_password,
   $etherpad_title,
-  $session_key   = '',
-  $db_type       = 'mysql',
-  $database_user = 'eplite',
+  $database_host = 'localhost',
   $database_name = 'etherpad-lite',
-  $database_host = 'localhost'
+  $database_user = 'eplite',
+  $db_type       = 'mysql',
+  $session_key   = '',
 ) {
 
   include ::etherpad_lite