From 12b625bb4c98ac9e522967a0308797f1f061b41c Mon Sep 17 00:00:00 2001
From: lcappelli <laura.cappelli@cnaf.infn.it>
Date: Tue, 6 Dec 2022 11:13:51 +0000
Subject: [PATCH] Remove echo module from voms module rpm
---
rpm/build-voms-rpm.sh | 2 --
rpm/nginx-module-http-voms.spec | 4 +---
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/rpm/build-voms-rpm.sh b/rpm/build-voms-rpm.sh
index 7023ece..af81ad0 100644
--- a/rpm/build-voms-rpm.sh
+++ b/rpm/build-voms-rpm.sh
@@ -16,8 +16,6 @@ EOF
# set sources
cd ~/rpmbuild/SOURCES
wget -O nginx-$ngxVersion.tar.gz https://nginx.org/download/nginx-$ngxVersion.tar.gz
-wget -O ./ngx-http-echo-module.tar.gz https://github.com/openresty/echo-nginx-module/archive/refs/tags/v0.63.tar.gz
-tar xzf ngx-http-echo-module.tar.gz
# set voms modules sources
mkdir ngx-http-voms-module
diff --git a/rpm/nginx-module-http-voms.spec b/rpm/nginx-module-http-voms.spec
index 706bcf6..3008456 100644
--- a/rpm/nginx-module-http-voms.spec
+++ b/rpm/nginx-module-http-voms.spec
@@ -13,7 +13,6 @@ URL: https://github.com/lauracappelli/nginx-sd-rpm
Source0: https://nginx.org/download/nginx-%{base_version}.tar.gz
Source1: ngx-http-voms-module
-Source2: echo-nginx-module-0.63
BuildRequires: gcc, make
BuildRequires: voms-devel
@@ -38,7 +37,7 @@ tar --strip-components=1 -zxf %{SOURCE0}
%define CONFIG_PATH %(echo "--prefix=/etc/nginx --sbin-path=/usr/sbin/nginx --modules-path=/usr/lib/nginx/modules --conf-path=/etc/nginx/nginx.conf --error-log-path=/var/log/nginx/error.log --http-log-path=/var/log/nginx/access.log --pid-path=/var/run/nginx.pid --lock-path=/var/run/nginx.lock --http-client-body-temp-path=/var/cache/nginx/client_temp --http-proxy-temp-path=/var/cache/nginx/proxy_temp --http-fastcgi-temp-path=/var/cache/nginx/fastcgi_temp --http-uwsgi-temp-path=/var/cache/nginx/uwsgi_temp --http-scgi-temp-path=/var/cache/nginx/scgi_temp")
%define CONFIG_ARGS %(echo "--user=nginx --group=nginx --with-compat --with-http_ssl_module")
-%define MODULE_CONFIG_ARGS %(echo "--add-dynamic-module=%SOURCE1 --add-dynamic-module=%SOURCE2")
+%define MODULE_CONFIG_ARGS %(echo "--add-dynamic-module=%SOURCE1")
%build
@@ -75,7 +74,6 @@ To enable these modules, add the following to /etc/nginx/nginx.conf
and reload nginx:
load_module modules/ngx_http_voms_module.so;
- load_module modules/ngx_http_echo_module.so;
Please refer to the modules documentation for further details:
https://baltig.infn.it/storm2/ngx_http_voms_module
--
GitLab