Merge branch 'Qwann/mv_root' into 'master'

rename app evenementiel to poulpe

See merge request cof-geek/GestionEvenementiel!27
This commit is contained in:
Erkan Narmanli 2018-08-20 14:36:12 +02:00
commit 20fad42d6d
14 changed files with 13 additions and 13 deletions

2
.gitignore vendored
View file

@ -1,7 +1,7 @@
.vagrant/
__pycache__
venv
evenementiel/settings.py
poulpe/settings.py
.*.swp
*.pyc
*.sqlite3

View file

@ -3,7 +3,7 @@ import os
import sys
if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "evenementiel.settings.devlocal")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "poulpe.settings.devlocal")
from django.core.management import execute_from_command_line

View file

@ -2,6 +2,6 @@ import os
from channels.asgi import get_channel_layer
if "DJANGO_SETTINGS_MODULE" not in os.environ:
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "evenementiel.settings")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "poulpe.settings")
channel_layer = get_channel_layer()

View file

@ -99,7 +99,7 @@ REST_FRAMEWORK = {
'TEST_REQUEST_DEFAULT_FORMAT': 'json',
}
ROOT_URLCONF = 'evenementiel.urls'
ROOT_URLCONF = 'poulpe.urls'
STATIC_URL = "/static/"
MEDIA_URL = "/media/"
@ -147,7 +147,7 @@ DATABASES = {
# port=REDIS_PORT, db=REDIS_DB)
# )],
# },
# "ROUTING": "evenementiel.routing.channel_routing",
# "ROUTING": "poulpe.routing.channel_routing",
# }
# }

View file

@ -18,6 +18,6 @@ DATABASES = {
CHANNEL_LAYERS = {
"default": {
"BACKEND": "asgiref.inmemory.ChannelLayer",
"ROUTING": "evenementiel.routing.channel_routing",
"ROUTING": "poulpe.routing.channel_routing",
},
}

View file

@ -1,5 +1,5 @@
"""
WSGI config for evenementiel project.
WSGI config for GestionEvenementiel project.
It exposes the WSGI callable as a module-level variable named ``application``.
@ -11,6 +11,6 @@ import os
from django.core.wsgi import get_wsgi_application
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "evenementiel.settings")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "poulpe.settings")
application = get_wsgi_application()

View file

@ -10,7 +10,7 @@ DBPASSWD="4KZt3nGPLVeWSvtBZPsd9jdssdJMds78"
REDIS_PASSWD="dummy"
# It is used in quite a few places
SETTINGS="evenementiel.settings.dev"
SETTINGS="poulpe.settings.dev"
# Fills a "templated file" with the information specified in the variables above
# e.g. every occurrence of {{DBUSER}} in the file will be replaced by the value
@ -90,9 +90,9 @@ redis-cli -a $REDIS_PASSWD CONFIG REWRITE
cd /vagrant
# Setup the secrets
sudo -H -u vagrant cp evenementiel/settings/secret_example.py \
evenementiel/settings/secret.py
fill_template evenementiel/settings/secret.py
sudo -H -u vagrant cp poulpe/settings/secret_example.py \
poulpe/settings/secret.py
fill_template poulpe/settings/secret.py
# Run the usual django admin commands
function venv_python {

View file

@ -10,7 +10,7 @@ TimeoutSec=300
WorkingDirectory=/vagrant
Environment="DJANGO_SETTINGS_MODULE={{SETTINGS}}"
ExecStart=/home/vagrant/venv/bin/daphne -u /srv/GE/GE.sock \
evenementiel.asgi:channel_layer
poulpe.asgi:channel_layer
[Install]
WantedBy=multi-user.target