Skip to content

Commit

Permalink
Add contact address in tm
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rub21
Rub21 committed Sep 10, 2024
1 parent 9425712 commit 98610f8
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 53 deletions.
47 changes: 21 additions & 26 deletions values.production.template.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -631,37 +631,32 @@ osm-seed:
label_key: nodegroup_type
label_value: web
replicaCount: 2
staticIp: c
serviceAnnotations:
service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "300"
service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: '300'
ingressDomain: tm-api.openhistoricalmap.org
env:
# POSTGRES_HOST: {{PRODUCTION_TM_API_DB_HOST}}
# POSTGRES_DB: {{PRODUCTION_TM_API_DB}}
# POSTGRES_PASSWORD: {{PRODUCTION_TM_API_DB_PASSWORD}}
# POSTGRES_USER: {{PRODUCTION_TM_API_DB_USER}}
# POSTGRES_PORT: 5432
TM_ORG_NAME: 'OpenHistoricalMap'
TM_ORG_CODE: 'OHM'
TM_ORG_URL: 'www.openhistoricalmap.org'
TM_ORG_PRIVACY_POLICY_URL: 'www.openhistoricalmap.org/copyright'
TM_ORG_GITHUB: 'github.com/openhistoricalmap'
OSM_SERVER_URL: 'https://www.openhistoricalmap.org'
OSM_NOMINATIM_SERVER_URL: 'https://nominatim-api.openhistoricalmap.org'
OSM_REGISTER_URL: 'https://www.openhistoricalmap.org/user/new'
ID_EDITOR_URL: 'https://www.openhistoricalmap.org/edit?editor=id'
POTLATCH2_EDITOR_URL: 'https://www.openhistoricalmap.org/edit?editor=potlatch2'
TM_ORG_NAME: OpenHistoricalMap
TM_ORG_CODE: OHM
TM_ORG_URL: www.openhistoricalmap.org
TM_ORG_PRIVACY_POLICY_URL: www.openhistoricalmap.org/copyright
TM_ORG_GITHUB: github.com/openhistoricalmap
OSM_SERVER_URL: https://www.openhistoricalmap.org
OSM_NOMINATIM_SERVER_URL: https://nominatim-api.openhistoricalmap.org
OSM_REGISTER_URL: https://www.openhistoricalmap.org/user/new
ID_EDITOR_URL: https://www.openhistoricalmap.org/edit?editor=id
POTLATCH2_EDITOR_URL: https://www.openhistoricalmap.org/edit?editor=potlatch2
TM_SECRET: {{PRODUCTION_TM_API_SECRET}}
TM_CONSUMER_KEY: {{PRODUCTION_TM_API_CONSUMER_KEY}}
TM_CONSUMER_SECRET: {{PRODUCTION_TM_API_CONSUMER_SECRET}}
TM_EMAIL_FROM_ADDRESS: '[email protected]'
TM_SMTP_HOST: 'email-smtp.us-east-1.amazonaws.com'
TM_EMAIL_FROM_ADDRESS: [email protected]
TM_EMAIL_CONTACT_ADDRESS: [email protected]
TM_SMTP_HOST: email-smtp.us-east-1.amazonaws.com
TM_SMTP_PORT: 25
TM_SMTP_USER: {{MAILER_USERNAME}}
TM_SMTP_PASSWORD: {{MAILER_PASSWORD}}
TM_DEFAULT_LOCALE: 'en'
TM_APP_API_URL: 'https://tm-api.openhistoricalmap.org'
TM_APP_BASE_URL: 'https://tasks.openhistoricalmap.org'
TM_DEFAULT_LOCALE: en
TM_APP_API_URL: https://tm-api.openhistoricalmap.org
TM_APP_BASE_URL: https://tasks.openhistoricalmap.org
TM_IMPORT_MAX_FILESIZE: 3000000
TM_MAX_AOI_AREA: 15000
TM_CLIENT_ID: ${{PRODUCTION_TM_CLIENT_ID}}
Expand All @@ -672,11 +667,11 @@ osm-seed:
resources:
enabled: false
requests:
memory: "1Gi"
cpu: "2"
memory: '1Gi'
cpu: '2'
limits:
memory: "2Gi"
cpu: "2"
memory: '2Gi'
cpu: '2'



