summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAurélien Bompard <aurelien@bompard.org>2015-11-03 23:18:36 +0000
committerAurélien Bompard <aurelien@bompard.org>2015-11-03 23:19:00 +0000
commitf39ea944fb291371a611b1289c4e15521d32f47a (patch)
tree5e707b74fdea83cf40df46974996db9532b6dc0b
parent221419512aba994d0c255a231f73a6b6091b388a (diff)
downloadansible-f39ea944fb291371a611b1289c4e15521d32f47a.tar.gz
ansible-f39ea944fb291371a611b1289c4e15521d32f47a.tar.xz
ansible-f39ea944fb291371a611b1289c4e15521d32f47a.zip
Update the name of the Mailman API credentials
-rw-r--r--roles/mailman/files/settings_test.py6
-rw-r--r--roles/mailman/templates/settings.py.j26
2 files changed, 6 insertions, 6 deletions
diff --git a/roles/mailman/files/settings_test.py b/roles/mailman/files/settings_test.py
index ca4fa6ecb..2277c85c2 100644
--- a/roles/mailman/files/settings_test.py
+++ b/roles/mailman/files/settings_test.py
@@ -18,9 +18,9 @@ DATABASES = {
}
# Mailman API credentials for testing Postorius
-MAILMAN_API_URL = 'http://localhost:9001'
-MAILMAN_USER = 'restadmin'
-MAILMAN_PASS = 'restpass'
+MAILMAN_REST_API_URL = 'http://localhost:9001'
+MAILMAN_REST_API_USER = 'restadmin'
+MAILMAN_REST_API_PASS = 'restpass'
VCR_RECORD_MODE = 'once'
USE_SSL = False
diff --git a/roles/mailman/templates/settings.py.j2 b/roles/mailman/templates/settings.py.j2
index 24bb94a43..53f0c0c65 100644
--- a/roles/mailman/templates/settings.py.j2
+++ b/roles/mailman/templates/settings.py.j2
@@ -38,9 +38,9 @@ BROWSERID_AUDIENCES = [
]
# Mailman API credentials
-MAILMAN_REST_SERVER = MAILMAN_API_URL = 'http://localhost:8001'
-MAILMAN_API_USER = MAILMAN_USER = 'restadmin'
-MAILMAN_API_PASS = MAILMAN_PASS = 'restpass'
+MAILMAN_REST_API_URL = 'http://localhost:8001'
+MAILMAN_REST_API_USER = 'restadmin'
+MAILMAN_REST_API_PASS = 'restpass'
MAILMAN_ARCHIVER_KEY = 'SecretArchiverAPIKey'
MAILMAN_ARCHIVER_FROM = ('127.0.0.1', '::1')