separate saml random

assembl · Jun 20, 2017 · ac35c30 · ac35c30
1 parent 5653bf3
commit ac35c30
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -0,0 +1,3 @@
+[app:assembl]
+SOCIAL_AUTH_SAML_SP_PUBLIC_CERT = {saml_cert}
+SOCIAL_AUTH_SAML_SP_PRIVATE_KEY = {saml_key}