Merge pull request #53 from NFDI4Chem/development

fix:[coconut-app]-update values.yml

charts/coconut-app/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.4.0
+version: 0.4.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/coconut-app/templates/configmap.yaml

@@ -66,3 +66,14 @@ data:
   DOI_HOST: {{ .Values.doi.doiHost }}
   DOI_PROVIDER: {{ .Values.doi.doiProvider }}
 
+#Datacite Properties
+  DATACITE_PREFIX: "{{ .Values.datacite.prefix }}"
+  DATACITE_ENDPOINT: {{ .Values.datacite.endpoint }}
+
+#OAuth Properties
+  {{ if .Values.oauthProperties.github.enabled }}
+  GITHUB_REDIRECT_URL: {{ .Values.oauthProperties.github.redirectURL }}
+  {{ end }}
+  {{ if .Values.oauthProperties.google.enabled }}
+  GOOGLE_REDIRECT_URL: {{ .Values.oauthProperties.google.redirectURL }}
+  {{ end }}

charts/coconut-app/templates/secret.yml

@@ -34,4 +34,20 @@ data:
   {{- if .Values.larabug.enabled }}
   LB_KEY: {{ .Values.larabug.lbKey |b64enc | quote }}
   LB_PROJECT_KEY: {{ .Values.larabug.lbProjectKey |b64enc | quote }}
+  {{- end -}}
+
+  #OAuth Properties Secrets
+  {{- if .Values.oauthProperties.github.enabled }}
+  GITHUB_CLIENT_ID: {{ .Values.oauthProperties.github.clientID |b64enc | quote }}
+  GITHUB_CLIENT_SECRET: {{ .Values.oauthProperties.github.clientSecret |b64enc | quote }}
+  {{- end -}}
+  {{- if .Values.oauthProperties.google.enabled }}
+  GOOGLE_CLIENT_ID: {{ .Values.oauthProperties.google.clientID |b64enc | quote }}
+  GOOGLE_CLIENT_SECRET: {{ .Values.oauthProperties.google.clientSecret |b64enc | quote }}
+  {{- end -}}
+
+  {{- if .Values.datacite.enabled }}
+  #Datacite Secrets
+  DATACITE_USERNAME: {{ .Values.datacite.username |b64enc | quote }}
+  DATACITE_SECRET: {{ .Values.datacite.secret |b64enc | quote }}
   {{- end -}}

charts/coconut-app/values.yaml

@@ -7,16 +7,16 @@ replicaCount: 1
 # Default app properties for laravel.
 appProperties:
   name: coconut
-  key: 
-  env: development
+  key: base64:88Td66VUaLDIea0DEgJQVdoXU1WolK+kdoEPBepQYH0=
+  env: production
   debug: true
-  url: https://coconut2.nmrxiv.org
+  url: https://coconut.naturalproducts.net/
   queueConnection: sync
   schemaVersion: 1.0
   description: |
-    COCONUT Online is an open-source project that stores, searches, and analyzes Natural Products (NPs). 
-    The database contains over 50 open NP resources, and the data is accessible free of charge and without any restrictions. 
-    Each entry corresponds to a "flat" NP structure and is associated with their known stereochemical forms, 
+    COCONUT Online is an open-source project that stores, searches, and analyzes Natural Products (NPs).
+    The database contains over 50 open NP resources, and the data is accessible free of charge and without any restrictions.
+    Each entry corresponds to a "flat" NP structure and is associated with their known stereochemical forms,
     literature, organisms that produce them, natural geographic presence, and precomputed molecular properties if available.
 
 webservices:
@@ -26,13 +26,13 @@ webservices:
   orcidIdSearchApi: https://pub.orcid.org/v2.1/search
   orcidIdEmploymentApi: https://pub.orcid.org/v3.0/{orcid_id}/employments
   orcidIdPersonApi: https://pub.orcid.org/v3.0/{orcid_id}/person
-  cmApi: https://dev.api.naturalproducts.net/v1/
+  cmApi: https://api.naturalproducts.net/v1/
 
 logProperties:
   logChannel: stack
   logLevel: debug
 
-#DB Properties
+# DB Properties
 rdkitcatridgepostgres:
   enabled: true
   auth:
@@ -45,14 +45,14 @@ rdkitcatridgepostgres:
 
 appImage:
   name: php
-  repository: europe-west3-docker.pkg.dev/coconut-366808/coconut-dev/coconut-app
+  repository: nfdi4chem/coconut
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   tag: latest
 
 nginxImage:
   name: nginx
-  repository: europe-west3-docker.pkg.dev/coconut-366808/coconut-dev/coconut-nginx
+  repository: nfdi4chem/coconut
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   tag: latest
@@ -110,7 +110,7 @@ ingress:
   #    hosts:
   #      - chart-example.local
 
-resources: 
+resources:
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
   # resources, such as Minikube. If you do want to specify resources, uncomment the following
@@ -136,7 +136,7 @@ mail:
   host: 'smtp.uni-jena.de'
   port: 587
   from: [email protected]
-  fromName: "coconut-dev"
+  fromName: "coconut"
   user: test
   password: secret
   mailer: smtp
@@ -145,44 +145,25 @@ cheminfo-microservice:
   enabled: false
   image:
     name: chem-py-microservice
-    repository: europe-west3-docker.pkg.dev/coconut-366808/cheminformatics-python-microservice/chem-py-microservice
+    repository: nfdi4chem/cheminformatics-microservice
     pullPolicy: Always
     tag: latest
   service:
     type: ClusterIP
     port: 80
 
-# oauthProperties:
-#   enabled: false
-#   twitterClientID: 
-#   twitterClientSecret: 
-#   twitterRedirectUrl: 
-#   githubClientID: 
-#   githubClientSecret: 
-#   githubRedirectUrl: 
-#   orcidClientID: 
-#   orcidClientSecret:
-#   orcidRedirectUrl:
-#   orcidEnvironment:
-
-#Enable this properties for Single Sign-On follow the documentation for more info https://docs.coconut.org/docs/developer-guides/configurations/oauth
-# oauthProperties:
-#   twitter:
-#     enabled: false
-#     clientID:
-#     clientSecret:
-#     redirectURL: 
-#   github:
-#     enabled: false
-#     clientID:
-#     clientSecret:
-#     redirectURL:
-#   orcid:
-#     enabled: false
-#     clientID:
-#     clientSecret:
-#     redirectURL:
-#     environment:
+# Enable this properties for Single Sign-On follow the documentation for more info https://docs.coconut.org/docs/developer-guides/configurations/oauth
+oauthProperties:
+  google:
+    enabled: false
+    clientID:
+    clientSecret:
+    redirectURL:
+  github:
+    enabled: false
+    clientID:
+    clientSecret:
+    redirectURL:
 
 # storage:
 #   pvc:
@@ -221,23 +202,22 @@ worker:
 
 redis:
   enabled: false
-  #architecture: standalone
+  # architecture: standalone
   auth:
     enabled: true
     password: secret
   global:
     storageClass: standard
-  #host: nmrxiv-redis-master
+  # host: nmrxiv-redis-master
   port: 6379
-  replica:
-    replicaCount: 1
   master:
     persistence:
       enabled: true
       size: 1Gi
     service:
       type: LoadBalancer
   replica:
+    replicaCount: 1
     persistence:
       enabled: true
       size: 1Gi
@@ -270,21 +250,47 @@ scheduler:
 
 larabug:
   enabled: false
-  lbKey: 
+  lbKey:
   lbProjectKey:
 
+datacite:
+  enabled: false
+  host:
+  username:
+  secret:
+  prefix:
+  endpoint: https://api.test.datacite.org
+
+rabbitmq:
+  enabled: false
+  queueConnection: sync
+  port: 5672
+  # host: nmrxiv-rabbitmq
+  auth:
+    username: 'rabbitmq_user'
+    password: 'password'
+    # erlangCookie: 'erlangCookieerlangCookie'
+  global:
+    storageClass: 'standard'
+  metrics:
+    enabled: false
+  ingress:
+    enabled: false
+    path: '/'
+    hostname: ''
+
 fileStorage:
 # Below values are for file storage configuration.
 # You can have desired S3 compatible driver of your choice. Follow to read more https://laravel.com/docs/9.x/filesystem
   enabled: false
-  fileSystemDriver: 
-  fileSystemDriverPublic: 
-  awsAccessKeyID: 
-  awsSecretAccessKey: 
-  awsDefaultRegion: 
-  awsBucket: 
+  fileSystemDriver:
+  fileSystemDriverPublic:
+  awsAccessKeyID:
+  awsSecretAccessKey:
+  awsDefaultRegion:
+  awsBucket:
   awsEndpoint:
-  awsURL: 
+  awsURL:
 
 nodeSelector: {}