Merge pull request #5561 from IQSS/develop

v4.11
IQSS · Feb 19, 2019 · 30ee2f1 · 30ee2f1
2 parents 1a12cda + 3721306
commit 30ee2f1
Show file tree

Hide file tree

Showing 173 changed files with 5,353 additions and 1,411 deletions.
diff --git a/.gitignore b/.gitignore
@@ -48,3 +48,4 @@ scripts/installer/default.config
 # do not track IntelliJ IDEA files
 .idea
 **/*.iml
+/bin/
diff --git a/conf/docker-aio/0prep_deps.sh b/conf/docker-aio/0prep_deps.sh
@@ -17,11 +17,12 @@ if [ ! -e dv/deps/glassfish4dv.tgz ]; then
 	# assuming that folks usually have /tmp auto-clean as needed
 fi
 
-if [ ! -e dv/deps/solr-7.3.0dv.tgz ]; then
+if [ ! -e dv/deps/solr-7.3.1dv.tgz ]; then
 	echo "solr dependency prep"
 	# schema changes *should* be the only ones...
 	cd dv/deps/
-	wget https://archive.apache.org/dist/lucene/solr/7.3.0/solr-7.3.0.tgz -O solr-7.3.0dv.tgz
+	#wget https://archive.apache.org/dist/lucene/solr/7.3.0/solr-7.3.0.tgz -O solr-7.3.0dv.tgz
+	wget https://archive.apache.org/dist/lucene/solr/7.3.1/solr-7.3.1.tgz -O solr-7.3.1dv.tgz
 	cd ../../
 fi
 
diff --git a/conf/docker-aio/1prep.sh b/conf/docker-aio/1prep.sh
@@ -4,8 +4,8 @@
 # this was based off the phoenix deployment; and is likely uglier and bulkier than necessary in a perfect world
 
 mkdir -p testdata/doc/sphinx-guides/source/_static/util/
-cp ../solr/7.3.0/schema.xml testdata/
-cp ../solr/7.3.0/solrconfig.xml testdata/
+cp ../solr/7.3.1/schema.xml testdata/
+cp ../solr/7.3.1/solrconfig.xml testdata/
 cp ../jhove/jhove.conf testdata/
 cp ../jhove/jhoveConfig.xsd testdata/
 cd ../../

diff --git a/conf/docker-aio/c7.dockerfile b/conf/docker-aio/c7.dockerfile
@@ -13,7 +13,7 @@ COPY testdata/solrconfig.xml /tmp/dv
 COPY disableipv6.conf /etc/sysctl.d/
 RUN rm /etc/httpd/conf/*
 COPY httpd.conf /etc/httpd/conf 
-RUN cd /opt ; tar zxf /tmp/dv/deps/solr-7.3.0dv.tgz 
+RUN cd /opt ; tar zxf /tmp/dv/deps/solr-7.3.1dv.tgz 
 RUN cd /opt ; tar zxf /tmp/dv/deps/glassfish4dv.tgz
 
 # this copy of domain.xml is the result of running `asadmin set server.monitoring-service.module-monitoring-levels.jvm=LOW` on a default glassfish installation (aka - enable the glassfish REST monitir endpoint for the jvm`
@@ -24,9 +24,9 @@ RUN sudo -u postgres /usr/pgsql-9.6/bin/initdb -D /var/lib/pgsql/data
 
 # copy configuration related files
 RUN cp /tmp/dv/pg_hba.conf /var/lib/pgsql/data/
-RUN cp -r /opt/solr-7.3.0/server/solr/configsets/_default /opt/solr-7.3.0/server/solr/collection1
-RUN cp /tmp/dv/schema.xml /opt/solr-7.3.0/server/solr/collection1/conf/schema.xml
-RUN cp /tmp/dv/solrconfig.xml /opt/solr-7.3.0/server/solr/collection1/conf/solrconfig.xml
+RUN cp -r /opt/solr-7.3.1/server/solr/configsets/_default /opt/solr-7.3.1/server/solr/collection1
+RUN cp /tmp/dv/schema.xml /opt/solr-7.3.1/server/solr/collection1/conf/schema.xml
+RUN cp /tmp/dv/solrconfig.xml /opt/solr-7.3.1/server/solr/collection1/conf/solrconfig.xml
 
 # skipping glassfish user and solr user (run both as root)
 
@@ -60,7 +60,8 @@ WORKDIR /opt/dv
 
 # need to take DOI provider info from build args as of ec377d2a4e27424db8815c55ce544deee48fc5e0
 # Default to EZID; use built-args to switch to DataCite (or potentially handles)
-ARG DoiProvider=EZID
+#ARG DoiProvider=EZID
+ARG DoiProvider=FAKE
 ARG doi_baseurl=https://ezid.cdlib.org
 ARG doi_username=apitest
 ARG doi_password=apitest

diff --git a/conf/docker-aio/entrypoint.bash b/conf/docker-aio/entrypoint.bash
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
-
+export LANG=en_US.UTF-8
 #sudo -u postgres /usr/bin/postgres -D /var/lib/pgsql/data &
 sudo -u postgres /usr/pgsql-9.6/bin/postgres -D /var/lib/pgsql/data &
-cd /opt/solr-7.3.0/
+cd /opt/solr-7.3.1/
 # TODO: Run Solr as non-root and remove "-force".
 bin/solr start -force
 bin/solr create_core -c collection1 -d server/solr/collection1/conf -force

diff --git a/conf/solr/7.3.0/readme.me → conf/solr/7.3.1/readme.md b/conf/solr/7.3.0/readme.me → conf/solr/7.3.1/readme.md
diff --git a/conf/solr/7.3.0/schema.xml → conf/solr/7.3.1/schema.xml b/conf/solr/7.3.0/schema.xml → conf/solr/7.3.1/schema.xml
diff --git a/conf/solr/7.3.0/solrconfig.xml → conf/solr/7.3.1/solrconfig.xml b/conf/solr/7.3.0/solrconfig.xml → conf/solr/7.3.1/solrconfig.xml
diff --git a/doc/release-notes/4660-custom-analytics-config.md b/doc/release-notes/4660-custom-analytics-config.md
@@ -0,0 +1 @@
+Update your Google and Piwik analytics configurations: Remove the deprecated `:GoogleAnalyticsCode`, `:PiwikAnalyticsId`, `:PiwikAnalyticsHost`, `:PiwikAnalyticsTrackerFileName` settings, and use `:WebAnalyticsCode`. The new setting works like the custom HTML files for branding, which allows for more control of your analytics, making it easier to customize what you prefer to track. See [Installation Guide > Configuration > Web Analytics Code](http://guides.dataverse.org/en/latest/installation/config.html#web-analytics-code) for details.
diff --git a/doc/sphinx-guides/source/_static/installation/files/etc/init.d/solr b/doc/sphinx-guides/source/_static/installation/files/etc/init.d/solr
@@ -5,7 +5,7 @@
 # chkconfig: 35 92 08
 # description: Starts and stops Apache Solr
 
-SOLR_DIR="/usr/local/solr/solr-7.3.0"
+SOLR_DIR="/usr/local/solr/solr-7.3.1"
 SOLR_COMMAND="bin/solr"
 SOLR_ARGS="-m 1g"
 SOLR_USER=solr

diff --git a/doc/sphinx-guides/source/_static/installation/files/etc/shibboleth/attribute-map_adfs.xml b/doc/sphinx-guides/source/_static/installation/files/etc/shibboleth/attribute-map_adfs.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<Attributes xmlns="urn:mace:shibboleth:2.0:attribute-map" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <!-- example of ADFS 3.0 attribute mapping -->
+  <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" id="eppn">
+    <AttributeDecoder xsi:type="ScopedAttributeDecoder"/>
+  </Attribute>
+  <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" id="affiliation">
+    <AttributeDecoder xsi:type="ScopedAttributeDecoder" caseSensitive="false"/>
+  </Attribute>
+  <Attribute name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" id="affiliation">
+    <AttributeDecoder xsi:type="ScopedAttributeDecoder" caseSensitive="false"/>
+  </Attribute>
+  <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" id="unscoped-affiliation">
+    <AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
+  </Attribute>
+  <Attribute name="urn:mace:dir:attribute-def:eduPersonAffiliation" id="unscoped-affiliation">
+    <AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
+  </Attribute>
+  <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" id="entitlement"/>
+  <Attribute name="urn:mace:dir:attribute-def:eduPersonEntitlement" id="entitlement"/>
+  <Attribute name="urn:mace:dir:attribute-def:eduPersonTargetedID" id="targeted-id">
+    <AttributeDecoder xsi:type="ScopedAttributeDecoder"/>
+  </Attribute>
+  <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" id="persistent-id">
+    <AttributeDecoder xsi:type="NameIDAttributeDecoder" formatter="$NameQualifier!$SPNameQualifier!$Name" defaultQualifiers="true"/>
+  </Attribute>
+  <Attribute name="urn:oasis:names:tc:SAML:2.0:nameid-format:persistent" id="persistent-id">
+    <AttributeDecoder xsi:type="NameIDAttributeDecoder" formatter="$NameQualifier!$SPNameQualifier!$Name" defaultQualifiers="true"/>
+  </Attribute>
+  <Attribute name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified" id="givenName"/>
+  <Attribute name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified" id="mail"/>
+  <Attribute name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname" nameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified" id="sn"/>
+</Attributes>
diff --git a/doc/sphinx-guides/source/_static/installation/files/etc/shibboleth/shibboleth2_adfs.xml b/doc/sphinx-guides/source/_static/installation/files/etc/shibboleth/shibboleth2_adfs.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0"?>
+<!--
+example shibboleth2.xml for ADFS 3.0
+
+- attribute-map_adfs.xml
+-->
+<SPConfig xmlns="urn:mace:shibboleth:3.0:native:sp:config" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" clockSkew="1800">
+  <!-- adfs libraries for shibboleth and apache -->
+  <OutOfProcess>
+    <Extensions>
+      <Library path="adfs.so" fatal="true"/>
+    </Extensions>
+  </OutOfProcess>
+  <InProcess>
+    <Extensions>
+      <Library path="adfs-lite.so" fatal="true"/>
+    </Extensions>
+  </InProcess>
+  <!-- FIXME: change the entityID to your hostname. -->
+  <ApplicationDefaults entityID="https://dataverse.example.edu/Shibboleth.sso/SAML2/POST" REMOTE_USER="eppn" attributePrefix="AJP_">
+    <Sessions lifetime="28800" timeout="3600" checkAddress="false" relayState="ss:mem" handlerSSL="true" cookieProps="; path=/; secure; HttpOnly">
+      <SSO>
+	      SAML2 SAML1
+	    </SSO>
+      <Logout>SAML2 Local</Logout>
+      <Handler type="MetadataGenerator" Location="/Metadata" signing="false"/>
+      <Handler type="Status" Location="/Status" acl="127.0.0.1"/>
+      <Handler type="Session" Location="/Session" showAttributeValues="true"/>
+      <Handler type="DiscoveryFeed" Location="/DiscoFeed"/>
+    </Sessions>
+    <!-- Error pages to display to yourself if something goes horribly wrong. -->
+    <Errors supportContact="root@localhost" logoLocation="/shibboleth-sp/logo.jpg" styleSheet="/shibboleth-sp/main.css"/>
+    <!-- TODO - set IdPs here -->
+    <MetadataProvider type="XML" path="dataverse-idp-metadata.xml" backingFilePath="local-idp-metadata.xml" legacyOrgNames="true" reloadInterval="7200"/>
+    <!-- Attribute and trust options you shouldn't need to change. -->
+    <AttributeExtractor type="XML" validate="true" path="attribute-map.xml"/>
+    <AttributeResolver type="Query" subjectMatch="true"/>
+    <AttributeFilter type="XML" validate="true" path="attribute-policy.xml"/>
+    <!-- Your SP generated these credentials.  They're used to talk to IdP's. -->
+    <CredentialResolver type="File" key="sp-key.pem" certificate="sp-cert.pem"/>
+  </ApplicationDefaults>
+  <!-- Security policies you shouldn't change unless you know what you're doing. -->
+  <SecurityPolicyProvider type="XML" validate="true" path="security-policy.xml"/>
+  <!-- Low-level configuration about protocols and bindings available for use. -->
+  <ProtocolProvider type="XML" validate="true" reloadChanges="false" path="protocols.xml"/>
+</SPConfig>
diff --git a/doc/sphinx-guides/source/_static/installation/files/etc/systemd/solr.service b/doc/sphinx-guides/source/_static/installation/files/etc/systemd/solr.service
@@ -5,9 +5,9 @@ After = syslog.target network.target remote-fs.target nss-lookup.target
 [Service]
 User = solr
 Type = forking
-WorkingDirectory = /usr/local/solr/solr-7.3.0
-ExecStart = /usr/local/solr/solr-7.3.0/bin/solr start -m 1g
-ExecStop = /usr/local/solr/solr-7.3.0/bin/solr stop
+WorkingDirectory = /usr/local/solr/solr-7.3.1
+ExecStart = /usr/local/solr/solr-7.3.1/bin/solr start -m 1g
+ExecStop = /usr/local/solr/solr-7.3.1/bin/solr stop
 LimitNOFILE=65000
 Restart=on-failure
 

diff --git a/doc/sphinx-guides/source/_static/installation/files/root/external-tools/awesomeTool.json b/doc/sphinx-guides/source/_static/installation/files/root/external-tools/awesomeTool.json
@@ -2,6 +2,7 @@
   "displayName": "Awesome Tool",
   "description": "The most awesome tool.",
   "type": "explore",
+  "contentType": "text/tab-separated-values",
   "toolUrl": "https://awesometool.com",
   "toolParameters": {
     "queryParameters": [