Commit 60286cca authored by Vincent Le gallic's avatar Vincent Le gallic

Déplacement du contenu de <root>/Django_Client dans <root>

Ça simplifie pas mal la conf, et on arrête de faire des horreurs
du genre import Django_Client.bidule
parent f38ddaf4
......@@ -4,7 +4,7 @@
media/photos/*
# Le fichier de secrets
Django_Client/secrets.py
secrets.py
# Compiled source #
###################
......
#!/usr/bin/env python
# -*- encoding: utf-8 -*-
# Django settings for Django_Client project.
DEFAULT_CHARSET = "utf-8"
DEBUG = True
TEMPLATE_DEBUG = DEBUG
ADMINS = (
('20-100', 'legallic@crans.org'),
# ('Your Name', 'your_email@example.com'),
)
MANAGERS = ADMINS
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
'NAME': 'django_client', # Or path to database file if using sqlite3.
'USER': 'note', # Not used with sqlite3.
'PASSWORD': '', # Not used with sqlite3.
'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
'PORT': '', # Set to empty string for default. Not used with sqlite3.
}
}
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# although not all choices may be available on all operating systems.
# On Unix systems, a value of None will cause Django to use the same
# timezone as the operating system.
# If running in a Windows environment this must be set to the same as your
# system time zone.
TIME_ZONE = 'Europe/Paris'
# Language code for this installation. All choices can be found here:
# http://www.i18nguy.com/unicode/language-identifiers.html
LANGUAGE_CODE = 'fr-FR'
SITE_ID = 1
# If you set this to False, Django will make some optimizations so as not
# to load the internationalization machinery.
USE_I18N = True
# If you set this to False, Django will not format dates, numbers and
# calendars according to the current locale.
USE_L10N = True
# If you set this to False, Django will not use timezone-aware datetimes.
USE_TZ = True
# Absolute filesystem path to the directory that will hold user-uploaded files.
# Example: "/home/media/media.lawrence.com/media/"
MEDIA_ROOT = ''
# URL that handles the media served from MEDIA_ROOT. Make sure to use a
# trailing slash.
# Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
MEDIA_URL = ''
# Absolute path to the directory static files should be collected to.
# Don't put anything in this directory yourself; store your static files
# in apps' "static/" subdirectories and in STATICFILES_DIRS.
# Example: "/home/media/media.lawrence.com/static/"
STATIC_ROOT = ''
# URL prefix for static files.
# Example: "http://media.lawrence.com/static/"
STATIC_URL = '/static/'
# Additional locations of static files
STATICFILES_DIRS = (
# Put strings here, like "/home/html/static" or "C:/www/django/static".
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.
)
# List of finder classes that know how to find static files in
# various locations.
STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
# 'django.contrib.staticfiles.finders.DefaultStorageFinder',
)
# Make this unique, and don't share it with anybody.
SECRET_KEY = 'fuck you haha'
# List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
# 'django.template.loaders.eggs.Loader',
)
MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
# Uncomment the next line for simple clickjacking protection:
# 'django.middleware.clickjacking.XFrameOptionsMiddleware',
)
ROOT_URLCONF = 'Django_Client.urls'
# Python dotted path to the WSGI application used by Django's runserver.
WSGI_APPLICATION = 'Django_Client.wsgi.application'
TEMPLATE_DIRS = (
"/home/vincent/note/new_note/Django_Client/templates"
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.
)
INSTALLED_APPS = (
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.sites',
'django.contrib.messages',
'django.contrib.staticfiles',
# Uncomment the next line to enable the admin:
'django.contrib.admin',
# Uncomment the next line to enable admin documentation:
# 'django.contrib.admindocs',
'note',
)
# A sample logging configuration. The only tangible logging
# performed by this configuration is to send an email to
# the site admins on every HTTP 500 error when DEBUG=False.
# See http://docs.djangoproject.com/en/dev/topics/logging for
# more details on how to customize your logging configuration.
LOGGING = {
'version': 1,
'disable_existing_loggers': False,
'filters': {
'require_debug_false': {
'()': 'django.utils.log.RequireDebugFalse'
}
},
'handlers': {
'mail_admins': {
'level': 'ERROR',
'filters': ['require_debug_false'],
'class': 'django.utils.log.AdminEmailHandler'
}
},
'loggers': {
'django.request': {
'handlers': ['mail_admins'],
'level': 'ERROR',
'propagate': True,
},
}
}
# ttl des cookies en secondes
SESSION_COOKIE_AGE=60
......@@ -3,7 +3,7 @@ import os
import sys
if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Django_Client.settings")
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
from django.core.management import execute_from_command_line
......
......@@ -3,7 +3,7 @@
from django.db import models
from django import forms
import Django_Client.settings as settings
import settings
import re, time, datetime
......@@ -369,4 +369,4 @@ class CreditRetraitForm(forms.Form):
out["montant"] = int(100 * out["montant"])
else:
out["montant"] = 0
return out
\ No newline at end of file
return out
......@@ -2,7 +2,6 @@
# -*- encoding: utf-8 -*-
# Django settings for Django_Client project.
DEFAULT_CHARSET = "utf-8"
DEBUG = True
TEMPLATE_DEBUG = DEBUG
......@@ -13,7 +12,9 @@ ADMINS = (
# ('Your Name', 'your_email@example.com'),
)
NOTE_ROOT_URL=r'/note/'
NOTE_ROOT_URL = r'/note/'
ROOT_PATH = "/home/note/Django_Client/"
SERVER_EMAIL = "notekfet2015@crans.org"
MANAGERS = ADMINS
......@@ -57,7 +58,7 @@ USE_TZ = True
# Absolute filesystem path to the directory that will hold user-uploaded files.
# Example: "/home/media/media.lawrence.com/media/"
MEDIA_ROOT = '/home/note/Django_Client/media/'
MEDIA_ROOT = ROOT_PATH + 'media/'
# URL that handles the media served from MEDIA_ROOT. Make sure to use a
# trailing slash.
......@@ -68,7 +69,7 @@ MEDIA_URL = NOTE_ROOT_URL + 'media/'
# Don't put anything in this directory yourself; store your static files
# in apps' "static/" subdirectories and in STATICFILES_DIRS.
# Example: "/home/media/media.lawrence.com/static/"
#STATIC_ROOT = '/home/note/Django_Client/static/'
#STATIC_ROOT = ROOT_PATH + 'static/'
# URL prefix for static files.
# Example: "http://media.lawrence.com/static/"
......@@ -76,7 +77,7 @@ STATIC_URL = '/static/'
# Additional locations of static files
STATICFILES_DIRS = (
"/home/note/Django_Client/static/",
ROOT_PATH + "static/",
# Put strings here, like "/home/html/static" or "C:/www/django/static".
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.
......@@ -120,13 +121,13 @@ MIDDLEWARE_CLASSES = (
# 'django.middleware.clickjacking.XFrameOptionsMiddleware',
)
ROOT_URLCONF = 'Django_Client.urls'
ROOT_URLCONF = 'urls'
# Python dotted path to the WSGI application used by Django's runserver.
WSGI_APPLICATION = 'Django_Client.wsgi.application'
WSGI_APPLICATION = 'wsgi.application'
TEMPLATE_DIRS = (
"/home/note/Django_Client/templates"
ROOT_PATH + "templates/"
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.
......@@ -245,4 +246,4 @@ SUCCMSG_CHGBUTTON = u"Bouton modifié avec succès."
SUCCMSG_DELBUTTON = u"Bouton supprimé avec succès."
SUCCMSG_PREINSCRIPTION_ADDED = u"Préinscription ajoutée avec succès."
SUCCMSG_PREINSCRIPTION_DELETED = u"Préinscription supprimée avec succès."
SUCCMSG_PHOTO_UPDATED = u"Photo modifiée avec succès."
\ No newline at end of file
SUCCMSG_PHOTO_UPDATED = u"Photo modifiée avec succès."
......@@ -19,7 +19,7 @@ import os
# ligne qui était là au départ, je l'ai virée parce que ça avait pas l'air
# d'importer ce qu'il fallait
#os.environ.setdefault("DJANGO_SETTINGS_MODULE", "Django_Client.settings")
#os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
# à la place, on va récupérer le path du dossier du fichier courant
here=os.path.dirname( os.path.realpath( __file__ ) )
......
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