Improve self deployment

This commit is contained in:
George Kalampokis 2020-05-04 17:15:52 +03:00
parent 08737cbbf0
commit 5d6fbd3e37
6 changed files with 70 additions and 7 deletions

View File

@ -1,9 +1,9 @@
dmp.domain = https://devel.opendmp.eu dmp.domain = https://devel.opendmp.eu
####################PERSISTENCE OVERRIDES CONFIGURATIONS########## ####################PERSISTENCE OVERRIDES CONFIGURATIONS##########
database.url= database.url=jdbc:postgresql://dmp-db:5432/dmptool
database.username= database.username=dmptool
database.password= database.password=CHANGEME
####################ELASTIIC SEARCH TAGS OVERRIDES CONFIGURATIONS########## ####################ELASTIIC SEARCH TAGS OVERRIDES CONFIGURATIONS##########
elasticsearch.host = tags-elastic-search elasticsearch.host = tags-elastic-search
@ -18,10 +18,10 @@ http-logger.server-address = http://logstash:31311
pdf.converter.url=http://docsbox-web/ pdf.converter.url=http://docsbox-web/
####################CONFIGURATION FILES OVERRIDES CONFIGURATIONS########## ####################CONFIGURATION FILES OVERRIDES CONFIGURATIONS##########
configuration.externalUrls=/tmp/ExternalUrls.xml configuration.externalUrls=externalUrls/ExternalUrls.xml
configuration.rda=/tmp/RDACommonStandards.txt configuration.rda=/tmp/RDACommonStandards.txt
configuration.h2020template=tmp/h2020.docx configuration.h2020template=documents/h2020.docx
configuration.configurable_login_providers= configuration.configurable_login_providers=/tmp/ConfigurableLoginProviders.json
####################INVITATION MAIL CONFIGURATIONS############## ####################INVITATION MAIL CONFIGURATIONS##############
####################GENERIC MAIL CONFIGURATIONS################# ####################GENERIC MAIL CONFIGURATIONS#################
@ -87,3 +87,5 @@ zenodo.access_token=
#############CONTACT EMAIL CONFIGURATIONS######### #############CONTACT EMAIL CONFIGURATIONS#########
contact_email.mail= contact_email.mail=
language.path=i18n/

View File

@ -0,0 +1,2 @@
AlTER TABLE "DMP"
ALTER COLUMN "Creator" DROP NOT NULL;

View File

@ -0,0 +1,19 @@
CREATE TABLE public."DatasetExternalDataset" (
"Id" uuid DEFAULT public.uuid_generate_v4() NOT NULL,
"Dataset" uuid NOT NULL,
"ExternalDataset" uuid NOT NULL,
"Role" numeric,
"Data" character varying
);
ALTER TABLE public."DatasetExternalDataset" OWNER TO dmptool;
ALTER TABLE ONLY public."DatasetExternalDataset"
ADD CONSTRAINT "DatasetExternalDataset_pkey" PRIMARY KEY ("Id");
ALTER TABLE ONLY public."DatasetExternalDataset"
ADD CONSTRAINT fkey_datasetexternaldataset_dataset FOREIGN KEY ("Dataset") REFERENCES public."Dataset"("ID");
ALTER TABLE ONLY public."DatasetExternalDataset"
ADD CONSTRAINT fkey_datasetexternaldataset_externaldataset FOREIGN KEY ("ExternalDataset") REFERENCES public."ExternalDataset"("Id");

View File

@ -0,0 +1,23 @@
CREATE TABLE public."Invitation" (
"Id" uuid NOT NULL,
"InvitationEmail" character varying NOT NULL,
"Token" uuid NOT NULL,
"CreationUser" uuid NOT NULL,
"Dmp" uuid NOT NULL,
"Properties" xml,
"AcceptedInvitation" boolean
);
ALTER TABLE public."Invitation" OWNER TO dmptool;
ALTER TABLE ONLY public."Invitation"
ADD CONSTRAINT "Invitation_pkey" PRIMARY KEY ("Id");
ALTER TABLE ONLY public."Invitation"
ADD CONSTRAINT fk_invitation_creator FOREIGN KEY ("CreationUser") REFERENCES public."UserInfo"(id);
ALTER TABLE ONLY public."Invitation"
ADD CONSTRAINT fk_invitation_dmp FOREIGN KEY ("Dmp") REFERENCES public."DMP"("ID");

View File

@ -0,0 +1,16 @@
CREATE TABLE public."UserPreference" (
"Id" uuid NOT NULL,
"UserId" uuid NOT NULL,
"Data" json NOT NULL,
"PreferenceType" smallint NOT NULL
);
ALTER TABLE public."UserPreference" OWNER TO dmptool;
ALTER TABLE ONLY public."UserPreference"
ADD CONSTRAINT "UserPreference_pkey" PRIMARY KEY ("Id");
ALTER TABLE ONLY public."UserPreference"
ADD CONSTRAINT userpreference_user_fk FOREIGN KEY ("UserId") REFERENCES public."UserInfo"(id);

View File

@ -38,6 +38,7 @@ services:
- ./openDMP/dmp-backend/opendmp-logs:/app/logs - ./openDMP/dmp-backend/opendmp-logs:/app/logs
- ./openDMP/dmp-backend/tmp:/app/tmp - ./openDMP/dmp-backend/tmp:/app/tmp
- ./openDMP/dmp-backend/logging:/app/logging - ./openDMP/dmp-backend/logging:/app/logging
- ./openDMP/dmp-backend/documents:/app/documents
dmp-frontend: dmp-frontend:
build: build: