From db186b7827cec056e77119aafe8ffddb003c2636 Mon Sep 17 00:00:00 2001
From: Brian Vanderbusch <chief@hackerhappyhour.com>
Date: Sat, 2 Jun 2018 11:19:57 -0500
Subject: [PATCH] improved class ordering

- moved host_config to front
- moved omnibus_config in front of install
 - closes #240
- made service a non-subscribe in init.pp ordering
 - required for #239

 closes #237
---
 manifests/host_config.pp | 2 ++
 manifests/init.pp        | 7 +++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/manifests/host_config.pp b/manifests/host_config.pp
index 0e82af07..ad52dde3 100644
--- a/manifests/host_config.pp
+++ b/manifests/host_config.pp
@@ -36,4 +36,6 @@
     group  => 'root',
     mode   => '0644',
   }
+
+  include gitlab::backup
 }
diff --git a/manifests/init.pp b/manifests/init.pp
index 4bf15a87..b707c3d5 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -443,13 +443,12 @@
   Hash                           $global_hooks                  = {},
 ) inherits gitlab::params {
 
-  contain gitlab::preinstall
+  contain gitlab::host_config
+  contain gitlab::omnibus_config
   contain gitlab::install
-  contain gitlab::config
   contain gitlab::service
-  contain gitlab::backup
 
-  Class['gitlab::preinstall'] -> Class['gitlab::install'] -> Class['gitlab::config'] ~> Class['gitlab::service'] -> Class['gitlab::backup']
+  Class['gitlab::host_config'] -> Class['gitlab::omnibus_config'] -> Class['gitlab::install'] -> Class['gitlab::service']
 
   $custom_hooks.each |$name, $options| {
     gitlab::custom_hook { $name: