From ac35c30f3d85ccde286c5a020bb3d87b4229e95d Mon Sep 17 00:00:00 2001 From: Marc-Antoine Parent Date: Thu, 1 Jun 2017 17:34:21 -0400 Subject: [PATCH] separate saml random --- configs/base_env.rc | 2 +- configs/develop.rc | 4 ++-- random.ini.tmpl | 2 -- saml_random.ini.tmpl | 3 +++ 4 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 saml_random.ini.tmpl diff --git a/configs/base_env.rc b/configs/base_env.rc index 6f13becb0f..dfe3351faa 100644 --- a/configs/base_env.rc +++ b/configs/base_env.rc @@ -1,4 +1,4 @@ -ini_files = production.ini RANDOM RC_DATA +ini_files = production.ini RANDOM:random.ini.tmpl RANDOM:saml_random.ini.tmpl RC_DATA *db_host = localhost *db_user = assembl # TODO: If generated remotely, fetch in fabfile diff --git a/configs/develop.rc b/configs/develop.rc index 90def4b70d..5f019a5643 100644 --- a/configs/develop.rc +++ b/configs/develop.rc @@ -1,5 +1,5 @@ _extends = base_env.rc -ini_files = production.ini develop_overlay.ini RANDOM RC_DATA +ini_files = production.ini develop_overlay.ini RANDOM:random.ini.tmpl RC_DATA # ZMQ model changes local socket (backend will connect to this) # UNIQUE_PER_SERVER # Convention: @@ -10,7 +10,7 @@ redis_socket = 0 # Change this to the port visible from the outside # Typically 80 for prod, 6543 for dev # In dev, will often match server:main__port unless proxying -public_port = $(port)s +public_port = 6543 # Other public_port values # public_port = 9991 # public_port = 8080 diff --git a/random.ini.tmpl b/random.ini.tmpl index 086a2e46b1..72a18e69d6 100644 --- a/random.ini.tmpl +++ b/random.ini.tmpl @@ -3,5 +3,3 @@ security.email_token_salt = {random66} beaker.session.validate_key = {random66} beaker.session.encrypt_key = {random66} beaker.session.secret = {random66} -SOCIAL_AUTH_SAML_SP_PUBLIC_CERT = {saml_cert} -SOCIAL_AUTH_SAML_SP_PRIVATE_KEY = {saml_key} diff --git a/saml_random.ini.tmpl b/saml_random.ini.tmpl new file mode 100644 index 0000000000..50439ed502 --- /dev/null +++ b/saml_random.ini.tmpl @@ -0,0 +1,3 @@ +[app:assembl] +SOCIAL_AUTH_SAML_SP_PUBLIC_CERT = {saml_cert} +SOCIAL_AUTH_SAML_SP_PRIVATE_KEY = {saml_key}