forked from IQSS/dataverse
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #18 from TIK-NFL/update_v5.5
Merged update_v5.5 branch into staging
- Loading branch information
Showing
650 changed files
with
33,126 additions
and
22,789 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| name: "Guides Build Status" | ||
| on: | ||
| pull_request: | ||
| paths: | ||
| - 'doc/sphinx-guides/**/*.rst' | ||
|
|
||
| jobs: | ||
| docs: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - uses: ammaraskar/sphinx-action@master | ||
| with: | ||
| docs-folder: "doc/sphinx-guides/" |
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 |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| language: java | ||
| jdk: | ||
| - openjdk8 | ||
| - openjdk11 | ||
| script: mvn -DcompilerArgument=-Xlint:unchecked test -P all-unit-tests | ||
| after_success: mvn jacoco:report coveralls:report |
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 |
|---|---|---|
| @@ -1 +1 @@ | ||
| # See `conf/docker` for Docker images | ||
| # See http://guides.dataverse.org/en/latest/developers/containers.html |
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 |
|---|---|---|
| @@ -1,77 +1,27 @@ | ||
| # -*- mode: ruby -*- | ||
| # vi: set ft=ruby : | ||
|
|
||
| # Vagrantfile API/syntax version. Don't touch unless you know what you're doing! | ||
| VAGRANTFILE_API_VERSION = "2" | ||
|
|
||
| Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| | ||
| config.vm.box = "bento/centos-8.2" | ||
|
|
||
| config.vm.define "standalone", primary: true do |standalone| | ||
| config.vm.hostname = "standalone" | ||
| # Uncomment this temporarily to get `vagrant destroy` to work | ||
| #standalone.vm.box = "puppetlabs/centos-7.2-64-puppet" | ||
|
|
||
| operating_system = "centos" | ||
| if ENV['OPERATING_SYSTEM'].nil? | ||
| config.vm.box = "puppetlabs/centos-7.2-64-puppet" | ||
| config.vm.box_version = '1.0.1' | ||
| elsif ENV['OPERATING_SYSTEM'] == 'debian' | ||
| puts "WARNING: Debian specified. Here be dragons! https://github.com/IQSS/dataverse/issues/1059" | ||
| config.vm.box_url = "http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-puppet.box" | ||
| config.vm.box = "puppet-vagrant-boxes.puppetlabs.com-debian-73-x64-virtualbox-puppet.box" | ||
| else | ||
| operating_system = ENV['OPERATING_SYSTEM'] | ||
| puts "Not sure what do to with operating system: #{operating_system}" | ||
| exit 1 | ||
| end | ||
|
|
||
| mailserver = "localhost" | ||
| if ENV['MAIL_SERVER'].nil? | ||
| puts "MAIL_SERVER environment variable not specified. Using #{mailserver} by default.\nTo specify it in bash: export MAIL_SERVER=localhost" | ||
| else | ||
| mailserver = ENV['MAIL_SERVER'] | ||
| puts "MAIL_SERVER environment variable found, using #{mailserver}" | ||
| end | ||
|
|
||
| config.vm.provider "virtualbox" do |v| | ||
| v.memory = 2048 | ||
| v.cpus = 1 | ||
| end | ||
| config.vm.provision "shell", path: "scripts/vagrant/setup.sh" | ||
| config.vm.provision "shell", path: "scripts/vagrant/setup-solr.sh" | ||
| config.vm.provision "shell", path: "scripts/vagrant/install-dataverse.sh", args: mailserver | ||
| # FIXME: get tests working and re-enable them! | ||
| #config.vm.provision "shell", path: "scripts/vagrant/test.sh" | ||
|
|
||
| config.vm.network "private_network", type: "dhcp" | ||
| config.vm.network "forwarded_port", guest: 80, host: 8888 | ||
| config.vm.network "forwarded_port", guest: 443, host: 9999 | ||
| config.vm.network "forwarded_port", guest: 8983, host: 8993 | ||
| config.vm.network "forwarded_port", guest: 8080, host: 8088 | ||
| config.vm.network "forwarded_port", guest: 8181, host: 8188 | ||
|
|
||
| # FIXME: use /dataverse/downloads instead | ||
| config.vm.synced_folder "downloads", "/downloads" | ||
| # FIXME: use /dataverse/conf instead | ||
| config.vm.synced_folder "conf", "/conf" | ||
| # FIXME: use /dataverse/scripts instead | ||
| config.vm.synced_folder "scripts", "/scripts" | ||
| config.vm.synced_folder ".", "/dataverse" | ||
| config.vm.provider "virtualbox" do |vbox| | ||
| vbox.cpus = 4 | ||
| vbox.memory = 4096 | ||
| end | ||
|
|
||
| config.vm.define "solr", autostart: false do |solr| | ||
| config.vm.hostname = "solr" | ||
| solr.vm.box = "puppet-vagrant-boxes.puppetlabs.com-centos-65-x64-virtualbox-puppet.box" | ||
| config.vm.synced_folder ".", "/dataverse" | ||
| config.vm.network "private_network", type: "dhcp" | ||
| config.vm.network "forwarded_port", guest: 8983, host: 9001 | ||
| end | ||
| config.vm.provision "shell", path: "scripts/vagrant/setup.sh" | ||
| config.vm.provision "shell", path: "scripts/vagrant/setup-solr.sh" | ||
| config.vm.provision "shell", path: "scripts/vagrant/install-dataverse.sh" | ||
|
|
||
| config.vm.define "test", autostart: false do |test| | ||
| config.vm.hostname = "test" | ||
| test.vm.box = "puppet-vagrant-boxes.puppetlabs.com-centos-65-x64-virtualbox-puppet.box" | ||
| config.vm.synced_folder ".", "/dataverse" | ||
| config.vm.network "private_network", type: "dhcp" | ||
| end | ||
| config.vm.network "private_network", type: "dhcp" | ||
| config.vm.network "forwarded_port", guest: 80, host: 8888 | ||
| config.vm.network "forwarded_port", guest: 443, host: 9999 | ||
| config.vm.network "forwarded_port", guest: 8983, host: 8993 | ||
| config.vm.network "forwarded_port", guest: 8080, host: 8088 | ||
| config.vm.network "forwarded_port", guest: 8181, host: 8188 | ||
|
|
||
| config.vm.synced_folder ".", "/dataverse" | ||
|
|
||
| end |
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
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 |
|---|---|---|
| @@ -1,24 +1,24 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| cd /usr/local/glassfish4 | ||
| cd /opt/payara5 | ||
|
|
||
| # if appropriate; reconfigure PID provider on the basis of environmental variables. | ||
| if [ ! -z "${DoiProvider}" ]; then | ||
| curl -X PUT -d ${DoiProvider} http://localhost:8080/api/admin/settings/:DoiProvider | ||
| fi | ||
| if [ ! -z "${doi_username}" ]; then | ||
| bin/asadmin create-jvm-options "-Ddoi.username=${doi_password}" | ||
| bin/asadmin create-jvm-options "-Ddoi.username=${doi_username}" | ||
| fi | ||
| if [ ! -z "${doi_password}" ]; then | ||
| bin/asadmin create-jvm-options "-Ddoi.password=${doi_password}" | ||
| fi | ||
| if [ ! -z "${doi_baseurl}" ]; then | ||
| bin/asadmin delete-jvm-options "-Ddoi.baseurlstring=https\://mds.test.datacite.org" | ||
| doi_baseurl_esc=`echo ${doi_baseurl} | sed -e 's/:/\\:/'` | ||
| bin/asadmin create-jvm-options "\"-Ddoi.baseurlstring=${doi_baseurl_esc}\"" | ||
| doi_baseurl_esc=`echo ${doi_baseurl} | sed -e 's/:/\\\:/'` | ||
| bin/asadmin create-jvm-options "-Ddoi.baseurlstring=${doi_baseurl_esc}" | ||
| fi | ||
| if [ ! -z "${doi_mdcbaseurl}" ]; then | ||
| bin/asadmin delete-jvm-options "-Ddoi.mdcbaseurlstring=https\://api.test.datacite.org" | ||
| doi_mdcbaseurl_esc=`echo ${doi_mdcbaseurl} | sed -e 's/:/\\:/'` | ||
| bin/asadmin create-jvm-options "\"-Ddoi.mdcbaseurlstring=${doi_mdcbaseurl_esc}\"" | ||
| if [ ! -z "${doi_dataciterestapiurl}" ]; then | ||
| bin/asadmin delete-jvm-options "-Ddoi.dataciterestapiurlstring=https\://api.test.datacite.org" | ||
| doi_dataciterestapiurl_esc=`echo ${doi_dataciterestapiurl} | sed -e 's/:/\\\:/'` | ||
| bin/asadmin create-jvm-options "-Ddoi.dataciterestapiurlstring=${doi_dataciterestapiurl_esc}" | ||
| 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
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
Oops, something went wrong.