Support email updates

images/web/config/settings.yml

@@ -9,10 +9,10 @@ copyright_owner: "OpenHistoricalMap and contributors"
 attribution_url: "http://www.openhistoricalmap.org/copyright"
 license_url: "http://opendatacommons.org/licenses/odbl/1-0/"
 # Support email address
-support_email: "openstreetmap@example.com"
+support_email: "ohm-admins@googlegroups.com"
 # Sender addresses for emails
-email_from: "OpenHistoricalMap <openstreetmap@example.com>"
-email_return_path: "openstreetmap@example.com"
+email_from: "OpenHistoricalMap <ohm-admins@googlegroups.com>"
+email_return_path: "ohm-admins@googlegroups.com"
 # API version
 api_version: "0.6"
 # Application status - possible values are:
@@ -41,9 +41,6 @@ postcode_zoom: 15
 api_timeout: 300
 # Timeout for web pages in seconds
 web_timeout: 30
-
-
-
 # Periods (in hours) which are allowed for user blocks
 user_block_periods: [0, 1, 3, 6, 12, 24, 48, 96, 168, 336, 731, 4383, 8766, 87660]
 # Rate limit for message sending
@@ -87,12 +84,12 @@ oauth_key: "OAUTH_KEY"
 id_application: ""
 # Imagery to return in capabilities as blacklisted
 imagery_blacklist:
-# Current Google imagery URLs have google or googleapis in the domain
-- ".*\\.google(apis)?\\..*/.*"
-# Blacklist VWorld
-- "http://xdworld\\.vworld\\.kr:8080/.*"
-# Blacklist here
-- ".*\\.here\\.com[/:].*"
+  # Current Google imagery URLs have google or googleapis in the domain
+  - ".*\\.google(apis)?\\..*/.*"
+  # Blacklist VWorld
+  - "http://xdworld\\.vworld\\.kr:8080/.*"
+  # Blacklist here
+  - ".*\\.here\\.com[/:].*"
 # URL of Overpass instance to use for feature queries
 overpass_url: "https://overpass-api.de/api/interpreter"
 overpass_credentials: false
@@ -140,14 +137,12 @@ smtp_tls_verify_mode: "none"
 smtp_authentication: null
 smtp_user_name: null
 smtp_password: null
-
 # Rate limit for changeset comments
 min_changeset_comments_per_hour: 1
 initial_changeset_comments_per_hour: 6
 max_changeset_comments_per_hour: 60
 moderator_changeset_comments_per_hour: 36000
 embed_server_url: "https://embed.openhistoricalmap.org/"
-
 # Private key for signing id_tokens
 doorkeeper_signing_key: |
   -----BEGIN PRIVATE KEY-----

values.production.template.yaml

@@ -47,7 +47,7 @@ osm-seed:
 
   # Admin Email address used when generating Lets Encrypt certificates.
   # You will be notified of expirations, etc. on this email address.
-  adminEmail: [email protected]
+  adminEmail: [email protected]
 
   # ====================================================================================================
   # Variables for osm-seed database
@@ -104,7 +104,7 @@ osm-seed:
       OSM_id_key: {{PRODUCTION_ID_APPLICATION}}
       OAUTH_CLIENT_ID: {{PRODUCTION_OAUTH_CLIENT_ID}}
       OAUTH_KEY: {{PRODUCTION_OAUTH_KEY}}
-      MAILER_FROM: [email protected]
+      MAILER_FROM: [email protected]
       NOMINATIM_URL: nominatim-api.openhistoricalmap.org
       OVERPASS_URL: overpass-api.openhistoricalmap.org
       NEW_RELIC_LICENSE_KEY: {{PRODUCTION_NEW_RELIC_LICENSE_KEY}}
@@ -511,7 +511,7 @@ osm-seed:
       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_EMAIL_FROM_ADDRESS: '[email protected]'
       TM_SMTP_HOST: 'email-smtp.us-east-1.amazonaws.com'
       TM_SMTP_PORT: 25
       TM_SMTP_USER: {{MAILER_USERNAME}}

values.staging.template.yaml

@@ -54,7 +54,7 @@ osm-seed:
 
     # Admin Email address used when generating Lets Encrypt certificates.
     # You will be notified of expirations, etc. on this email address.
-    adminEmail: [email protected]
+    adminEmail: [email protected]
     # ====================================================================================================
     # ====================================================================================================
     # ==================================Pods Configurations===============================================
@@ -114,7 +114,7 @@ osm-seed:
         OSM_id_key: {{STAGING_ID_APPLICATION}}
         OAUTH_CLIENT_ID: {{STAGING_OAUTH_CLIENT_ID}}
         OAUTH_KEY: {{STAGING_OAUTH_KEY}}
-        MAILER_FROM: [email protected]
+        MAILER_FROM: [email protected]
         NOMINATIM_URL: nominatim-api.staging.openhistoricalmap.org
         OVERPASS_URL: overpass-api.staging.openhistoricalmap.org	
         NEW_RELIC_LICENSE_KEY: {{STAGING_NEW_RELIC_LICENSE_KEY}}
@@ -286,7 +286,7 @@ osm-seed:
       cronjobs:
       - name: web-db
         enabled: false
-        schedule: '0 0 * * *'
+        schedule: '* * * * *'
         env:
           # backup/restore
           DB_ACTION: backup
@@ -549,7 +549,7 @@ osm-seed:
         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_EMAIL_FROM_ADDRESS: '[email protected]'
         TM_SMTP_HOST: 'email-smtp.us-east-1.amazonaws.com'
         TM_SMTP_PORT: 25
         TM_SMTP_USER: {{MAILER_USERNAME}}