From b0a43d8296c833021fc34d027f203c24b11ee80e Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Mon, 3 Jan 2011 18:04:41 +0100 Subject: [PATCH] nginx: added rrd graph addon module --- network/nginx/config.hlp | 24 ++++++++++++++++++++++++ network/nginx/config.in | 25 +++++++++++++++++++++++++ network/nginx/nginx.conf | 21 ++++++++++++++++++++- network/nginx/nginx.desc | 1 + 4 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 network/nginx/config.hlp create mode 100644 network/nginx/config.in diff --git a/network/nginx/config.hlp b/network/nginx/config.hlp new file mode 100644 index 000000000..4bae16608 --- /dev/null +++ b/network/nginx/config.hlp @@ -0,0 +1,24 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../nginx/config.hlp +# Copyright (C) 2011 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. A copy of the +# GNU General Public License can be found in the file COPYING. +# --- SDE-COPYRIGHT-NOTE-END --- + +MENU_PKG_NGINX + Additional config options for the nginx package. + +SDECFG_PKG_NGINX_ADDON_MOD_RRDGRAPH + Enable RRD Graph Module + + This module provides an HTTP interface to RRDtool's graphing facilities. + + http://wiki.nginx.org/NgxRRDGraph + https://github.com/evanmiller/mod_rrd_graph diff --git a/network/nginx/config.in b/network/nginx/config.in new file mode 100644 index 000000000..59bf54c84 --- /dev/null +++ b/network/nginx/config.in @@ -0,0 +1,25 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../nginx/config.in +# Copyright (C) 2011 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. A copy of the +# GNU General Public License can be found in the file COPYING. +# --- SDE-COPYRIGHT-NOTE-END --- + +if pkgcheck nginx X; then + menu_begin MENU_PKG_NGINX 'Nginx Package Options' + + comment 'Addon modules (not officially supported)' + if pkgcheck rrdtool X; then + bool "RRD Graph Module" SDECFG_PKG_NGINX_ADDON_MOD_RRDGRAPH 0 + fi + + menu_end +fi + diff --git a/network/nginx/nginx.conf b/network/nginx/nginx.conf index a195c1319..463d9217d 100644 --- a/network/nginx/nginx.conf +++ b/network/nginx/nginx.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../nginx/nginx.conf -# Copyright (C) 2009 - 2010 The OpenSDE Project +# Copyright (C) 2009 - 2011 The OpenSDE Project # Copyright (C) 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -82,3 +82,22 @@ fi var_append CC_WRAPPER_REMOVE " " "-Werror" +# +# 3rd party addon modules +# + +# generic function to add a 3rd party addon module +# function parameters: +# $1: pattern of the modules source file name +# +pkg_nginx_add_module() { + mkdir -p $builddir/addon-module/$1 + tar -v $taropt $( match_source_file -p $1 nginx ) --strip-components=1 -C $builddir/addon-module/$1 + var_append confopt ' ' "--add-module=../addon-module/$1" +} + +# rrd graph module +if [ "$SDECFG_PKG_NGINX_ADDON_MOD_RRDGRAPH" == 1 ] ; then + pkgprefix -t rrdtool + hook_add preconf 5 "pkg_nginx_add_module mod_rrd_graph" +fi diff --git a/network/nginx/nginx.desc b/network/nginx/nginx.desc index cb5ae6611..31d7a48c5 100644 --- a/network/nginx/nginx.desc +++ b/network/nginx/nginx.desc @@ -49,3 +49,4 @@ [CV-URL] http://nginx.org/en/download.html [D] 3905020224 nginx-0.8.54.tar.gz http://nginx.org/download/ +[D] 2799334071 nginx-mod_rrd_graph-0.2.0.tar.gz !http://wiki.nginx.org/images/9/9d/Mod_rrd_graph-0.2.0.tar.gz