Commit Graph

61 Commits

Author SHA1 Message Date
Feanil Patel
729f2e3bfa Merge pull request #1637 from edx/feanil/aws_creds
Set empty aws credentials to None.
2013-11-20 07:57:16 -08:00
John Jarvis
693cfdea50 'ignore' shouldn't be use for ascii conversion
The input string is not expected to contain any unicode characters
2013-11-19 14:34:06 -05:00
John Jarvis
71184220e6 convert STATIC_URL to ascii 2013-11-19 12:25:59 -05:00
John Jarvis
0e6b21ef71 adding slash 2013-11-19 11:40:31 -05:00
John Jarvis
54bb55fa52 fixes issue where STATIC_URL was overwritten without git.revision
fixes this commit - 5ec77010e3
2013-11-19 11:35:45 -05:00
John Jarvis
399df1141e resolving merge conflicts 2013-11-18 11:52:26 -05:00
John Jarvis
f5a772135d adding override for GITHUB_REPO_ROOT
This is the base directory for course data
2013-11-18 11:24:45 -05:00
John Jarvis
5ec77010e3 allow override for STATIC_URL 2013-11-18 10:54:12 -05:00
Feanil Patel
9dd182800b Set empty aws credentials to None. 2013-11-08 12:22:09 -05:00
John Jarvis
68d31b9808 adding STATIC_ROOT_BASE to lms/envs/aws.py 2013-10-23 10:30:05 -04:00
John Jarvis
25c6f9455b fixes static_root override 2013-10-23 10:28:09 -04:00
John Jarvis
1ac732abb4 adding git.revision for cms 2013-10-22 12:08:48 -04:00
John Jarvis
8ca156bd00 adding STATIC_ROOT to cms 2013-10-21 14:41:00 -04:00
Carlos Andrés Rocha
0be9daf9d5 Merge pull request #1419 from rocha/fix-config-root-env
Fix error when reading tokens on aws configuration
2013-10-21 08:24:15 -07:00
e0d
e6955c641f The default value was removed from common. 2013-10-21 10:45:05 -04:00
Carlos Andrés Rocha
b764b9b4cf Fix error when reading tokens on aws configuration
The error was caused by the CONFIG_ROOT environmental variable,
which was incorrectly assumed to be a path.py valid path.
2013-10-21 03:19:22 -04:00
e0d
5995a76254 sanity restored. 2013-10-18 16:26:23 -04:00
e0d
a008cc6b74 path fix. 2013-10-18 16:12:51 -04:00
e0d
6700a3ec14 Fixes for the AWS environment config. 2013-10-18 15:56:15 -04:00
Carlos Andrés Rocha
f2bf95b205 Add variable to set location of config files on aws
The env variable CONFIG_ROOT is used to determine the location of the
JSON configuration files. This is useful when a deployment of the
platform is used to access different environments when executing django
commands.
2013-10-08 14:46:18 -04:00
Gabe Mulley
761a4dcc97 Make URL patterns to exclude from tracking configurable
* Add unit test coverage for this "exclusion from tracking" logic
* Exclude based on regex match instead of raw string comparison
* Exclude heartbeat requests from tracking
2013-09-13 11:24:51 -04:00
Sarina Canelake
484bc91ab3 Don't assign variable to .update() call 2013-09-12 16:03:22 -04:00
Carlos Andrés Rocha
87fcf1ab9e Merge pull request #905 from rocha/datadog-statsd
Remove dogstatsd-python in favor of dogapi
2013-09-12 06:53:02 -07:00
Carlos Andrés Rocha
ee0004e2f8 Remove dogstatsd-python in favor of dogapi
Also added datadog application to commom django apps and set it to use
a local statsd server by default.
2013-09-11 19:28:58 -04:00
Carlos Andrés Rocha
fbc243dbeb Add event tracking with configurable backends 2013-09-11 10:02:15 -04:00
Chris Dodge
0da2fb842f Add new setting to cms project 2013-08-12 13:29:15 -04:00
Jason Bau
034de2cfd2 Allow session backend to be configurable and also add PLATFORM_NAME
to cms settings (it was throwing 500s for Stanford when the CMS
calls render_from_lms)
2013-07-19 17:43:37 -07:00
John Jarvis
5b16fbe369 adding option for file based backend 2013-07-10 16:05:37 -04:00
Carlos Andrés Rocha
1fbab8e9fa Merge pull request #295 from edx/rocha/celery-virtual-host
Add setting to set the virtual host of a Celery broker
2013-07-08 06:58:31 -07:00
Chris Dodge
a224c1e8a3 need to change aws.py to take the COURSES_WITH_UNSAFE_CODE from the envs.json file 2013-07-03 14:01:33 -04:00
Carlos Andrés Rocha
a844548fb8 Add setting to set the virtual host of a Celery broker 2013-06-27 17:58:51 -04:00
John Jarvis
a3f45bd94a moving segment io setting below auth.json 2013-06-17 17:45:22 -04:00
Renzo Lucioni
97f4291b2a Add comment clarifying which Segment.io key is in use 2013-06-17 15:35:04 -04:00
Renzo Lucioni
1e3efadc28 switch to using environment variables to get key for Segment.io 2013-06-17 10:58:37 -04:00
John Jarvis
713d78002d read MKTG_URLS from env.json 2013-06-06 09:50:43 -04:00
Chris Dodge
ffdeac3dcd seems like there's a Django bug and the SESSION_COOKIE_NAME needs to be an explicit str() 2013-06-05 14:31:32 -04:00
Chris Dodge
6fb97d52c0 fix typos 2013-06-05 11:21:35 -04:00
Chris Dodge
4bade8d286 allow configuration settings to specify a session cookie name. This is to avoid problems we are experiencing between simultaneous login sessions between edx.org and edge.edx.org on certain browsers (i.e. Firefox) 2013-06-05 10:30:28 -04:00
cahrens
e0bb4ad4dd Preview url is read in from environment file. 2013-05-28 12:04:48 -04:00
cahrens
a03a4fdd07 PREVIEW_LMS_BASE must now be set (default value does not work for both edge and edx). Make this work locally as well.
https://edx.lighthouseapp.com/projects/102637/tickets/331
2013-05-23 16:45:10 -04:00
Calen Pennington
241ef68f4f Start linting envs files, add task to only pylint errors, and move pylintrc file to the correct location 2013-05-21 09:34:12 -04:00
Carlos Andrés Rocha
34d39dde9a Set the default celery queue name in addition to the default routing key 2013-05-17 17:59:51 -04:00
Carlos Andrés Rocha
c05efbc31e Added base Celery settings 2013-05-17 11:33:14 -04:00
Jason Bau
408e26a0c1 parameterizes CMS email settings 2013-05-10 13:42:28 -07:00
Chris Dodge
6d6b3a59fe violation fixes 2013-04-12 15:27:36 -04:00
Mark L. Chang
10377bc41c added a dummy key for segment.io so it doesn't ever fail 2013-04-04 16:08:10 -04:00
Mark L. Chang
8439013f64 studio: added segment.io tracking 2013-04-04 01:51:14 -04:00
Calen Pennington
cd802d8e14 Add datadog metrics capture around heartbeat timing 2013-03-08 10:36:59 -05:00
John Jarvis
bff477e8d3 Removing repos.json import 2013-02-05 11:35:12 -05:00
John Jarvis
f525b17b1a pep8 cleanup 2013-02-01 13:13:16 -05:00