Skip to content

Commit 1c7e28e

Browse files
author
Peter Bengtsson
authored
bug 1371385 - Call it Localdev instead of Dev (mozilla-services#152)
1 parent 35a2eb9 commit 1c7e28e

File tree

8 files changed

+21
-16
lines changed

8 files changed

+21
-16
lines changed

.env-dist

+4-6
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@ AWS_ACCESS_KEY_ID=
1111
AWS_SECRET_ACCESS_KEY=
1212
AWS_DEFAULT_REGION=us-west-2
1313

14-
#DJANGO_SENTRY_DSN=....
15-
#DJANGO_SENTRY_PUBLIC_DSN=....
16-
17-
#DJANGO_STATSD_HOST=localhost
18-
#DJANGO_STATSD_PORT=8125
19-
#DJANGO_STATSD_NAMESPACE=
14+
# Sentry is not used when doing local development.
15+
#SENTRY_DSN=....
16+
#SENTRY_PUBLIC_DSN=....
2017

18+
# Get these settings from Auth0 or some provider you use.
2119
#DJANGO_OIDC_RP_CLIENT_ID=
2220
#DJANGO_OIDC_RP_CLIENT_SECRET=
2321

Dockerfile.dev

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM tecken:deploy_base
22

3-
ENV DJANGO_CONFIGURATION=Dev
3+
ENV DJANGO_CONFIGURATION=Localdev
44

55
EXPOSE $PORT
66

docs/configuration.rst

+3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ this to ``Prod`` and the ``Dockerfile.dev`` overrides it to ``Dev``.
3131
# If stage
3232
DJANGO_CONFIGURATION=Stage
3333
34+
# If development server
35+
DJANGO_CONFIGURATION=Dev
36+
3437
You need to set a random ``DJANGO_SECRET_KEY``. It should be predictably
3538
random and a decent length:
3639

docs/deployment.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Mozilla Symbol Server is deployed in 3 different environments:
1111

1212
1. Production (https://symbols.mozilla.org SOON!)
1313

14-
2. Stage (DOMAIN TO BE DECIDED)
14+
2. Stage (https://symbols.stage.mozaws.net)
1515

1616
3. Dev (https://symbols.dev.mozaws.net)
1717

manage.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
if __name__ == '__main__':
1111
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'tecken.settings')
12-
os.environ.setdefault('DJANGO_CONFIGURATION', 'Dev')
12+
os.environ.setdefault('DJANGO_CONFIGURATION', 'Localdev')
1313

1414
from configurations.management import execute_from_command_line
1515

tecken/celery.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99

1010
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'tecken.settings')
11-
os.environ.setdefault('DJANGO_CONFIGURATION', 'Dev')
11+
os.environ.setdefault('DJANGO_CONFIGURATION', 'Localdev')
1212

1313

1414
import configurations # noqa

tecken/settings.py

+9-5
Original file line numberDiff line numberDiff line change
@@ -427,8 +427,8 @@ def LOGGING(self):
427427
]
428428

429429

430-
class Dev(Base):
431-
"""Configuration to be used during development and base class
430+
class Localdev(Base):
431+
"""Configuration to be used during local development and base class
432432
for testing"""
433433

434434
@classmethod
@@ -486,7 +486,7 @@ def VERSION(self):
486486
]
487487

488488

489-
class Test(Dev):
489+
class Test(Localdev):
490490
"""Configuration to be used during testing"""
491491
DEBUG = False
492492

@@ -519,8 +519,8 @@ class Test(Dev):
519519
}
520520

521521

522-
class Stage(Base):
523-
"""Configuration to be used in stage environment"""
522+
class Dev(Base):
523+
"""Configuration to be used in dev server environment"""
524524

525525
LOGGING_USE_JSON = True
526526

@@ -596,6 +596,10 @@ def MARKUS_BACKENDS(self):
596596
]
597597

598598

599+
class Stage(Dev):
600+
"""Configuration to be used in stage environment"""
601+
602+
599603
class Prod(Stage):
600604
"""Configuration to be used in prod environment"""
601605

tecken/wsgi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"""
1212
import os
1313
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'tecken.settings')
14-
os.environ.setdefault('DJANGO_CONFIGURATION', 'Dev')
14+
os.environ.setdefault('DJANGO_CONFIGURATION', 'Localdev')
1515

1616
from configurations.wsgi import get_wsgi_application # noqa
1717

0 commit comments

Comments
 (0)