From 633ada5afb580dea9c755554c9a9a66b64434e4c Mon Sep 17 00:00:00 2001
From: Markus Krogh <markus@nordu.net>
Date: Wed, 27 Sep 2017 15:06:13 +0200
Subject: Structure cleanup + docker compose

---
 jetty_base/etc/jetty-http-forwarded.xml | 20 -------------------
 jetty_base/start.d/http.ini             | 34 ---------------------------------
 jetty_base/webapps/idp.xml              |  7 -------
 3 files changed, 61 deletions(-)
 delete mode 100644 jetty_base/etc/jetty-http-forwarded.xml
 delete mode 100644 jetty_base/start.d/http.ini
 delete mode 100644 jetty_base/webapps/idp.xml

(limited to 'jetty_base')

diff --git a/jetty_base/etc/jetty-http-forwarded.xml b/jetty_base/etc/jetty-http-forwarded.xml
deleted file mode 100644
index 50b8097..0000000
--- a/jetty_base/etc/jetty-http-forwarded.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
-<Configure id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
-  <Call name="addCustomizer">
-    <Arg>
-      <New class="org.eclipse.jetty.server.ForwardedRequestCustomizer">
-        <Set name="forwardedOnly"><Property name="jetty.httpConfig.forwardedOnly" default="false"/></Set>
-        <Set name="proxyAsAuthority"><Property name="jetty.httpConfig.forwardedProxyAsAuthority" default="false"/></Set>
-        <Set name="forwardedHeader"><Property name="jetty.httpConfig.forwardedHeader" default="Forwarded"/></Set>
-        <Set name="forwardedHostHeader"><Property name="jetty.httpConfig.forwardedHostHeader" default="X-Forwarded-Host"/></Set>
-        <Set name="forwardedServerHeader"><Property name="jetty.httpConfig.forwardedServerHeader" default="X-Forwarded-Server"/></Set>
-        <Set name="forwardedProtoHeader"><Property name="jetty.httpConfig.forwardedProtoHeader" default="X-Forwarded-Proto"/></Set>
-        <Set name="forwardedForHeader"><Property name="jetty.httpConfig.forwardedForHeader" default="X-Forwarded-For"/></Set>
-        <Set name="forwardedHttpsHeader"><Property name="jetty.httpConfig.forwardedHttpsHeader" default="X-Proxied-Https"/></Set>
-        <Set name="forwardedSslSessionIdHeader"><Property name="jetty.httpConfig.forwardedSslSessionIdHeader" default="Proxy-ssl-id" /></Set>
-        <Set name="forwardedCipherSuiteHeader"><Property name="jetty.httpConfig.forwardedCipherSuiteHeader" default="Proxy-auth-cert"/></Set>
-      </New>
-    </Arg>
-  </Call>
-</Configure>
diff --git a/jetty_base/start.d/http.ini b/jetty_base/start.d/http.ini
deleted file mode 100644
index cda6a26..0000000
--- a/jetty_base/start.d/http.ini
+++ /dev/null
@@ -1,34 +0,0 @@
-# ---------------------------------------
-# Module: http
---module=http
-
-### HTTP Connector Configuration
-
-## Connector host/address to bind to
-# jetty.http.host=0.0.0.0
-
-## Connector port to listen on
-jetty.http.port=8080
-
-## Connector idle timeout in milliseconds
-# jetty.http.idleTimeout=30000
-
-## Connector socket linger time in seconds (-1 to disable)
-# jetty.http.soLingerTime=-1
-
-## Number of acceptors (-1 picks default based on number of cores)
-# jetty.http.acceptors=-1
-
-## Number of selectors (-1 picks default based on number of cores)
-# jetty.http.selectors=-1
-
-## ServerSocketChannel backlog (0 picks platform default)
-# jetty.http.acceptorQueueSize=0
-
-## Thread priority delta to give to acceptor threads
-# jetty.http.acceptorPriorityDelta=0
-
-## HTTP Compliance: RFC7230, RFC2616, LEGACY
-# jetty.http.compliance=RFC7230
-
-etc/jetty-http-forwarded.xml
diff --git a/jetty_base/webapps/idp.xml b/jetty_base/webapps/idp.xml
deleted file mode 100644
index dbe3671..0000000
--- a/jetty_base/webapps/idp.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Configure class="org.eclipse.jetty.webapp.WebAppContext">
-  <Set name="war">/opt/shibboleth-idp/war/idp.war</Set>
-  <Set name="contextPath">/idp</Set>
-  <Set name="extractWAR">false</Set>
-  <Set name="copyWebDir">false</Set>
-  <Set name="copyWebInf">true</Set>
-</Configure>
-- 
cgit v1.1