Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ebc2a168620aefd021271e5fd04312aeecd81dda)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ebc2a168620aefd021271e5fd04312aeecd81dda)
  • Date: Fri, 19 Aug 2011 08:06:55 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

http/nginx/BUILD | 7 +++++++
http/nginx/DETAILS | 17 +++++++++++++++++
http/nginx/HISTORY | 3 +++
http/nginx/PREPARE | 9 ++++++++-
http/nginx/PRE_BUILD | 7 +++++++
5 files changed, 42 insertions(+), 1 deletion(-)

New commits:
commit ebc2a168620aefd021271e5fd04312aeecd81dda
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

nginx: added modules framework (modules added: push, auth_ldap)

diff --git a/http/nginx/BUILD b/http/nginx/BUILD
index 15c6438..659a988 100755
--- a/http/nginx/BUILD
+++ b/http/nginx/BUILD
@@ -5,6 +5,13 @@ create_account nginx &&
persistent_add TEMP_DIR &&
local TEMP_DIR="$INSTALL_ROOT/var/spool/nginx" &&

+if list_find "$NGINX_MODULES" "push"; then
+ OPTS="--add-module=$SOURCE_DIRECTORY3 $OPTS"
+fi &&
+if list_find "$NGINX_MODULES" "auth_ldap"; then
+ OPTS="--add-module=$SOURCE_DIRECTORY4 $OPTS"
+fi &&
+
if [[ $NGINX_SYSLOG == n ]]; then
OPTS="--http-log-path=$INSTALL_ROOT/var/log/nginx/access.log \
--error-log-path=$INSTALL_ROOT/var/log/nginx/error.log \
diff --git a/http/nginx/DETAILS b/http/nginx/DETAILS
index fd494ef..87332ee 100755
--- a/http/nginx/DETAILS
+++ b/http/nginx/DETAILS
@@ -26,6 +26,23 @@ esac
SOURCE_GPG=sysoev.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+
+# optional modules
+if list_find "$NGINX_MODULES" "push"; then
+ ID_PUSH=nginx_http_push_module-0.692
+ SOURCE3=${ID_PUSH}.tar.gz
+ SOURCE3_URL[0]=http://pushmodule.slact.net/downloads/$SOURCE3
+
SOURCE3_HASH=sha512:79821cacf5db4b1309e3f1c8d6980f83b1093dd3f291db5298bfdeb0d889fc0629625dcf3135d1cf7554b43308ef7172a4f40596928ab3069426801177ed3c1c
+SOURCE_DIRECTORY3="$SOURCE_DIRECTORY/${ID_PUSH}"
+fi
+if list_find "$NGINX_MODULES" "auth_ldap"; then
+ ID_AUTH_LDAP=ngx_http_auth_ldap_module-1.0-a3
+ SOURCE4=${ID_AUTH_LDAP}.tar.gz
+ SOURCE4_URL[0]=http://nginx-auth-ldap.googlecode.com/files/$SOURCE4
+
SOURCE4_HASH=sha512:01629d1a002088da0fd3beb6fa73448a5e5f87838320253bb33f5a44292deca7b7ef9c185a7749a11f564a51cfbe7339b398012ec7a49f4973061702c0cae4c1
+SOURCE_DIRECTORY4="$SOURCE_DIRECTORY/${ID_AUTH_LDAP}"
+fi
+
WEB_SITE=http://nginx.org/
LICENSE[0]=BSD
ENTERED=20090203
diff --git a/http/nginx/HISTORY b/http/nginx/HISTORY
index 974e541..ecb35ac 100644
--- a/http/nginx/HISTORY
+++ b/http/nginx/HISTORY
@@ -1,3 +1,6 @@
+2011-08-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, {{PRE_,}BUILD,PREPARE}: added modules framework
+
2011-08-11 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.0.5 (stable), 0.8.54 (legacy), 0.7.69
(old), 1.1.0 (devel); renewed source urls
diff --git a/http/nginx/PREPARE b/http/nginx/PREPARE
index 5b30791..e2c5dfb 100755
--- a/http/nginx/PREPARE
+++ b/http/nginx/PREPARE
@@ -1,5 +1,12 @@
+. "$GRIMOIRE/config_query_multi.function" &&
+
config_query_list NGINX_RELEASE "Select which release to build:" \
stable \
legacy \
old \
- devel
+ devel &&
+
+config_query_multi NGINX_MODULES "What additional modules to build?" \
+ none \
+ push \
+ auth_ldap
diff --git a/http/nginx/PRE_BUILD b/http/nginx/PRE_BUILD
index d46cfa0..506db43 100755
--- a/http/nginx/PRE_BUILD
+++ b/http/nginx/PRE_BUILD
@@ -11,4 +11,11 @@ if [[ $NGINX_SYSLOG == y ]]; then
cp "$SPELL_DIRECTORY/syslog-0.8-1.0.config" syslog/config &&
patch -p1 < "$SPELL_DIRECTORY/syslog-0.8-1.0.patch"
fi
+fi &&
+
+if list_find "$NGINX_MODULES" "push"; then
+ unpack_file 3
+fi &&
+if list_find "$NGINX_MODULES" "auth_ldap"; then
+ unpack_file 4
fi



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ebc2a168620aefd021271e5fd04312aeecd81dda), Vlad Glagolev, 08/19/2011

Archive powered by MHonArc 2.6.24.

Top of Page