Browse files

Nginx 1.0.14. HAProxy updates.

  • Loading branch information...
1 parent d88e032 commit 42d0e6f9a0256db6993ffc4b9a7f9ef5a37c4277 @wayneeseguin wayneeseguin committed Jan 30, 2012
Showing with 6 additions and 24 deletions.
  1. +0 −9 haproxy/bin/config/help
  2. +0 −11 haproxy/bin/help
  3. +2 −2 haproxy/shell/functions
  4. +1 −0 haproxy/shell/includes
  5. +1 −1 nginx/config/defaults
  6. +2 −1 nginx/shell/functions
View
9 haproxy/bin/config/help
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-description "Extension for managing ${extension} (${website_url})."
-
-action "edit" "Opens ${extension}.conf for ${package_name} ${package_version}"\
- "in defined EDITOR or vi if undefined.."
-
-show_help usage
-
View
11 haproxy/bin/help
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-description "Extension for managing ${extension} (${website_url})."
-
-action "package [action]" "Use ${extension} package."
-action "conf [action]" "Work with ${extension} configuration."
-action "service [action]" "Control ${extension} service."
-action "[namespace] help" "Display help for namespaces ${extension} {package,conf,service}."
-
-show_help usage
-
View
4 haproxy/shell/functions
@@ -2,7 +2,7 @@
haproxy_initialize()
{
- package_dependencies=( pcre )
+ package_dependencies=( ) # pcre
package define \
base_url "http://haproxy.1wt.eu/download/${package_version%.*}/src/" \
@@ -65,7 +65,7 @@ haproxy_configure()
fi
make_install_flags=( install ${make_flags[@]})
- make_flags+=( -j$(os_cpu_count) )
+ make_flags+=( -j$(os cpu count) )
make "${make_flags[@]}"
}
View
1 haproxy/shell/includes
@@ -1,2 +1,3 @@
+api/os
api/package
api/service
View
2 nginx/config/defaults
@@ -1,3 +1,3 @@
-version=1.0.10
+version=1.0.14
base_url=http://nginx.org/download
website_url=http://wiki.nginx.org/Main
View
3 nginx/shell/functions
@@ -76,6 +76,7 @@ nginx_cli()
nginx_server_new_cli()
{
trace_filter nginx || set -o xtrace
+
if variable is empty project
then
array shift extension_args variable project
@@ -159,7 +160,7 @@ nginx_postinstall()
if file exists "nginx.conf"
then
- file move "nginx.conf" \
+ file move "${install_path}/etc/nginx.conf" \
to "${install_path}/etc/nginx/conf/nginx.conf.default" \
from "${install_path}/etc/nginx"
fi

0 comments on commit 42d0e6f

Please sign in to comment.