diff options
| -rwxr-xr-x[-rw-r--r--] | src/installer/resources/build.xml | 34 | ||||
| -rw-r--r-- | src/installer/resources/install.properties | 2 | ||||
| -rw-r--r-- | src/installer/resources/logging.xml | 22 | ||||
| -rw-r--r-- | src/installer/resources/wayfconfig.xml | 77 |
4 files changed, 36 insertions, 99 deletions
diff --git a/src/installer/resources/build.xml b/src/installer/resources/build.xml index b4201d8..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 Discovery 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 index 4b9d0de..c37d1c1 100644 --- a/src/installer/resources/install.properties +++ b/src/installer/resources/install.properties @@ -1 +1 @@ -ds.home = /opt/shibboleth-ds
\ No newline at end of file +ds.home = /etc/DiscoveryService
\ No newline at end of file diff --git a/src/installer/resources/logging.xml b/src/installer/resources/logging.xml index 3e01593..5a6fc6e 100644 --- a/src/installer/resources/logging.xml +++ b/src/installer/resources/logging.xml @@ -7,22 +7,22 @@ --> <appender name="DS_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender"> <File>$DS_HOME$/logs/discoveryService.log</File> + <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> - <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> - <charset>UTF-8</charset> - <Pattern>%date{HH:mm:ss.SSS} - %level [%logger:%line] - %msg%n%ex{full}%n</Pattern> - </encoder> + <layout class="ch.qos.logback.classic.PatternLayout"> + <Pattern>%date{HH:mm:ss.SSS} %level [%logger] %msg%n%ex{full}%n</Pattern> + </layout> </appender> <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> - <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> - <charset>UTF-8</charset> - <Pattern>%date{HH:mm:ss.SSS} - %level [%logger:%line] - %msg%n%ex{full}%n</Pattern> - </encoder> + <ImmediateFlush>true</ImmediateFlush> + <layout class="ch.qos.logback.classic.PatternLayout"> + <Pattern>%date{HH:mm:ss.SSS} %level [%logger] %msg%n%ex{full}%n</Pattern> + </layout> </appender> <!-- @@ -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 7a65e7d..1df1e07 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 note 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,16 +60,16 @@ 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="Federation Name" identifier="FirstSite" url="file://$DS_HOME$/metadata/sites.xml"/> -<!-- If the DS is to handle data from more than one metadata source +<!-- If the WAYF is to handle data from more than one metadata source then more metadataproviders can be provided, as below <MetadataProvider @@ -85,36 +77,8 @@ identifier="SecondSite" backingFile="$DS_HOME$/metadata/ukfed_store.xml" url="http://metadata.ukfederation.org.uk/ukfederation-metadata.xml"/> - - White and black list providers are defined as filters inside a provider: - - <MetadataProvider - - displayName="WhiteListed Metadata" - identifier="White" - type="edu.internet2.middleware.shibboleth.metadata.provider.XMLMetadata" - backingFile="$DS_HOME$/metadata/whitelist_store.xml" - url="http://metadata.ukfederation.org.uk/ukfederation-test.xml"> - - <Filter identifier="false" - type="edu.internet2.middleware.shibboleth.wayf.plugins.provider.ListFilter" - excludeEntries="true"> - <EntityId>https://idp.edina.ac.uk/shibboleth</EntityId> - <EntityId>https://dlib-adidp.ucs.ed.ac.uk/shibboleth</EntityId> - <EntityId>https://idp.edina.ac.uk/shibboleth-devel</EntityId> - <EntityId>https://idp.edina.ac.uk/shibboleth-devel-13</EntityId> - </Filter> - </MetadataProvider> - - NOTE that the resulting metadata has to include any SP which may need service from - this DS. - - For a black list, set excludeEntries="true" (the listed Entities will be excluded), for - a while list, set it to "false" (the listed entries will be included). - --> - <!-- Plugins are extensible, the identifier is required, as is the type, the rest is for the plugin to define --> @@ -147,8 +111,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. @@ -164,10 +128,10 @@ <PluginInstance identifier="CookiePlugin"/> <!-- <PluginInstance identifier="AddressHint"/> --> - </DiscoveryServiceHandler> - - <!-- The ClearCache handler causes the cookie to be deleted. The jsp shipped - with the DS refers to this handler --> + </DiscoveryServiceHandler> + +<!-- The ClearCache handler causes the cookie to be deleted. The jsp shipped + with the WAYF refers to this handler --> <DiscoveryServiceHandler location=".+/ClearCache.wayf"> @@ -185,17 +149,4 @@ </DiscoveryServiceHandler> --> -<!-- The Javascript handler downloads javascript arrays with the IdPs and the cookies --> - <DiscoveryServiceHandler - location=".+/js.wayf" - provideList="true" - provideListOfList="false" - default="false" - jspFile="/javascript.jsp"> - <Federation identifier="FirstSite"/> - <PluginInstance identifier="CookiePlugin"/> - </DiscoveryServiceHandler> - - - </WayfConfig> |