Skip to content

Commit

Permalink
Nginx version bump,.
Browse files Browse the repository at this point in the history
  • Loading branch information
wayneeseguin committed Oct 28, 2012
1 parent aca8dd9 commit bec40a9
Show file tree
Hide file tree
Showing 12 changed files with 16 additions and 2 deletions.
2 changes: 2 additions & 0 deletions 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"

1 change: 1 addition & 0 deletions nginx/bin/config/edit
@@ -1,6 +1,7 @@
#!/bin/sh

trace_filter nginx || set -o xtrace

if command exists vim
then
${EDITOR:=vim}
Expand Down
1 change: 1 addition & 0 deletions nginx/bin/config/system
Expand Up @@ -17,3 +17,4 @@ fi
files link symbolic \
from "${active_path}/etc/nginx" \
to /etc/nginx

1 change: 1 addition & 0 deletions nginx/bin/server/disable
Expand Up @@ -25,3 +25,4 @@ else
fi
succeed "$project.conf is disabled."
fi

2 changes: 2 additions & 0 deletions nginx/bin/server/edit
@@ -1,6 +1,7 @@
#!/bin/sh

trace_filter nginx || set -o xtrace

if command exists vim
then
${EDITOR:=vim}
Expand All @@ -9,3 +10,4 @@ else
fi

${EDITOR} "${service_config_path}/servers/${project:-"${extension_args[0]}"}.conf"

1 change: 1 addition & 0 deletions nginx/bin/server/enable
Expand Up @@ -23,3 +23,4 @@ else

succeed "$project.conf is enabled."
fi

1 change: 1 addition & 0 deletions nginx/bin/server/list
Expand Up @@ -2,3 +2,4 @@

find "${service_config_path}/servers" -type f -iname '*.conf' |
awk -F'/' '/.conf$/{print $NF}'

1 change: 1 addition & 0 deletions nginx/bin/server/new
Expand Up @@ -53,3 +53,4 @@ then
service_pid_file "${service_pid_file}" \
service_log_path "${service_log_path}"
fi

1 change: 1 addition & 0 deletions nginx/bin/service/list
Expand Up @@ -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."
Expand Down
2 changes: 2 additions & 0 deletions 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

3 changes: 2 additions & 1 deletion nginx/bin/service/setup
@@ -1,3 +1,4 @@
#!/bin/sh

nginx_service_setup
nginx_service_setup

2 changes: 1 addition & 1 deletion 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

0 comments on commit bec40a9

Please sign in to comment.