Commit df377f9b authored by okhin's avatar okhin 🚴

Merge branch 'development_features' into 'master'

Development features

See merge request !192
parents 3a595a77 ee7174eb
......@@ -33,3 +33,6 @@ data/
# editors
*~
# local setup
.memopol.alias
#!/bin/bash
# Script to setup few usual aliases to facilitate the development
# This aliases should work if you've installed memopol throught the quickstart
# script or the documentation
# It :
#  - Setup automaticaly the venv
#  - Setup Django in DEBUG mode
# You just need to add a line in you're .bashrc or .zshrc to load them:
REPOROOT="$( readlink -m "${BASH_SOURCE[0]}"/../..)"
ALIASROOT=$REPOROOT"/.memopol.alias"
echo $ALIASROOT
echo "Create a dedicated alias file in $ALIASROOT"
echo "alias memopol-code=\"cd $REPOROOT && source $REPOROOT/memopol_env/bin/activate && DJANGO_DEBUG=True\"" > $ALIASROOT
echo "alias memopol-launch=\"memopol-code && memopol runserver\"" >> $ALIASROOT
echo "alias memopol-update-all=\"memopol-code && bin/update-all\"" >> $ALIASROOT
echo "alias memopol-refresh-scores=\"memopol-code && memopol refresh_scores\"" >> $ALIASROOT
if [ $SHELL = "/bin/bash" ]
then
echo "Bash detected"
echo "Update $HOME/.bashrc file"
RCSHELL="$HOME/.bashrc"
elif [ $SHELL = "/bin/zsh" ]
then
echo "Zsh detected"
echo "Update $HOME/.zshrc file"
RCSHELL="$HOME/.zshrc"
else
echo "SHELL don't supported. Try using BASH or ZSH, or manually."
fi
echo "source $ALIASROOT" >> $RCSHELL
source $ALIASROOT
echo -e "You can use the following aliases :\n"
echo -e "\t memopol-code : Go into the repository and activate the virtualenv"
echo -e "\t memopol-launch : Run the development server"
echo -e "\t memopoll-update-all : Get all the production data"
echo -e "\t memopol-refresh-scores : Refresh all scores"
......@@ -41,6 +41,7 @@ memopol migrate
# Import sample data
memopol loaddata data_sample.json
memopol refresh_scores
echo
echo "You're all set!"
......
......@@ -300,11 +300,15 @@ with open(SECRET_FILE, 'r') as f:
#
# Add allowed hosts from environment
# Automaticaly add 127.0.0.1 in ALLOWED_HOSTS on DEBUG
#
if 'DJANGO_ALLOWED_HOSTS' in os.environ:
ALLOWED_HOSTS += os.environ.get('DJANGO_ALLOWED_HOSTS').split(',')
if DEBUG:
ALLOWED_HOSTS += ['127.0.0.1', 'localhost']
#
# Raven configuration
#
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment