Skip to content
Snippets Groups Projects
Commit 326c4282 authored by Lars Beckers's avatar Lars Beckers
Browse files

remove nginx shibboleth build

parent 08b48349
No related branches found
No related tags found
No related merge requests found
...@@ -27,15 +27,6 @@ adcli: ...@@ -27,15 +27,6 @@ adcli:
paths: paths:
- packages/* - packages/*
nginx:
stage: build
script: scripts/nginx-shib.sh
only:
- master
artifacts:
paths:
- packages/*
ganeti: ganeti:
stage: build stage: build
script: scripts/ganeti.sh script: scripts/ganeti.sh
......
...@@ -23,6 +23,5 @@ The packages are uploaded to the CI artifacts after build. ...@@ -23,6 +23,5 @@ The packages are uploaded to the CI artifacts after build.
- `adcli` uses upstream patches from master (GPL licensed) - `adcli` uses upstream patches from master (GPL licensed)
- [`ganeti`](README.ganeti.md) - [`ganeti`](README.ganeti.md)
- `grml-zsh-config` takes the `grml-etc-core` package and throws out everything but zsh config - `grml-zsh-config` takes the `grml-etc-core` package and throws out everything but zsh config
- `nginx` builds nginx with the nginx-shib-module
- `sssd` backports the sssd-package from buster - `sssd` backports the sssd-package from buster
diff -Naur debian/control debian/control
--- debian/control 2018-03-26 20:56:56.476543112 +0200
+++ debian/control 2018-03-26 21:01:51.812104005 +0200
@@ -71,6 +71,7 @@
Package: nginx-full
Architecture: any
Depends: libnginx-mod-http-auth-pam (= ${binary:Version}),
+ libnginx-mod-http-shibboleth (= ${binary:Version}),
libnginx-mod-http-dav-ext (= ${binary:Version}),
libnginx-mod-http-echo (= ${binary:Version}),
libnginx-mod-http-geoip (= ${binary:Version}),
@@ -142,6 +143,7 @@
Architecture: any
Priority: extra
Depends: libnginx-mod-http-auth-pam (= ${binary:Version}),
+ libnginx-mod-http-shibboleth (= ${binary:Version}),
libnginx-mod-http-cache-purge (= ${binary:Version}),
libnginx-mod-http-dav-ext (= ${binary:Version}),
libnginx-mod-http-echo (= ${binary:Version}),
@@ -259,6 +261,20 @@
The module uses PAM as a backend for simple http authentication. It
also allows setting the pam service name to allow more fine grained control.
+Package: libnginx-mod-http-shibboleth
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Shibboleth authentication module for Nginx
+ The nginx_http_shibboleth module enables authentication using Shibboleth.
+ .
+ This module allows Nginx to work with Shibboleth, by way of Shibboleth's
+ FastCGI authorizer. This module requires specific configuration in order
+ to work correctly, as well as Shibboleth's FastCGI authorizer application
+ available on the system. It aims to be similar to parts of Apache's
+ mod_shib, though Shibboleth authorisation and authentication settings
+ are configured via shibboleth2.xml rather than in the web server
+ configuration.
+
Package: libnginx-mod-http-lua
Architecture: any
Depends: libnginx-mod-http-ndk (= ${binary:Version}),
diff -Naur debian/libnginx-mod.conf/mod-http-shibboleth.conf debian/libnginx-mod.conf/mod-http-shibboleth.conf
--- debian/libnginx-mod.conf/mod-http-shibboleth.conf 1970-01-01 01:00:00.000000000 +0100
+++ debian/libnginx-mod.conf/mod-http-shibboleth.conf 2018-03-26 21:04:54.131246344 +0200
@@ -0,0 +1 @@
+load_module modules/ngx_http_shibboleth_module.so;
diff -Naur debian/rules debian/rules
--- debian/rules 2018-03-26 20:56:56.604548119 +0200
+++ debian/rules 2018-03-26 21:03:00.054777450 +0200
@@ -13,6 +13,7 @@
FLAVOURS := full light extras
DYN_MODS := \
http-auth-pam \
+ http-shibboleth \
http-cache-purge \
http-dav-ext \
http-echo \
@@ -103,6 +104,7 @@
--with-mail=dynamic \
--with-mail_ssl_module \
--add-dynamic-module=$(MODULESDIR)/nginx-auth-pam \
+ --add-dynamic-module=$(MODULESDIR)/nginx-http-shibboleth \
--add-dynamic-module=$(MODULESDIR)/nginx-dav-ext-module \
--add-dynamic-module=$(MODULESDIR)/nginx-echo \
--add-dynamic-module=$(MODULESDIR)/nginx-upstream-fair \
@@ -128,6 +130,7 @@
--with-stream_ssl_module \
--add-dynamic-module=$(MODULESDIR)/headers-more-nginx-module \
--add-dynamic-module=$(MODULESDIR)/nginx-auth-pam \
+ --add-dynamic-module=$(MODULESDIR)/nginx-http-shibboleth \
--add-dynamic-module=$(MODULESDIR)/nginx-cache-purge \
--add-dynamic-module=$(MODULESDIR)/nginx-dav-ext-module \
--add-dynamic-module=$(MODULESDIR)/nginx-development-kit \
#!/bin/bash
source "${BASH_SOURCE%/*}/common.sh"
get_sources nginx buster
cd debian
cp libnginx-mod.nginx.skeleton libnginx-mod-http-shibboleth.nginx
cd modules
git clone "https://github.com/nginx-shib/nginx-http-shibboleth.git"
cd ../..
patch -d . -p0 < ../patches/nginx/00-add-module.patch
dch_custom "Add libnginx-mod-http-shibboleth"
install_build_deps
build
test_install
prepare_artifacts
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment