Skip to content
Snippets Groups Projects
Commit 83547da9 authored by Lukasz Lopatowski's avatar Lukasz Lopatowski
Browse files

Added environment variables for main application.properties file

parent 4bfaf70e
No related branches found
No related tags found
1 merge request!9update properties for docker flags
Pipeline #89452 passed
This commit is part of merge request !9. Comments created here will be created in the context of that merge request.
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
# --------------- # # --------------- #
# profiles are used to customise platform operations in the following areas # profiles are used to customise platform operations in the following areas
# - container orchestrator (options: env_kubernetes) # - container orchestrator (options: env_kubernetes)
# - dcn setup (options: dcn_manual, dcn_none)
# - database (options: db_memory, db_standalone) # - database (options: db_memory, db_standalone)
spring.profiles.active=env_kubernetes, db_memory spring.profiles.active=env_kubernetes, db_memory
...@@ -14,6 +15,10 @@ portal.address=http://localhost:4200 ...@@ -14,6 +15,10 @@ portal.address=http://localhost:4200
admin.password=admin admin.password=admin
admin.email=admin@nmaas.eu admin.email=admin@nmaas.eu
# REST API documentation
springdoc.api-docs.enabled=false
springdoc.swagger-ui.enabled=false
spring.mail.username=test spring.mail.username=test
spring.mail.password=test spring.mail.password=test
spring.mail.host=smtp.nmaas.eu spring.mail.host=smtp.nmaas.eu
...@@ -25,8 +30,11 @@ spring.mail.properties.mail.smtp.connectiontimeout=5000 ...@@ -25,8 +30,11 @@ spring.mail.properties.mail.smtp.connectiontimeout=5000
spring.mail.properties.mail.smtp.timeout=3000 spring.mail.properties.mail.smtp.timeout=3000
spring.mail.properties.mail.smtp.writetimeout=5000 spring.mail.properties.mail.smtp.writetimeout=5000
# Actuator and Metrics
nmaas.metrics.enabled=false nmaas.metrics.enabled=false
management.info.git.mode=full management.info.git.mode=full
# Notifications
notifications.from-address= notifications.from-address=
# ---------------- # # ---------------- #
......
# --------------- # # --------------- #
# Active profiles # # Active profiles #
# --------------- # # --------------- #
# profiles are used to customise platform operations in the following areas # profiles are used to customise platform operations in following areas
# - container orchestrator (options: env_kubernetes) # - container orchestrator (options: env_kubernetes)
# - dcn setup (options: dcn_manual, dcn_none)
# - database (options: db_memory, db_standalone) # - database (options: db_memory, db_standalone)
spring.profiles.active=env_kubernetes, db_memory spring.profiles.active=env_kubernetes, dcn_manual, db_standalone
# ---------------- # # ---------------- #
# General settings # # General settings #
...@@ -15,10 +16,10 @@ admin.password=${ADMIN_PASSWORD:admin} ...@@ -15,10 +16,10 @@ admin.password=${ADMIN_PASSWORD:admin}
admin.email=${ADMIN_EMAIL:admin@nmaas.eu} admin.email=${ADMIN_EMAIL:admin@nmaas.eu}
# REST API documentation # REST API documentation
springdoc.api-docs.enabled=${PLATFORM_API_DOCS_ENABLED:true} springdoc.api-docs.enabled=${PLATFORM_API_DOCS_ENABLED:false}
springdoc.api-docs.path={$PLATFORM_API_DOCS_PATH:/api-docs/spec} springdoc.api-docs.path=/api-docs/spec
springdoc.swagger-ui.enabled=${PLATFORM_API_DOCS_ENABLED:true} springdoc.swagger-ui.enabled=${PLATFORM_API_DOCS_ENABLED:false}
springdoc.swagger-ui.path={$PLATFORM_API_SWAGGER_PATH:/api-docs/ui.html} springdoc.swagger-ui.path=/api-docs/ui.html
# Email # Email
spring.mail.username=${SMTP_LOGIN:default} spring.mail.username=${SMTP_LOGIN:default}
...@@ -41,7 +42,6 @@ spring.http.encoding.force=true ...@@ -41,7 +42,6 @@ spring.http.encoding.force=true
nmaas.metrics.enabled=${METRICS_ENABLED:true} nmaas.metrics.enabled=${METRICS_ENABLED:true}
management.endpoints.web.exposure.include=health,prometheus management.endpoints.web.exposure.include=health,prometheus
management.info.git.mode=full management.info.git.mode=full
# disabled strict check if email configuration is valid
management.health.mail.enabled=false management.health.mail.enabled=false
# Notifications # Notifications
...@@ -50,28 +50,22 @@ notifications.from-address=${SMTP_FROM} ...@@ -50,28 +50,22 @@ notifications.from-address=${SMTP_FROM}
# ---------------- # # ---------------- #
# Database # # Database #
# ---------------- # # ---------------- #
# In memory H2
db.inmemory.jdbc-url=jdbc:h2:mem:nmaas
db.inmemory.username=nmaas
db.inmemory.password=nmaas
# Standalone PostgreSQL # Standalone PostgreSQL
db.standalone.jdbc-url=jdbc:postgresql://${POSTGRESQL_HOST:postgresql}:${POSTGRESQL_PORT:5432}/${POSTGRESQL_DBNAME:nmaas} db.standalone.jdbc-url=jdbc:postgresql://${POSTGRESQL_HOST:postgresql}:${POSTGRESQL_PORT:5432}/${POSTGRESQL_DBNAME:nmaas}
db.standalone.username=${POSTGRESQL_USERNAME:nmaas} db.standalone.username=${POSTGRESQL_USERNAME:nmaas}
db.standalone.password=${POSTGRESQL_PASSWORD:nmaas} db.standalone.password=${POSTGRESQL_PASSWORD:nmaas}
# FlywayDB settings
spring.flyway.enabled=true
spring.flyway.locations=classpath:/db/migration
spring.flyway.out-of-order=true
# Common # Common
spring.h2.console.enabled=true
spring.jpa.properties.hibernate.show_sql=false spring.jpa.properties.hibernate.show_sql=false
spring.jpa.properties.hibernate.format_sql=false spring.jpa.properties.hibernate.format_sql=false
spring.jpa.properties.hibernate.connection.autocommit=false spring.jpa.properties.hibernate.connection.autocommit=false
spring.jpa.hibernate.ddl-auto=create-drop spring.jpa.hibernate.ddl-auto=none
spring.jpa.show-sql=true spring.jpa.show-sql=true
spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration
spring.mvc.favicon.enabled=false
spring.devtools.add-properties=false
# FlywayDB settings
spring.flyway.locations=classpath:/db/migration/common
spring.flyway.out-of-order=true
spring.flyway.enabled=false
# -------------------------------------------------------- # # -------------------------------------------------------- #
# nmaas application deployment and configuration processes # # nmaas application deployment and configuration processes #
...@@ -89,8 +83,8 @@ nmaas.portal.domains.namespace.pattern=[a-z0-9-]{0,64} ...@@ -89,8 +83,8 @@ nmaas.portal.domains.namespace.pattern=[a-z0-9-]{0,64}
nmaas.platform.webhooks.baseurl=${PLATFORM_BASEURL:http://localhost:9000}/api/gitlab/webhooks nmaas.platform.webhooks.baseurl=${PLATFORM_BASEURL:http://localhost:9000}/api/gitlab/webhooks
nmaas.kubernetes.incluster=false # nmaas Platform is running within the Kubernetes cluster
nmaas.kubernetes.apiserver.url=${KUBERNETES_APISERVER_URL:https://10.1.1.11:6443} nmaas.kubernetes.incluster=true
# flag indicating if namespace should be created upon domain creation # flag indicating if namespace should be created upon domain creation
nmaas.domains.create.namespace=${NAMESPACE_CREATION_ENABLED:false} nmaas.domains.create.namespace=${NAMESPACE_CREATION_ENABLED:false}
...@@ -139,7 +133,7 @@ helm.repositoryUrl=${HELM_REPOSITORY_URL:https://nmaas-test.helm.repository} ...@@ -139,7 +133,7 @@ helm.repositoryUrl=${HELM_REPOSITORY_URL:https://nmaas-test.helm.repository}
helm.chartsDirectory=${HELM_LOCALCHARTSDIR:/home/nmaas/charts} helm.chartsDirectory=${HELM_LOCALCHARTSDIR:/home/nmaas/charts}
helm.enableTls=${HELM_ENABLETLS:false} helm.enableTls=${HELM_ENABLETLS:false}
# possible values for Helm version are v2 and v3 (if none is provided v3 is used by default) # possible values for Helm version are v2 and v3 (if none is provided v3 is used by default)
helm.version=${HELM_VERSION:v2} helm.version=${HELM_VERSION:v3}
# --------------------- # # --------------------- #
...@@ -152,7 +146,7 @@ janitor.port=${JANITOR_PORT:5000} ...@@ -152,7 +146,7 @@ janitor.port=${JANITOR_PORT:5000}
# GitLab configuration # # GitLab configuration #
# -------------------- # # -------------------- #
gitlab.apiUrl=${GITLAB_ADDRESS:http://nmaas-gitlab-unicorn:8080} gitlab.apiUrl=${GITLAB_API_URL:http://nmaas-gitlab-unicorn:8080}
gitlab.token=${GITLAB_TOKEN:test_gitlab_token} gitlab.token=${GITLAB_TOKEN:test_gitlab_token}
# ------------------------ # # ------------------------ #
...@@ -167,17 +161,18 @@ kubernetes.ingress.resourceConfigOption=DEPLOY_FROM_CHART ...@@ -167,17 +161,18 @@ kubernetes.ingress.resourceConfigOption=DEPLOY_FROM_CHART
kubernetes.ingress.externalServiceDomain=${K8S_INGRESS_CONTROLLER_EXTERNAL_SERVICE_DOMAIN:nmaas.test.net} kubernetes.ingress.externalServiceDomain=${K8S_INGRESS_CONTROLLER_EXTERNAL_SERVICE_DOMAIN:nmaas.test.net}
kubernetes.ingress.publicServiceDomain=${K8S_INGRESS_CONTROLLER_PUBLIC_SERVICE_DOMAIN:public.nmaas.test.net} kubernetes.ingress.publicServiceDomain=${K8S_INGRESS_CONTROLLER_PUBLIC_SERVICE_DOMAIN:public.nmaas.test.net}
kubernetes.ingress.tlsSupported=${K8S_INGRESS_CONTROLLER_TLS_SUPPORTED:true} kubernetes.ingress.tlsSupported=${K8S_INGRESS_CONTROLLER_TLS_SUPPORTED:true}
kubernetes.ingress.certificateConfigOption={K8S_INGRESS_CERTIFICATE_CONFIG_OPTION:USE_LETSENCRYPT} kubernetes.ingress.certificateConfigOption=${K8S_INGRESS_CERTIFICATE_CONFIG_OPTION:USE_LETSENCRYPT}
kubernetes.ingress.issuerOrWildcardName=${K8S_INGRESS_CERTIFICATE_ISSUER_OR_WILDCARD_NAME:nmaas-issuer} kubernetes.ingress.issuerOrWildcardName=${K8S_INGRESS_CERTIFICATE_ISSUER_OR_WILDCARD_NAME:nmaas-issuer}
kubernetes.ingress.ingressPerDomain=${K8S_INGRESS_CONTROLLER_PER_DOMAIN:true} kubernetes.ingress.ingressPerDomain=${K8S_INGRESS_CONTROLLER_PER_DOMAIN:true}
kubernetes.deployment.namespaceConfigOption=${K8S_DEPLOYMENT_NAMESPACE_CONFIG_OPTION:USE_DOMAIN_NAMESPACE} kubernetes.deployment.namespaceConfigOption=${K8S_DEPLOYMENT_NAMESPACE_CONFIG_OPTION:USE_DOMAIN_NAMESPACE}
kubernetes.deployment.defaultNamespace=${K8S_DEPLOYMENT_DEFAULT_NAMESPACE:default} kubernetes.deployment.defaultNamespace=${K8S_DEPLOYMENT_DEFAULT_NAMESPACE:default}
kubernetes.deployment.forceDedicatedWorkers=false
kubernetes.deployment.smtpServerHostname=${SMTP_HOST:nmaas-postfix} kubernetes.deployment.smtpServerHostname=${SMTP_HOST:nmaas-postfix}
kubernetes.deployment.smtpServerPort=${SMTP_PORT:587} kubernetes.deployment.smtpServerPort=${SMTP_PORT:587}
kubernetes.deployment.smtpServerUsername=${SMTP_LOGIN} kubernetes.deployment.smtpServerUsername=${SMTP_LOGIN}
kubernetes.deployment.smtpServerPassword=${SMTP_PASSWORD} kubernetes.deployment.smtpServerPassword=${SMTP_PASSWORD}
kubernetes.deployment.smtpFromDefaultDomain=${SMTP_FROM_DEFAULT_DOMAIN}
kubernetes.deployment.defaultStorageClass=${K8S_DEPLOYMENT_DEFAULT_STORAGE_CLASS:storageClass} kubernetes.deployment.defaultStorageClass=${K8S_DEPLOYMENT_DEFAULT_STORAGE_CLASS:storageClass}
kubernetes.deployment.forceDedicatedWorkers=false
# -------------------- # # -------------------- #
# Portal configuration # # Portal configuration #
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment