diff --git a/.gitignore b/.gitignore index 891ef6fc..754e4d4d 100644 --- a/.gitignore +++ b/.gitignore @@ -32,4 +32,4 @@ nosetests.xml # Django files local_settings.py -aps42.sqlite3 +calebasse.sqlite3 diff --git a/MANIFEST.in b/MANIFEST.in index 3f20424a..3a812f31 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ include README INSTALL LICENSE AUTHORS recursive-include mockups * -recursive-include aps42/*/static * -recursive-include aps42/*/templates * +recursive-include calebasse/*/static * +recursive-include calebasse/*/templates * diff --git a/aps42/__init__.py b/calebasse/__init__.py similarity index 100% rename from aps42/__init__.py rename to calebasse/__init__.py diff --git a/calebasse/aps42.sqlite3 b/calebasse/aps42.sqlite3 new file mode 100644 index 00000000..494f4e15 Binary files /dev/null and b/calebasse/aps42.sqlite3 differ diff --git a/aps42/a42base/__init__.py b/calebasse/cale_base/__init__.py similarity index 100% rename from aps42/a42base/__init__.py rename to calebasse/cale_base/__init__.py diff --git a/aps42/a42base/models.py b/calebasse/cale_base/models.py similarity index 100% rename from aps42/a42base/models.py rename to calebasse/cale_base/models.py diff --git a/aps42/a42base/models/__init__.py b/calebasse/cale_base/models/__init__.py similarity index 100% rename from aps42/a42base/models/__init__.py rename to calebasse/cale_base/models/__init__.py diff --git a/aps42/a42base/models/actes.py b/calebasse/cale_base/models/actes.py similarity index 100% rename from aps42/a42base/models/actes.py rename to calebasse/cale_base/models/actes.py diff --git a/aps42/a42base/tests.py b/calebasse/cale_base/tests.py similarity index 100% rename from aps42/a42base/tests.py rename to calebasse/cale_base/tests.py diff --git a/aps42/a42base/views.py b/calebasse/cale_base/views.py similarity index 100% rename from aps42/a42base/views.py rename to calebasse/cale_base/views.py diff --git a/aps42/settings/__init__.py b/calebasse/settings/__init__.py similarity index 96% rename from aps42/settings/__init__.py rename to calebasse/settings/__init__.py index c04199e4..b04328ed 100644 --- a/aps42/settings/__init__.py +++ b/calebasse/settings/__init__.py @@ -2,8 +2,8 @@ import os.path PROJECT_PATH = os.path.dirname(os.path.dirname(__file__)) -from django import * -from aps42 import * +from common import * +from calebasse import * ######################################################################### # Import settings from local_settings.py, if it exists. diff --git a/aps42/settings/aps42.py b/calebasse/settings/aps42.py similarity index 100% rename from aps42/settings/aps42.py rename to calebasse/settings/aps42.py diff --git a/aps42/settings/django.py b/calebasse/settings/common.py similarity index 88% rename from aps42/settings/django.py rename to calebasse/settings/common.py index d80f4c66..3590aafd 100644 --- a/aps42/settings/django.py +++ b/calebasse/settings/common.py @@ -1,6 +1,7 @@ -# Django settings for aps42 project. +# Django settings for calebasse project. import os +from logging.handlers import SysLogHandler from ..settings import PROJECT_PATH @@ -16,7 +17,7 @@ MANAGERS = ADMINS DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': os.path.join(PROJECT_PATH, 'aps42.sqlite3'), # Or path to database file if using sqlite3. + 'NAME': os.path.join(PROJECT_PATH, 'calebasse.sqlite3'), # Or path to database file if using sqlite3. 'USER': '', # Not used with sqlite3. 'PASSWORD': '', # Not used with sqlite3. 'HOST': '', # Set to empty string for localhost. Not used with sqlite3. @@ -104,10 +105,10 @@ MIDDLEWARE_CLASSES = ( # 'django.middleware.clickjacking.XFrameOptionsMiddleware', ) -ROOT_URLCONF = 'aps42.urls' +ROOT_URLCONF = 'calebasse.urls' # Python dotted path to the WSGI application used by Django's runserver. -WSGI_APPLICATION = 'aps42.wsgi.application' +WSGI_APPLICATION = 'calebasse.wsgi.application' TEMPLATE_DIRS = ( # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". @@ -128,7 +129,7 @@ INSTALLED_APPS = ( # 'django.contrib.admin', # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', - 'aps42.a42base', + 'calebasse.cale_base', ) # A sample logging configuration. The only tangible logging @@ -149,13 +150,19 @@ LOGGING = { 'level': 'ERROR', 'filters': ['require_debug_false'], 'class': 'django.utils.log.AdminEmailHandler' - } + }, + 'syslog':{ + 'level':'INFO', + 'class':'logging.handlers.SysLogHandler', + 'formatter': 'syslog', + 'facility': SysLogHandler.LOG_LOCAL0, + 'address': '/dev/log', + }, }, 'loggers': { - 'django.request': { - 'handlers': ['mail_admins'], - 'level': 'ERROR', - 'propagate': True, + '': { + 'handlers': ['mail_admins','syslog'], + 'level': 'INFO', }, - } + }, } diff --git a/aps42/urls.py b/calebasse/urls.py similarity index 80% rename from aps42/urls.py rename to calebasse/urls.py index 8e8ffe6e..0e56e1f2 100644 --- a/aps42/urls.py +++ b/calebasse/urls.py @@ -6,8 +6,8 @@ from django.conf.urls import patterns, include, url urlpatterns = patterns('', # Examples: - # url(r'^$', 'aps42.views.home', name='home'), - # url(r'^aps42/', include('aps42.foo.urls')), + # url(r'^$', 'calebasse.views.home', name='home'), + # url(r'^calebasse/', include('aps42.foo.urls')), # Uncomment the admin/doc line below to enable admin documentation: # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), diff --git a/aps42/wsgi.py b/calebasse/wsgi.py similarity index 90% rename from aps42/wsgi.py rename to calebasse/wsgi.py index 27c30737..7c068bca 100644 --- a/aps42/wsgi.py +++ b/calebasse/wsgi.py @@ -1,5 +1,5 @@ """ -WSGI config for aps42 project. +WSGI config for calebasse project. This module contains the WSGI application used by Django's development server and any production WSGI deployments. It should expose a module-level variable @@ -15,7 +15,7 @@ framework. """ import os -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "aps42.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "calebasse.settings") # This application object is used by any WSGI server configured to use this # file. This includes Django's development server, if the WSGI_APPLICATION diff --git a/manage.py b/manage.py index 44f04916..5640b54e 100755 --- a/manage.py +++ b/manage.py @@ -3,7 +3,7 @@ import os import sys if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "aps42.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "calebasse.settings") from django.core.management import execute_from_command_line diff --git a/setup.py b/setup.py index b62042e9..3cec56f9 100755 --- a/setup.py +++ b/setup.py @@ -2,12 +2,12 @@ from setuptools import setup, find_packages import os -setup(name='aps42', +setup(name='calebasse', version='0.1', license='AGPLv3', description='', - url='http://dev.entrouvert.org/projects/aps42/', - download_url='http://repos.entrouvert.org/aps42.git/', + url='http://dev.entrouvert.org/projects/calebasse/', + download_url='http://repos.entrouvert.org/calebasse.git/', author="Entr'ouvert", author_email="info@entrouvert.com", packages=find_packages(os.path.dirname(__file__) or '.'),