-
Notifications
You must be signed in to change notification settings - Fork 500
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into 4158-update-solr
- Loading branch information
Showing
265 changed files
with
9,208 additions
and
2,126 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| # See `conf/docker` for Docker images |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| #!/bin/sh | ||
| if [ ! -d dv/deps ]; then | ||
| mkdir -p dv/deps | ||
| fi | ||
| wdir=`pwd` | ||
| if [ ! -e dv/deps/glassfish4dv.tgz ]; then | ||
| echo "glassfish dependency prep" | ||
| mkdir -p /tmp/dv-prep/gf | ||
| cd /tmp/dv-prep/gf | ||
| wget http://download.java.net/glassfish/4.1/release/glassfish-4.1.zip | ||
| wget http://search.maven.org/remotecontent?filepath=org/jboss/weld/weld-osgi-bundle/2.2.10.Final/weld-osgi-bundle-2.2.10.Final-glassfish4.jar -O weld-osgi-bundle-2.2.10.Final-glassfish4.jar | ||
| unzip glassfish-4.1.zip | ||
| rm glassfish4/glassfish/modules/weld-osgi-bundle.jar | ||
| mv weld-osgi-bundle-2.2.10.Final-glassfish4.jar glassfish4/glassfish/modules | ||
| tar zcf $wdir/dv/deps/glassfish4dv.tgz glassfish4 | ||
| cd $wdir | ||
| # assuming that folks usually have /tmp auto-clean as needed | ||
| fi | ||
|
|
||
| if [ ! -e dv/deps/solr-4.6.0dv.tgz ]; then | ||
| echo "solr dependency prep" | ||
| # schema changes *should* be the only ones... | ||
| cd dv/deps/ | ||
| wget https://archive.apache.org/dist/lucene/solr/4.6.0/solr-4.6.0.tgz -O solr-4.6.0dv.tgz | ||
| cd ../../ | ||
| fi | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| #!/bin/sh | ||
|
|
||
| export LANG="en_US.UTF-8" | ||
|
|
||
| # move things necessary for integration tests into build context. | ||
| # 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/4.6.0/schema.xml testdata/ | ||
| cp ../jhove/jhove.conf testdata/ | ||
| cd ../../ | ||
| cp -r scripts conf/docker-aio/testdata/ | ||
| cp doc/sphinx-guides/source/_static/util/pg8-createsequence-prep.sql conf/docker-aio/testdata/doc/sphinx-guides/source/_static/util/ | ||
| cp doc/sphinx-guides/source/_static/util/createsequence.sql conf/docker-aio/testdata/doc/sphinx-guides/source/_static/util/ | ||
|
|
||
| # not using dvinstall.zip for setupIT.bash; but still used in install.bash for normal ops | ||
| mvn clean | ||
| ./scripts/database/homebrew/custom-build-number | ||
| mvn package | ||
| cd scripts/installer | ||
| make clean | ||
| make | ||
| cp dvinstall.zip ../../conf/docker-aio/dv/install/ | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| FROM centos:7 | ||
| # OS dependencies | ||
| RUN yum install -y java-1.8.0-openjdk-headless postgresql-server sudo epel-release unzip perl curl | ||
| RUN yum install -y jq | ||
|
|
||
| # copy and unpack dependencies (solr, glassfish) | ||
| COPY dv /tmp/dv | ||
| COPY testdata/schema.xml /tmp/dv | ||
| RUN cd /opt ; tar zxf /tmp/dv/deps/solr-4.6.0dv.tgz | ||
| RUN cd /opt ; tar zxf /tmp/dv/deps/glassfish4dv.tgz | ||
|
|
||
| RUN sudo -u postgres /usr/bin/initdb -D /var/lib/pgsql/data | ||
| #RUN sudo -u postgres createuser dvnapp | ||
|
|
||
| # copy configuration related files | ||
| RUN cp /tmp/dv/pg_hba.conf /var/lib/pgsql/data/ ; cp /tmp/dv/schema.xml /opt/solr-4.6.0/example/solr/collection1/conf/schema.xml | ||
|
|
||
| # skipping glassfish user and solr user (run both as root) | ||
|
|
||
| #solr port | ||
| EXPOSE 8983 | ||
|
|
||
| # postgres port | ||
| EXPOSE 5432 | ||
|
|
||
| # glassfish port | ||
| EXPOSE 8080 | ||
|
|
||
| RUN mkdir /opt/dv | ||
|
|
||
| # yeah - still not happy if glassfish isn't in /usr/local :< | ||
| RUN ln -s /opt/glassfish4 /usr/local/glassfish4 | ||
| COPY dv/install/ /opt/dv/ | ||
| COPY install.bash /opt/dv/ | ||
| COPY entrypoint.bash /opt/dv/ | ||
| COPY testdata /opt/dv/testdata | ||
| COPY testscripts/* /opt/dv/testdata/ | ||
| COPY setupIT.bash /opt/dv | ||
| WORKDIR /opt/dv | ||
| CMD ["/opt/dv/entrypoint.bash"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| HOST_DNS_ADDRESS localhost | ||
| GLASSFISH_DIRECTORY /opt/glassfish4 | ||
| ADMIN_EMAIL | ||
| MAIL_SERVER mail.hmdc.harvard.edu | ||
| POSTGRES_ADMIN_PASSWORD secret | ||
| POSTGRES_SERVER db | ||
| POSTGRES_PORT 5432 | ||
| POSTGRES_DATABASE dvndb | ||
| POSTGRES_USER dvnapp | ||
| POSTGRES_PASSWORD secret | ||
| SOLR_LOCATION idx | ||
| TWORAVENS_LOCATION NOT INSTALLED | ||
| RSERVE_HOST localhost | ||
| RSERVE_PORT 6311 | ||
| RSERVE_USER rserve | ||
| RSERVE_PASSWORD rserve |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| HOST_DNS_ADDRESS localhost | ||
| GLASSFISH_DIRECTORY /opt/glassfish4 | ||
| ADMIN_EMAIL | ||
| MAIL_SERVER mail.hmdc.harvard.edu | ||
| POSTGRES_ADMIN_PASSWORD secret | ||
| POSTGRES_SERVER db | ||
| POSTGRES_PORT 5432 | ||
| POSTGRES_DATABASE dvndb | ||
| POSTGRES_USER dvnapp | ||
| POSTGRES_PASSWORD secret | ||
| SOLR_LOCATION idx | ||
| TWORAVENS_LOCATION NOT INSTALLED | ||
| RSERVE_HOST localhost | ||
| RSERVE_PORT 6311 | ||
| RSERVE_USER rserve | ||
| RSERVE_PASSWORD rserve |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| # PostgreSQL Client Authentication Configuration File | ||
| # =================================================== | ||
| # | ||
| # Refer to the "Client Authentication" section in the PostgreSQL | ||
| # documentation for a complete description of this file. A short | ||
| # synopsis follows. | ||
| # | ||
| # This file controls: which hosts are allowed to connect, how clients | ||
| # are authenticated, which PostgreSQL user names they can use, which | ||
| # databases they can access. Records take one of these forms: | ||
| # | ||
| # local DATABASE USER METHOD [OPTIONS] | ||
| # host DATABASE USER ADDRESS METHOD [OPTIONS] | ||
| # hostssl DATABASE USER ADDRESS METHOD [OPTIONS] | ||
| # hostnossl DATABASE USER ADDRESS METHOD [OPTIONS] | ||
| # | ||
| # (The uppercase items must be replaced by actual values.) | ||
| # | ||
| # The first field is the connection type: "local" is a Unix-domain | ||
| # socket, "host" is either a plain or SSL-encrypted TCP/IP socket, | ||
| # "hostssl" is an SSL-encrypted TCP/IP socket, and "hostnossl" is a | ||
| # plain TCP/IP socket. | ||
| # | ||
| # DATABASE can be "all", "sameuser", "samerole", "replication", a | ||
| # database name, or a comma-separated list thereof. The "all" | ||
| # keyword does not match "replication". Access to replication | ||
| # must be enabled in a separate record (see example below). | ||
| # | ||
| # USER can be "all", a user name, a group name prefixed with "+", or a | ||
| # comma-separated list thereof. In both the DATABASE and USER fields | ||
| # you can also write a file name prefixed with "@" to include names | ||
| # from a separate file. | ||
| # | ||
| # ADDRESS specifies the set of hosts the record matches. It can be a | ||
| # host name, or it is made up of an IP address and a CIDR mask that is | ||
| # an integer (between 0 and 32 (IPv4) or 128 (IPv6) inclusive) that | ||
| # specifies the number of significant bits in the mask. A host name | ||
| # that starts with a dot (.) matches a suffix of the actual host name. | ||
| # Alternatively, you can write an IP address and netmask in separate | ||
| # columns to specify the set of hosts. Instead of a CIDR-address, you | ||
| # can write "samehost" to match any of the server's own IP addresses, | ||
| # or "samenet" to match any address in any subnet that the server is | ||
| # directly connected to. | ||
| # | ||
| # METHOD can be "trust", "reject", "md5", "password", "gss", "sspi", | ||
| # "krb5", "ident", "peer", "pam", "ldap", "radius" or "cert". Note that | ||
| # "password" sends passwords in clear text; "md5" is preferred since | ||
| # it sends encrypted passwords. | ||
| # | ||
| # OPTIONS are a set of options for the authentication in the format | ||
| # NAME=VALUE. The available options depend on the different | ||
| # authentication methods -- refer to the "Client Authentication" | ||
| # section in the documentation for a list of which options are | ||
| # available for which authentication methods. | ||
| # | ||
| # Database and user names containing spaces, commas, quotes and other | ||
| # special characters must be quoted. Quoting one of the keywords | ||
| # "all", "sameuser", "samerole" or "replication" makes the name lose | ||
| # its special character, and just match a database or username with | ||
| # that name. | ||
| # | ||
| # This file is read on server startup and when the postmaster receives | ||
| # a SIGHUP signal. If you edit the file on a running system, you have | ||
| # to SIGHUP the postmaster for the changes to take effect. You can | ||
| # use "pg_ctl reload" to do that. | ||
|
|
||
| # Put your actual configuration here | ||
| # ---------------------------------- | ||
| # | ||
| # If you want to allow non-local connections, you need to add more | ||
| # "host" records. In that case you will also need to make PostgreSQL | ||
| # listen on a non-local interface via the listen_addresses | ||
| # configuration parameter, or via the -i or -h command line switches. | ||
|
|
||
|
|
||
|
|
||
| # TYPE DATABASE USER ADDRESS METHOD | ||
|
|
||
| # "local" is for Unix domain socket connections only | ||
| #local all all peer | ||
| local all all trust | ||
| # IPv4 local connections: | ||
| #host all all 127.0.0.1/32 trust | ||
| host all all 0.0.0.0/0 trust | ||
| # IPv6 local connections: | ||
| host all all ::1/128 trust | ||
| # Allow replication connections from localhost, by a user with the | ||
| # replication privilege. | ||
| #local replication postgres peer | ||
| #host replication postgres 127.0.0.1/32 ident | ||
| #host replication postgres ::1/128 ident |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| sudo -u postgres /usr/bin/postgres -D /var/lib/pgsql/data & | ||
| cd /opt/solr-4.6.0/example/ | ||
| java -DSTOP.PORT=8079 -DSTOP.KEY=a09df7a0d -jar start.jar & | ||
|
|
||
| cd /opt/glassfish4 | ||
| bin/asadmin start-domain | ||
| sleep infinity | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| #!/usr/bin/env bash | ||
| sudo -u postgres createuser --superuser dvnapp | ||
| #./entrypoint.bash & | ||
| unzip dvinstall.zip | ||
| cd dvinstall/ | ||
| ./install -admin_email=pameyer+dvinstall@crystal.harvard.edu -y -f > install.out 2> install.err | ||
|
|
||
| echo "installer complete" | ||
| cat install.err |
Oops, something went wrong.