Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

removed AWS and SECRET keys from settings, to be provided for by puppet

  • Loading branch information...
commit 68019335708fccacc2951d6e437a6af533c5111c 1 parent e33c4f2
@oppianmatt oppianmatt authored
View
19 oppianproj/settings.py
@@ -65,23 +65,10 @@
# add the template context processor for the latest tweet
TEMPLATE_CONTEXT_PROCESSORS = TEMPLATE_CONTEXT_PROCESSORS + (
- "twitterapp.context_processors.latest_tweet",
"oppianapp.context_processors.settings",
'django.core.context_processors.request',
)
-# the twitter email account of the site
-TWITTER_EMAIL = "twitter-test@oppian.com"
-TWITTER_USER = "oppian"
-#TWITTER_EMAIL = "twitter@oppian.com"
-# the password for the account referenced by the twitter email address above
-TWITTER_PASSWORD = "metef62" # oppian-test
-#TWITTER_PASSWORD = "deteenee52" # oppian
-# the name of the agent making the requests
-TWITTER_AGENT_STR = "www.oppian.com"
-# how often to check the tweet status
-TWITTER_TIMEOUT = 3600
-
# URL that handles the media served from MEDIA_ROOT. Make sure to use a
# trailing slash if there is a path component (optional in other cases).
# Examples: "http://media.lawrence.com", "http://example.com/media/"
@@ -93,7 +80,7 @@
ADMIN_MEDIA_PREFIX = MEDIA_URL + 'admin/'
# Make this unique, and don't share it with anybody.
-SECRET_KEY = '4tt(s*od&lp(6wrd#iwq=vmot%#9nfl%00k=q5$eplz3lkgr0z'
+# SECRET_KEY = '' # provided by puppet
# List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = (
@@ -161,10 +148,6 @@
'south',
)
-# AWS
-AWS_ACCESS_KEY_ID = '1EZPW78HVZMFXZXJXAR2'
-AWS_SECRET_ACCESS_KEY = 'ZXslmLM93TYrGA33GFyzIozSSN4VH1wrNXzyjXIt'
-
# build
AWS_BUILD_BUCKET_NAME = 'oppian-website-releases'
BUILD_VERSION = ('0', '2')
View
22 oppianproj/settings_production.py
@@ -1,22 +0,0 @@
-
-DEBUG = False
-TEMPLATE_DEBUG = DEBUG
-
-DATABASE_ENGINE = 'postgresql_psycopg2' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-DATABASE_NAME = 'oppian' # Or path to database file if using sqlite3.
-DATABASE_USER = 'oppian' # Not used with sqlite3.
-DATABASE_PASSWORD = 'ceelness22' # Not used with sqlite3.
-DATABASE_HOST = 'localhost' # Set to empty string for localhost. Not used with sqlite3.
-DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3.
-
-# the twitter email account of the site
-TWITTER_EMAIL = "twitter@oppian.com"
-TWITTER_USER = "oppian"
-# the password for the account referenced by the twitter email address above
-TWITTER_PASSWORD = "deteenee52" # oppian
-# the name of the agent making the requests
-TWITTER_AGENT_STR = "oppian.com"
-# how often to check the tweet status
-
-# s3 storage
-AWS_STORAGE_BUCKET_NAME = 'oppian-prod-files'
View
23 oppianproj/settings_template.py
@@ -1,23 +0,0 @@
-
-DEBUG = $DEBUG
-TEMPLATE_DEBUG = DEBUG
-
-DATABASE_ENGINE = 'postgresql_psycopg2' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-DATABASE_NAME = '$DB_NAME' # Or path to database file if using sqlite3.
-DATABASE_USER = '$DB_USER' # Not used with sqlite3.
-DATABASE_PASSWORD = '$DB_PASS' # Not used with sqlite3.
-DATABASE_HOST = '$DB_HOST' # Set to empty string for localhost. Not used with sqlite3.
-DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3.
-
-SITE_DOMAIN = "$SITE_DOMAIN"
-
-# the twitter email account of the site
-TWITTER_EMAIL = "twitter@oppian.com"
-TWITTER_USER = "oppian"
-# the password for the account referenced by the twitter email address above
-TWITTER_PASSWORD = "deteenee52" # oppian
-# the name of the agent making the requests
-TWITTER_AGENT_STR = "oppian.com"
-
-# s3 storage
-AWS_STORAGE_BUCKET_NAME = 'oppian-prod-files'
View
14 puppet/modules/oppian/templates/settings.py.erb
@@ -11,13 +11,9 @@ DATABASE_PORT = ''
SITE_DOMAIN = "<%= cfn_hostname %>"
-# the twitter email account of the site
-TWITTER_EMAIL = "twitter@oppian.com"
-TWITTER_USER = "oppian"
-# the password for the account referenced by the twitter email address above
-TWITTER_PASSWORD = "deteenee52" # oppian
-# the name of the agent making the requests
-TWITTER_AGENT_STR = "oppian.com"
-
# s3 storage
-AWS_STORAGE_BUCKET_NAME = 'oppian-prod-files'
+AWS_STORAGE_BUCKET_NAME = '<%= cfn_s3_bucket %>'
+
+SECRET_KEY = '<%= cfn_secret_key %>'
+AWS_ACCESS_KEY_ID = '<%= cfn_aws_key %>'
+AWS_SECRET_ACCESS_KEY = '<%= cfn_aws_secret_key %>'
Please sign in to comment.
Something went wrong with that request. Please try again.