# HG changeset patch
# User David Douard <david.douard@logilab.fr>
# Date 1456153030 -3600
# Node ID c3a583e38360354649b5f8d86093bc857102fa53
# Parent  2018cdf2909eddf03aa5b30d77cc80168a1489fe
[cfg] remove the pyramid-{auth,session}-secret config options (closes #11027189)

these should now be set in the pyramid.ini config file.

diff -r 2018cdf2909e -r c3a583e38360 migration/0.4.0_Any.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/migration/0.4.0_Any.py	Mon Feb 22 15:57:10 2016 +0100
@@ -0,0 +1,10 @@
+
+# just notify the user to put the secret keys in pyramid.ini
+
+print("The pyramid-auth-secret and pyramid-session-secret options has been\n"
+      "removed from the all-in-one.conf file in favor of the pyramid.ini config\n"
+      "file. Make sure to set \n"
+      "  cubicweb.session.secret, \n"
+      "  cubicweb.auth.authtkt.persistent.secret and \n"
+      "  cubicweb.auth.authtkt.session.secret \n"
+      "keys in your $APP/pyramid.ini file.")
diff -r 2018cdf2909e -r c3a583e38360 site_cubicweb.py
--- a/site_cubicweb.py	Tue Dec 15 12:14:47 2015 +0100
+++ b/site_cubicweb.py	Mon Feb 22 15:57:10 2016 +0100
@@ -1,22 +1,4 @@
-from logilab.common.configuration import REQUIRED
-
 import cubicweb.schema
 
 cubicweb.schema.INTERNAL_TYPES.add('CWSession')
 
-options = (
-    ('pyramid-auth-secret', {
-        'type': 'string',
-        'default': REQUIRED,
-        'help': 'Secret phrase to encrypt the authentication cookie',
-        'group': 'pyramid',
-        'level': 3
-    }),
-    ('pyramid-session-secret', {
-        'type': 'string',
-        'default': REQUIRED,
-        'help': 'Secret phrase to sign the session cookie',
-        'group': 'pyramid',
-        'level': 3
-    }),
-)