Expand Down
49 changes: 22 additions & 27 deletions values.staging.template.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -664,53 +664,48 @@ osm-seed:
label_key: nodegroup_type
label_value: web
replicaCount: 1
staticIp: c
serviceAnnotations:
service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "300"
service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: '300'
ingressDomain: tm-api.staging.openhistoricalmap.org
env:
# POSTGRES_HOST: {{STAGING_TM_API_DB_HOST}}
# POSTGRES_DB: {{STAGING_TM_API_DB}}
# POSTGRES_PASSWORD: {{STAGING_TM_API_DB_PASSWORD}}
# POSTGRES_USER: {{STAGING_TM_API_DB_USER}}
# POSTGRES_PORT: 5432
TM_ORG_NAME: 'OpenHistoricalMap'
TM_ORG_CODE: 'OHM'
TM_ORG_URL: 'staging.openhistoricalmap.org'
TM_ORG_PRIVACY_POLICY_URL: 'staging.openhistoricalmap.org/copyright'
TM_ORG_GITHUB: 'github.com/openhistoricalmap'
OSM_SERVER_URL: 'https://staging.openhistoricalmap.org'
OSM_NOMINATIM_SERVER_URL: 'https://nominatim-api.staging.openhistoricalmap.org'
OSM_REGISTER_URL: 'https://staging.openhistoricalmap.org/user/new'
ID_EDITOR_URL: 'https://staging.openhistoricalmap.org/edit?editor=id'
POTLATCH2_EDITOR_URL: 'https://staging.openhistoricalmap.org/edit?editor=potlatch2'
TM_ORG_NAME: OpenHistoricalMap
TM_ORG_CODE: OHM
TM_ORG_URL: staging.openhistoricalmap.org
TM_ORG_PRIVACY_POLICY_URL: staging.openhistoricalmap.org/copyright
TM_ORG_GITHUB: github.com/openhistoricalmap
OSM_SERVER_URL: https://staging.openhistoricalmap.org
OSM_NOMINATIM_SERVER_URL: https://nominatim-api.staging.openhistoricalmap.org
OSM_REGISTER_URL: https://staging.openhistoricalmap.org/user/new
ID_EDITOR_URL: https://staging.openhistoricalmap.org/edit?editor=id
POTLATCH2_EDITOR_URL: https://staging.openhistoricalmap.org/edit?editor=potlatch2
TM_SECRET: {{STAGING_TM_API_SECRET}}
TM_CONSUMER_KEY: {{STAGING_TM_API_CONSUMER_KEY}}
TM_CONSUMER_SECRET: {{STAGING_TM_API_CONSUMER_SECRET}}
TM_EMAIL_FROM_ADDRESS: '[email protected]'
TM_SMTP_HOST: 'email-smtp.us-east-1.amazonaws.com'
TM_EMAIL_FROM_ADDRESS: [email protected]
TM_EMAIL_CONTACT_ADDRESS: [email protected]
TM_SMTP_HOST: email-smtp.us-east-1.amazonaws.com
TM_SMTP_PORT: 25
TM_SMTP_USER: {{MAILER_USERNAME}}
TM_SMTP_PASSWORD: {{MAILER_PASSWORD}}
TM_DEFAULT_LOCALE: 'en'
TM_APP_API_URL: 'https://tm-api.staging.openhistoricalmap.org'
TM_APP_BASE_URL: 'https://tasks.staging.openhistoricalmap.org'
TM_DEFAULT_LOCALE: en
TM_APP_API_URL: https://tm-api.staging.openhistoricalmap.org
TM_APP_BASE_URL: https://tasks.staging.openhistoricalmap.org
TM_IMPORT_MAX_FILESIZE: 3000000
TM_MAX_AOI_AREA: 15000
TM_CLIENT_ID: {{STAGING_TM_CLIENT_ID}}
TM_CLIENT_SECRET: {{STAGING_TM_CLIENT_SECRET}}
TM_DEFAULT_CHANGESET_COMMENT: "staging"
TM_DEFAULT_CHANGESET_COMMENT: staging
TM_REDIRECT_URI: https://tm-api.staging.openhistoricalmap.org/authorized
TM_SCOPE: 'read_prefs write_api'
TM_APP_API_VERSION: v4
resources:
enabled: false
requests:
memory: "1Gi"
cpu: "2"
memory: '1Gi'
cpu: '2'
limits:
memory: "2Gi"
cpu: "2"
memory: '2Gi'
cpu: '2'

# ====================================================================================================
# Variables for nominatim api
Expand Down

0 comments on commit 98610f8

Please sign in to comment.