diff options
Diffstat (limited to 'src/installer')
| -rw-r--r-- | src/installer/lib/ant-extensions-13Apr2008.jar | bin | 21017 -> 0 bytes | |||
| -rw-r--r-- | src/installer/lib/bcprov-jdk15-1.43.jar | bin | 1632822 -> 0 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | src/installer/resources/build.xml | 34 | ||||
| -rw-r--r-- | src/installer/resources/install.properties | 1 | ||||
| -rw-r--r-- | src/installer/resources/logging.xml | 6 | ||||
| -rw-r--r-- | src/installer/resources/wayfconfig.xml | 35 |
6 files changed, 31 insertions, 45 deletions
diff --git a/src/installer/lib/ant-extensions-13Apr2008.jar b/src/installer/lib/ant-extensions-13Apr2008.jar Binary files differdeleted file mode 100644 index 8694196..0000000 --- a/src/installer/lib/ant-extensions-13Apr2008.jar +++ /dev/null diff --git a/src/installer/lib/bcprov-jdk15-1.43.jar b/src/installer/lib/bcprov-jdk15-1.43.jar Binary files differdeleted file mode 100644 index f7bf116..0000000 --- a/src/installer/lib/bcprov-jdk15-1.43.jar +++ /dev/null diff --git a/src/installer/resources/build.xml b/src/installer/resources/build.xml index ba7a5cd..ae85dfa 100644..100755 --- a/src/installer/resources/build.xml +++ b/src/installer/resources/build.xml @@ -10,37 +10,23 @@ <!-- Load ant-contrib tasks --> <taskdef resource="net/sf/antcontrib/antlib.xml" /> - - <!-- Load Internet2 ant extensions --> - <taskdef resource="edu/internet2/middleware/ant/antlib.xml" /> <!-- install - for deployment --> <target name="install" description="Creates the discovery service home directory, install configuration files, and create the service's WAR."> - <input message="Where should the Shibboleth Discovert Service software be installed?" - addproperty="ds.home.input" - defaultvalue="${ds.home}" /> - <var name="ds.home" value="${ds.home.input}" /> - - <pathToAbsolutePath path="${ds.home}" addproperty="ds.home.path" /> - <pathToUrl path="${ds.home}" addproperty="ds.home.url" /> - - <if> - <available file="${ds.home.path}" property="ds.home.exists"/> - <then> - <input message="The directory '${ds.home.path}' already exists. Would you like to overwrite your existing configuration?" - addproperty="install.config" - validargs="yes,no" - defaultvalue="no" /> - </then> - <else> - <var name="install.config" value="yes"/> - </else> - </if> + <input message="Is this a new installation? Answering 'yes' will overwrite your current configuration." + addproperty="new.install" + validargs="yes,no" + defaultvalue="no" /> <if> - <equals arg1="${install.config}" arg2="yes" /> + <equals arg1="${new.install}" arg2="yes" /> <then> + <input message="Where should the Shibboleth Discovert Service software be installed?" + addproperty="ds.home.input" + defaultvalue="${ds.home}" /> + <var name="ds.home" value="${ds.home.input}" /> + <propertyfile file="${resources.dir}/install.properties"> <entry key="ds.home" value="${ds.home}" /> </propertyfile> diff --git a/src/installer/resources/install.properties b/src/installer/resources/install.properties new file mode 100644 index 0000000..28cbcf0 --- /dev/null +++ b/src/installer/resources/install.properties @@ -0,0 +1 @@ +ds.home = /opt/shibboleth-ds diff --git a/src/installer/resources/logging.xml b/src/installer/resources/logging.xml index 77fefd6..5a6fc6e 100644 --- a/src/installer/resources/logging.xml +++ b/src/installer/resources/logging.xml @@ -10,7 +10,7 @@ <ImmediateFlush>true</ImmediateFlush> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> - <FileNamePattern>$DS_HOME$/logs/discovery-%d{yyyy-MM-dd}.log</FileNamePattern> + <FileNamePattern>$DS_HOME$/etc/DiscoveryService/logs/discovery-%d{yyyy-MM-dd}.log</FileNamePattern> </rollingPolicy> <layout class="ch.qos.logback.classic.PatternLayout"> @@ -30,13 +30,13 @@ Levels: ALL, ERROR, WARN, INFO, DEBUG, OFF --> - <!-- Logs DS, but not OpenSAML, messages --> + <!-- Logs IdP, but not OpenSAML, messages --> <logger name="edu.internet2.middleware.shibboleth"> <level value="WARN" /> <!-- Appender, DS_LOG, is inherited from the root logger --> </logger> - <!-- Logs OpenSAML, but not DS, messages --> + <!-- Logs OpenSAML, but not IdP, messages --> <logger name="org.opensaml"> <level value="INFO" /> <!-- Appender, DS_LOG, is inherited from the root logger --> diff --git a/src/installer/resources/wayfconfig.xml b/src/installer/resources/wayfconfig.xml index 9ebdd12..456647e 100644 --- a/src/installer/resources/wayfconfig.xml +++ b/src/installer/resources/wayfconfig.xml @@ -18,12 +18,11 @@ The jspFile & errorJspFile attributes control the display The provideList attribute controls whether a single list of all - possible IdPs is presented. This also controls whether the - Quick search dialog is presented. + possible IdPs is presented. The default wayf.jsp works best + if this is true when provideListofList is true. The provideListOfList attribute controls whether multiple lists - are presented (one for each MetadataProvider). Rather than all - the entities as one. + are presented (one for each MetadataProvider). The showUsableIdPs attribute controls the contents of the above lists. The single list (provideList=true) is trimmed by @@ -33,20 +32,13 @@ The SearchIgnore element contains a list of words to be ignored while performing a search. - - warnOnBadBinding describes what to do iof the metadata has a badly - formed <DiscoveryResponse> false (or not present) means that the bad - SP is removed from the metadata and an error written to the log file. - True means that we just noter this in the log file. - THIS SETTING IS SYSTEM WIDE ONLY. --> <Default jspFile="wayf.jsp" errorJspFile="wayferror.jsp" - provideList="true" - provideListOfList="false" - warnOnBadBinding="false" + provideList="false" + provideListOfList="true" showUnusableIdPs="false"> <SearchIgnore> <IgnoreText>Institution</IgnoreText> @@ -68,14 +60,18 @@ be used if the DS cannot get hold of the 'real' data. NOTE - for windows installation with an explicit DOS device ("C:\etc\discoveryservice") - The url below should be "file://C:\program files/metadata/sites.xml + The url below should be "file:///$DS_HOME$/metadata/sites.xml --> <MetadataProvider displayName="SWAMID" identifier="SWAMID-1.0" - url="http://wayf.swamid.se/md/swamid-1.0.xml" + url="http://md.swamid.se/md/swamid-1.0.xml" backingFile="/opt/shibboleth-ds/metadata/swamid-1.0.xml"/> + <MetadataProvider displayName="SWAMID2" identifier="SWAMID-2.0" + url="http://md.swamid.se/md/swamid-2.0.xml" + backingFile="/opt/shibboleth-ds/metadata/swamid-2.0.xml"/> + <!-- If the WAYF is to handle data from more than one metadata source then more metadataproviders can be provided, as below @@ -118,8 +114,8 @@ element. As well as the attributes and elements described above, each DiscoveryServiceHandler *MUST* have a location attribute. - The default wayf.xml specifies that "/WAYF", "/DS" and "/*.wayf" - are the possibilities for DiscoveryServices. If a URL matches the above, + The default wayf.xml specifies that "/WAYF" and "/*.wayf" are the + possibilities for DiscoveryServices. If a URL matches the above, but does not match any location in a DiscoveryServiceHandler, then the first handler for which the default attribute is set true is invoked. @@ -157,7 +153,6 @@ provideListOfList="false" default="false" jspFile="/javascript.jsp"> - <Federation identifier="SWAMID-1.0"/> <PluginInstance identifier="CookiePlugin"/> </DiscoveryServiceHandler> @@ -185,4 +180,8 @@ <PluginInstance identifier="CookiePlugin"/> </DiscoveryServiceHandler> + <DiscoveryServiceHandler location="https://idp-test.nordu.net(:[0-9]+)?/.+/(DS|WAYF)/?" jspFile="wayf-ndn.jsp" errorJspFile="wayferror-ndn.jsp"> + <PluginInstance identifier="CookiePlugin"/> + </DiscoveryServiceHandler> + </WayfConfig> |