diff --git a/docker-compose.yml b/docker-compose.yml index fb6c505..6bdf1d7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,11 +18,11 @@ services: # copy the sql script to create tables # - ./sql/create_tables.sql:/docker-entrypoint-initdb.d/create_tables.sql storagehub: - build: storagehub:latest + image: storagehub:latest ports: - '8081:8080' minio: image: minio/minio ports: - '9000:9000' - \ No newline at end of file + diff --git a/docker/container.ini b/docker/container.ini index 7ecb0dd..4ba6140 100644 --- a/docker/container.ini +++ b/docker/container.ini @@ -1,6 +1,4 @@ [node] -; mandatory -; optional fields: mode (=online), publication-frequency-seconds (=60), authorizeChildrenContext (=false) mode = online hostname = dlib29.isti.cnr.it protocol= http @@ -10,31 +8,21 @@ authorizeChildrenContext = true publicationFrequencyInSeconds = 60 [properties] -; not mandatory -SmartGearsDistribution = 0.0.1 +SmartGearsDistribution = 4.0.0-SNAPSHOT SmartGearsDistributionBundle = UnBundled [site] -; mandatory -; optional fields: latitude, logitude country = it location = rome -;[proxy] -; not mandatory -;protocol = https -;hostname = proxy -;port = 80 +[proxy] +protocol = https +hostname = workspace-repository.dev.d4science.org +port = 443 [authorization] factory = org.gcube.smartgears.security.defaults.DefaultAuthorizationProviderFactory -endpoint = https://accounts.dev.d4science.org/auth/realms/d4science/protocol/openid-connect/token +factory.endpoint = https://accounts.dev.d4science.org/auth/realms/d4science/protocol/openid-connect/token credentials.class = org.gcube.smartgears.security.SimpleCredentials credentials.clientID = node-whn-test-uno-d-d4s.d4science.org credentials.secret = 979bd3bc-5cc4-11ec-bf63-0242ac130002 - - -;[persistence] -; not mandatory (default is LocalPersistence writing in the ghn home) -;class = utils.PersistenceWriterTest -;location = /tmp diff --git a/docker/logback.xml b/docker/logback.xml index 9724f51..a58fa86 100644 --- a/docker/logback.xml +++ b/docker/logback.xml @@ -59,11 +59,11 @@ - + - + diff --git a/src/main/resources/storage-settings.properties b/src/main/resources/storage-settings.properties index 7c7a9c4..cb95239 100644 --- a/src/main/resources/storage-settings.properties +++ b/src/main/resources/storage-settings.properties @@ -1,5 +1,5 @@ -bucketName=storagehub-default -key=storagehub -secret=8334e0e6acb173a8f915026b1bc4c7 -url=https://minio.dev.d4science.org/ +bucketName=storagehub-dev +key=qa4zD0QqmcG0JZNG +secret=9jzHtOigmrprBYtPGIkh3Tq1Bago4zxL +url=https://minio.d4science.org/ createBucket=false \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/README b/src/main/webapp/WEB-INF/README index 8afe042..1b215f5 100644 --- a/src/main/webapp/WEB-INF/README +++ b/src/main/webapp/WEB-INF/README @@ -25,7 +25,7 @@ The projects leading to this software have received funding from a series of Version -------------------------------------------------- -1.5.0-SNAPSHOT (20220615-154635) +1.5.0-SNAPSHOT (20220622-162709) Please see the file named "changelog.xml" in this directory for the release notes.