Merge branch 'master' into FF-331_lab_acl

base.ini

@@ -17,7 +17,7 @@ annotations_path = %(here)s/annotations.json
 # XXX really need to reorganise ini files for more reuse
 hostname_command = command -v ec2metadata > /dev/null && ec2metadata --public-hostname || hostname
 
-multiauth.policies = session remoteuser accesskey webuser
+multiauth.policies = auth0 session remoteuser accesskey
 multiauth.groupfinder = encoded.authorization.groupfinder
 
 multiauth.policy.session.namespace = mailto
@@ -33,13 +33,11 @@ multiauth.policy.accesskey.use = encoded.authentication.NamespacedAuthentication
 multiauth.policy.accesskey.base = encoded.authentication.BasicAuthAuthenticationPolicy
 multiauth.policy.accesskey.check = encoded.authentication.basic_auth_check
 
-multiauth.policy.webuser.use = encoded.authentication.NamespacedAuthenticationPolicy
-multiauth.policy.webuser.namespace = webuser
-multiauth.policy.webuser.base = encoded.authentication.WebUserAuthenticationPolicy
+multiauth.policy.auth0.use = encoded.authentication.NamespacedAuthenticationPolicy
+multiauth.policy.auth0.namespace = auth0 
+multiauth.policy.auth0.base = encoded.authentication.Auth0AuthenticationPolicy
 
-#persona.audiences = *.encodedcc.org *.encodeproject.org *.demo.encodedcc.org *.instance.encodedcc.org
-
-#persona.siteName = ENCODE DCC Submission
+auth0.siteName = 4DN DCC Submission
 
 postgresql.statement_timeout = 120
 pyramid.default_locale_name = en

docs/beanstalk-deployment.md.orig

@@ -0,0 +1,32 @@
+TODO: document beanstalk deployment
+
+
+
+## Dropping database
+
+For test environment the database is not dropped for each deploy.  This means that new upserts,
+which change existing data will in most cases not execute succesfully on the test environment.
+
+When that happens we need to drop the database and recreate it, so the inserts can be run.
+
+Easiest way to do that is to ssh into the beanstalk instance and do the follow:
+
+** Note ** to ssh in first `pip install awsebcli` then follow the setup instructions.  With that installed you can simply type eb ssh (ensuring that the master branch is checked out).
+
+Once conneted do the following:
+
+```bash
+source /opt/python/current/env
+sudo services httpd stop
+echo $RDS_PASSWORD
+
+dropdb -p $RDS_PORT -h $RDS_HOSTNAME -U $RDS_USERNAME -e $RDS_DB_NAME
+
+createdb -p $RDS_PORT -h $RDS_HOSTNAME -U $RDS_USERNAME -e $RDS_DB_NAME
+
+sudo shutdown -r now
+```
+
+** Note ** this will temporarily bring the site down, for a couple of minutes
+
+

docs/beanstalk-deployment_BACKUP_44374.md

@@ -0,0 +1,23 @@
+TODO: document beanstalk deployment
+## Dropping database
+
+For test environment the database is not dropped for each deploy.  This means that new upserts,
+which change existing data will in most cases not execute succesfully on the test environment.
+
+When that happens we need to drop the database and recreate it, so the inserts can be run.
+
+Easiest way to do that is to ssh into the beanstalk instance and do the follow:
+
+** Note ** to ssh in first `pip install awsebcli` then follow the setup instructions.  With that installed you can simply type eb ssh (ensuring that the master branch is checked out).
+
+Once conneted do the following:
+
+```bash
+source /opt/python/current/env
+sudo services httpd stop
+echo $RDS_PASSWORD
+
+>>>>>>> e657b55... forcing build
+dropdb -p $RDS_PORT -h $RDS_HOSTNAME -U $RDS_USERNAME -e $RDS_DB_NAME
+
+

docs/beanstalk-deployment_BASE_44374.md

@@ -0,0 +1,31 @@
+TODO: document beanstalk deployment
+
+
+## Dropping database
+
+For test environment the database is not dropped for each deploy.  This means that new upserts,
+which change existing data will in most cases not execute succesfully on the test environment.
+
+When that happens we need to drop the database and recreate it, so the inserts can be run.
+
+Easiest way to do that is to ssh into the beanstalk instance and do the follow:
+
+** Note ** to ssh in first `pip install awsebcli` then follow the setup instructions.  With that installed you can simply type eb ssh (ensuring that the master branch is checked out).
+
+Once conneted do the following:
+
+```bash
+source /opt/python/current/env
+sudo services httpd stop
+echo $RDS_PASSWORD
+
+dropdb -p $RDS_PORT -h $RDS_HOSTNAME -U $RDS_USERNAME -e $RDS_DB_NAME
+
+createdb -p $RDS_PORT -h $RDS_HOSTNAME -U $RDS_USERNAME -e $RDS_DB_NAME
+
+sudo shutdown -r now
+```
+
+** Note ** this will temporarily bring the site down, for a couple of minutes
+
+