Skip to content

Commit

Permalink
Don't overwrite DJANGO_SETTINGS_MODULE
Browse files Browse the repository at this point in the history
When deploying praktomat via git changes to the file
/src/settings/local.py might cause merge conflicts.
A possible solution to this is to configure
the settings file in the apache config. For instance
```
SetEnv DJANGO_SETTINGS_MODULE settings.local
```

See also KITPraktomatTeam#259
  • Loading branch information
physikerwelt committed May 12, 2017
1 parent 0b416bc commit f8d9903
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion wsgi/praktomat.wsgi
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python
import os
from os.path import join, dirname
os.environ['DJANGO_SETTINGS_MODULE'] = 'settings.local'
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'settings.local')

import site
site.addsitedir(join(dirname(dirname(dirname(__file__))), "env", "lib", "python2.7","site-packages"))
Expand Down

0 comments on commit f8d9903

Please sign in to comment.