[java-idp-plugin-duo] 01/04: Remove properties and config files from distribution

[Phil Smart]

This is an automated email from the git hooks/post-receive script.

philsmart pushed a commit to branch master
in repository java-idp-plugin-duo.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-duo.git;a=commit;h=bcd3f7b56ce554868b08f5ab81764c55d0aed61b

commit bcd3f7b56ce554868b08f5ab81764c55d0aed61b
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Tue Jul 28 13:44:09 2020 +0100

    Remove properties and config files from distribution
    
    Hook into existing Duo properties and config files to simplify
    migration.
    
    See https://issues.shibboleth.net/jira/browse/JDUO-8
---
 .../src/main/assembly/duo-bare-assembly.xml                 |  3 +--
 .../src/main/assembly/duo-native-sdk-assembly.xml           |  3 +--
 .../src/main/resources/conf/authn/duo-oidc-authn-config.xml | 13 -------------
 .../src/main/resources/conf/authn/idp-duo-oidc.properties   |  5 -----
 4 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/idp-duo-distribution/src/main/assembly/duo-bare-assembly.xml b/idp-duo-distribution/src/main/assembly/duo-bare-assembly.xml
index d8129fc..0b956d2 100644
--- a/idp-duo-distribution/src/main/assembly/duo-bare-assembly.xml
+++ b/idp-duo-distribution/src/main/assembly/duo-bare-assembly.xml
@@ -43,8 +43,7 @@
             <directory>src/main/resources/</directory>
             <outputDirectory></outputDirectory>
             <includes>
-                <include>conf/*</include>
-                <include>conf/authn/*</include>                
+                <include>conf/*</include>              
             </includes>
         </fileSet>
     </fileSets>
diff --git a/idp-duo-distribution/src/main/assembly/duo-native-sdk-assembly.xml b/idp-duo-distribution/src/main/assembly/duo-native-sdk-assembly.xml
index b1b9843..8f040cc 100644
--- a/idp-duo-distribution/src/main/assembly/duo-native-sdk-assembly.xml
+++ b/idp-duo-distribution/src/main/assembly/duo-native-sdk-assembly.xml
@@ -69,8 +69,7 @@
             <directory>src/main/resources/</directory>
             <outputDirectory></outputDirectory>
             <includes>
-                <include>conf/*</include>
-                <include>conf/authn/*</include>                
+                <include>conf/*</include>               
             </includes>
         </fileSet>
     </fileSets>
diff --git a/idp-duo-distribution/src/main/resources/conf/authn/duo-oidc-authn-config.xml b/idp-duo-distribution/src/main/resources/conf/authn/duo-oidc-authn-config.xml
deleted file mode 100644
index f7e9f4a..0000000
--- a/idp-duo-distribution/src/main/resources/conf/authn/duo-oidc-authn-config.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context"
-    xmlns:util="http://www.springframework.org/schema/util" xmlns:p="http://www.springframework.org/schema/p" xmlns:c="http://www.springframework.org/schema/c"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-
-    default-init-method="initialize" default-destroy-method="destroy">
-
-
-
-</beans>
diff --git a/idp-duo-distribution/src/main/resources/conf/authn/idp-duo-oidc.properties b/idp-duo-distribution/src/main/resources/conf/authn/idp-duo-oidc.properties
deleted file mode 100644
index bd66221..0000000
--- a/idp-duo-distribution/src/main/resources/conf/authn/idp-duo-oidc.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-## Duo OIDC 2FA integration settings
-idp.duo.oidc.apiHost = hostname
-idp.duo.oidc.clientId = clientID
-idp.duo.oidc.secretKey = key
-idp.duo.oidc.redirectUri = redirect
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.