From bec40a9d5edf4d343246fb3a5e36d1fdd8676f07 Mon Sep 17 00:00:00 2001
From: "Wayne E. Seguin" <wayneeseguin@gmail.com>
Date: Sun, 28 Oct 2012 14:09:12 -0400
Subject: [PATCH] Nginx version bump,.

---
 nginx/bin/config/check    | 2 ++
 nginx/bin/config/edit     | 1 +
 nginx/bin/config/system   | 1 +
 nginx/bin/server/disable  | 1 +
 nginx/bin/server/edit     | 2 ++
 nginx/bin/server/enable   | 1 +
 nginx/bin/server/list     | 1 +
 nginx/bin/server/new      | 1 +
 nginx/bin/service/list    | 1 +
 nginx/bin/service/restart | 2 ++
 nginx/bin/service/setup   | 3 ++-
 nginx/config/defaults     | 2 +-
 12 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/nginx/bin/config/check b/nginx/bin/config/check
index 8bd443a..a3b8efc 100755
--- a/nginx/bin/config/check
+++ b/nginx/bin/config/check
@@ -1,4 +1,6 @@
 #!/bin/sh
 
 trace_filter nginx || set -o xtrace
+
 "${service_binary}" -t -c "${service_config_path}/nginx.conf"
+
diff --git a/nginx/bin/config/edit b/nginx/bin/config/edit
index 47c4e95..04b2a4c 100755
--- a/nginx/bin/config/edit
+++ b/nginx/bin/config/edit
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 trace_filter nginx || set -o xtrace
+
 if command exists vim
 then
   ${EDITOR:=vim}
diff --git a/nginx/bin/config/system b/nginx/bin/config/system
index 2884333..d9a6e0b 100755
--- a/nginx/bin/config/system
+++ b/nginx/bin/config/system
@@ -17,3 +17,4 @@ fi
 files link symbolic \
   from "${active_path}/etc/nginx" \
   to /etc/nginx
+
diff --git a/nginx/bin/server/disable b/nginx/bin/server/disable
index b202bab..f2523ba 100755
--- a/nginx/bin/server/disable
+++ b/nginx/bin/server/disable
@@ -25,3 +25,4 @@ else
   fi
   succeed "$project.conf is disabled."
 fi
+
diff --git a/nginx/bin/server/edit b/nginx/bin/server/edit
index 7030e7d..2ce7412 100755
--- a/nginx/bin/server/edit
+++ b/nginx/bin/server/edit
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 trace_filter nginx || set -o xtrace
+
 if command exists vim
 then
   ${EDITOR:=vim}
@@ -9,3 +10,4 @@ else
 fi
 
 ${EDITOR} "${service_config_path}/servers/${project:-"${extension_args[0]}"}.conf"
+
diff --git a/nginx/bin/server/enable b/nginx/bin/server/enable
index 7899d76..873eb5a 100755
--- a/nginx/bin/server/enable
+++ b/nginx/bin/server/enable
@@ -23,3 +23,4 @@ else
 
   succeed "$project.conf is enabled."
 fi
+
diff --git a/nginx/bin/server/list b/nginx/bin/server/list
index 24f3106..d18c817 100755
--- a/nginx/bin/server/list
+++ b/nginx/bin/server/list
@@ -2,3 +2,4 @@
 
 find "${service_config_path}/servers" -type f -iname '*.conf' |
   awk -F'/' '/.conf$/{print $NF}'
+
diff --git a/nginx/bin/server/new b/nginx/bin/server/new
index 93b1259..9c7e2d0 100755
--- a/nginx/bin/server/new
+++ b/nginx/bin/server/new
@@ -53,3 +53,4 @@ then
     service_pid_file "${service_pid_file}" \
     service_log_path "${service_log_path}"
 fi
+
diff --git a/nginx/bin/service/list b/nginx/bin/service/list
index efa5f0a..4859cac 100755
--- a/nginx/bin/service/list
+++ b/nginx/bin/service/list
@@ -3,6 +3,7 @@
 trace_filter nginx || set -o xtrace
 local line header
 typeset -a master_list worker_list
+
 header="$(ps auxww | head -1)"
 
 (( master_pid > 0 )) || succeed "No Nginx master processes was found."
diff --git a/nginx/bin/service/restart b/nginx/bin/service/restart
index 69a653b..00e5d5a 100755
--- a/nginx/bin/service/restart
+++ b/nginx/bin/service/restart
@@ -1,9 +1,11 @@
 #!/bin/sh
 
 trace_filter nginx || set -o xtrace
+
 if (( master_pid > 0 ))
 then
   kill -HUP $master_pid
 else
   service restart
 fi
+
diff --git a/nginx/bin/service/setup b/nginx/bin/service/setup
index 8450252..6aa6469 100755
--- a/nginx/bin/service/setup
+++ b/nginx/bin/service/setup
@@ -1,3 +1,4 @@
 #!/bin/sh
 
-nginx_service_setup
\ No newline at end of file
+nginx_service_setup
+
diff --git a/nginx/config/defaults b/nginx/config/defaults
index d5f8d74..3d7b461 100644
--- a/nginx/config/defaults
+++ b/nginx/config/defaults
@@ -1,3 +1,3 @@
-version=1.2.2
+version=1.2.4
 base_url=http://nginx.org/download
 website_url=http://wiki.nginx.org/Main