Commit 7f6be6e8 authored by Yuri Konotopov's avatar Yuri Konotopov

settings: added ability to configure email settings using URL.

Added openshift and docker environment variables.
parent c26fa8a7
......@@ -24,6 +24,7 @@ services:
EGO_ADMINISTRATOR_EMAIL: ykonotopov@gnome.org
EGO_ALLOWED_HOST:
EGO_DATABASE_URL:
EGO_EMAIL_URL:
EGO_SECRET_KEY:
EGO_XAPIAN_DB:
EGO_MEDIA_ROOT: /extensions-web/www/uploaded-files
......
......@@ -44,6 +44,7 @@
},
"stringData": {
"database-url": "${EGO_DATABASE_URL}",
"email-url": "${EGO_EMAIL_URL}",
"secret-key": "${EGO_SECRET_KEY}"
}
},
......@@ -402,6 +403,15 @@
}
}
},
{
"name": "EGO_EMAIL_URL",
"valueFrom": {
"secretKeyRef" : {
"name" : "${NAME}",
"key" : "email-url"
}
}
},
{
"name": "EGO_SECRET_KEY",
"valueFrom": {
......@@ -555,6 +565,15 @@
}
}
},
{
"name": "EGO_EMAIL_URL",
"valueFrom": {
"secretKeyRef" : {
"name" : "${NAME}",
"key" : "email-url"
}
}
},
{
"name": "EGO_SECRET_KEY",
"valueFrom": {
......@@ -663,6 +682,15 @@
}
}
},
{
"name": "EGO_EMAIL_URL",
"valueFrom": {
"secretKeyRef" : {
"name" : "${NAME}",
"key" : "email-url"
}
}
},
{
"name": "EGO_SECRET_KEY",
"valueFrom": {
......@@ -807,6 +835,12 @@
"description": "Database URL in format suitable for dj-database-url",
"value": ""
},
{
"name": "EGO_EMAIL_URL",
"displayName": "Email URL",
"description": "Email URL in format suitable for dj-email-url",
"value": ""
},
{
"name": "EGO_NODE_ADDRESS",
"displayName": "Address of extensions-web container",
......
......@@ -6,3 +6,4 @@ Pygments >= 1.4
pillow >= 2.0.0
chardet >= 2.2.1
dj-database-url
dj-email-url
......@@ -196,6 +196,9 @@ LOGGING = {
}
DEFAULT_FROM_EMAIL = "noreply@gnome.org"
if os.getenv('EGO_EMAIL_URL'):
import dj_email_url
vars().update(dj_email_url.parse(os.getenv('EGO_EMAIL_URL')))
NO_SECURE_SETTINGS = False
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment