From c8114c2b890ab840ff15f174b50f7c018876f9f8 Mon Sep 17 00:00:00 2001
From: Devin Christensen <quixoten@gmail.com>
Date: Fri, 18 Dec 2015 10:58:59 -0700
Subject: [PATCH] Revert unnecessary changes

---
 manifests/vhost.pp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index 29c9d12d96..709df95314 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -896,7 +896,7 @@
   if $wsgi_application_group or $wsgi_daemon_process or ($wsgi_import_script and $wsgi_import_script_options) or $wsgi_process_group or ($wsgi_script_aliases and ! empty($wsgi_script_aliases)) or $wsgi_pass_authorization {
     concat::fragment { "${name}-wsgi":
       target  => "${priority_real}${filename}.conf",
-      order   => 280,
+      order   => 260,
       content => template('apache/vhost/_wsgi.erb'),
     }
   }
@@ -906,7 +906,7 @@
   if $custom_fragment {
     concat::fragment { "${name}-custom_fragment":
       target  => "${priority_real}${filename}.conf",
-      order   => 290,
+      order   => 270,
       content => template('apache/vhost/_custom_fragment.erb'),
     }
   }
@@ -919,7 +919,7 @@
   if $fastcgi_server or $fastcgi_dir {
     concat::fragment { "${name}-fastcgi":
       target  => "${priority_real}${filename}.conf",
-      order   => 300,
+      order   => 280,
       content => template('apache/vhost/_fastcgi.erb'),
     }
   }
@@ -929,7 +929,7 @@
   if $suexec_user_group {
     concat::fragment { "${name}-suexec":
       target  => "${priority_real}${filename}.conf",
-      order   => 310,
+      order   => 290,
       content => template('apache/vhost/_suexec.erb'),
     }
   }
@@ -944,7 +944,7 @@
   if $passenger_app_root or $passenger_app_env or $passenger_ruby or $passenger_min_instances or $passenger_start_timeout or $passenger_pre_start {
     concat::fragment { "${name}-passenger":
       target  => "${priority_real}${filename}.conf",
-      order   => 320,
+      order   => 300,
       content => template('apache/vhost/_passenger.erb'),
     }
   }
@@ -954,7 +954,7 @@
   if $add_default_charset {
     concat::fragment { "${name}-charsets":
       target  => "${priority_real}${filename}.conf",
-      order   => 330,
+      order   => 310,
       content => template('apache/vhost/_charsets.erb'),
     }
   }
@@ -967,7 +967,7 @@
   if $modsec_disable_vhost or $modsec_disable_ids or $modsec_disable_ips {
     concat::fragment { "${name}-security":
       target  => "${priority_real}${filename}.conf",
-      order   => 340,
+      order   => 320,
       content => template('apache/vhost/_security.erb')
     }
   }
@@ -977,7 +977,7 @@
   if $filters and ! empty($filters) {
     concat::fragment { "${name}-filters":
       target  => "${priority_real}${filename}.conf",
-      order   => 350,
+      order   => 330,
       content => template('apache/vhost/_filters.erb'),
     }
   }