Permalink
Browse files

Merge branch 'master' of github.com:sm/sm-servers

  • Loading branch information...
2 parents 42d0e6f + 8cc89a7 commit 232593347cbcede7353da37555dc901ae9e18e25 @wayneeseguin wayneeseguin committed Jan 30, 2012
Showing with 3 additions and 3 deletions.
  1. +2 −2 nginx/bin/server/enable
  2. +1 −1 nginx/shell/functions
View
@@ -9,10 +9,10 @@ then
log fail "project must be specified for 'nginx project'"
fi
-if files exist "${service_config_path}/servers/$project.conf.disbled"
+if files exist "${service_config_path}/servers/$project.conf.disabled"
then
file move \
- from "${service_config_path}/servers/$project.conf.disbled" \
+ from "${service_config_path}/servers/$project.conf.disabled" \
to "${service_config_path}/servers/$project.conf"
else
if ! files exist "${service_config_path}/servers/$project.conf"
View
@@ -277,7 +277,7 @@ nginx_os_dependencies_install()
elif command exists apt-get
then
- apt-get install build-essential openssl curl zlib1g zlib1g-dev libssl-dev pcre pcre-dev
+ apt-get install build-essential openssl curl zlib1g zlib1g-dev libssl-dev libpcre3-dev
elif command exists yum
then

0 comments on commit 2325933

Please sign in to comment.