diff options
| -rw-r--r-- | apache/apache-wsgi.conf | 2 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | docs/install.rst | 17 | ||||
| -rw-r--r-- | docs/upgrade.rst | 6 | ||||
| -rw-r--r-- | example_project/local_settings.py.sample | 3 | ||||
| -rw-r--r-- | example_project/settings.py | 8 |
6 files changed, 18 insertions, 20 deletions
diff --git a/apache/apache-wsgi.conf b/apache/apache-wsgi.conf index 4bd2b81..1a4d24a 100644 --- a/apache/apache-wsgi.conf +++ b/apache/apache-wsgi.conf @@ -2,7 +2,7 @@ ServerName chimere.example.com WSGIDaemonProcess chimere processes=2 maximum-requests=500 threads=1 WSGIProcessGroup chimere - WSGIScriptAlias / /var/local/chimere/chimere/apache/mydjango.wsgi + WSGIScriptAlias / /var/local/chimere/apache/mydjango.wsgi Alias /static "/var/local/chimere/mychimere_project/static" Alias /tinymce "/usr/share/tinymce/www" <Directory "/usr/share/tinymce/www/"> diff --git a/debian/control b/debian/control index 7d3a110..1d89b61 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,6 @@ Depends: python-django (>=1.4), python-gdal, python-psycopg2, libjs-jquery-ui, libjs-jquery-ui-theme-base, postgresql-9.1, postgresql-9.1-postgis, gettext, python-simplejson, gpsbabel, python-django-south, - python-pyexiv2 python-feedparser + python-pyexiv2 python-feedparser javascript-common Recommends: tinymce, python-django-celery, python-kombu Suggests: libjs-jquery-ui-theme-south-street diff --git a/docs/install.rst b/docs/install.rst index c8b91b3..4d93793 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -62,8 +62,8 @@ Linux distribution repositories. For instance on Debian Wheezy:: python-beautifulsoup tinymce apache2 libgeos-3.3.3 proj-bin gdal-bin \ python-gdal python-lxml python-psycopg2 python-imaging gettext \ postgresql-9.1 postgresql-9.1-postgis libjs-jquery libjs-jquery-ui \ - python-django-celery python-simplejson python-gdal gpsbabel \ - python-pyexiv2 python-feedparser + python-django-celery python-simplejson gpsbabel \ + python-pyexiv2 python-feedparser javascript-common On Debian Squeeze (you need to activate backports):: @@ -73,7 +73,7 @@ On Debian Squeeze (you need to activate backports):: apache2 libgeos-3.2.0 proj-bin gdal-bin python-gdal python-lxml \ python-psycopg2 python-imaging gettext postgresql-8.4 \ postgresql-8.4-postgis libjs-jquery libjs-jquery-ui python-simplejson \ - python-gdal gpsbabel python-pyexiv2 python-feedparser + gpsbabel python-pyexiv2 python-feedparser javascript-common If these packages do not exist in your distribution's repository, please refer @@ -170,17 +170,20 @@ settings are initialized in settings.py. :: * DATABASES: parameters for the database * PROJECT_NAME: name of the project + * SECRET_KEY: a secret key for a particular Django installation. This is + used to provide cryptographic signing, and should be set to a unique, + unpredictable value. Change it! * ROOT_URLCONF: url configuration for your project something like: 'mychimere_project.urls' * EMAIL_HOST: smtp of an email server to send emails - * TINYMCE_URL: url to tinymce path (default is appropriate - for a Debian installation with tinymce activated) + * TINYMCE_URL: url to tinymce path (default is appropriate for a Debian + installation with tinymce activated) * JQUERY_JS_URLS: list of Jquery and Jquery-ui urls (default is appropriate for a Debian installation with Jquery and Jquery-ui activated) * JQUERY_CSS_URLS: list of Jquery and Jquery-ui urls (default is appropriate for a Debian installation with Jquery and Jquery-ui activated) - * GPSBABEL: path to gpsbabel (default is appropriate - for a Debian installation with gpsbabel installed) + * GPSBABEL: path to gpsbabel (default is appropriate for a Debian + installation with gpsbabel installed) * TIME_ZONE: local time zone for this installation * LANGUAGE_CODE: language code for this installation diff --git a/docs/upgrade.rst b/docs/upgrade.rst index b697978..b9a0363 100644 --- a/docs/upgrade.rst +++ b/docs/upgrade.rst @@ -45,7 +45,7 @@ Then install the new dependencies:: apt-get install -t squeeze-backports python-django python-django-south \ python-simplejson libjs-jquery-ui python-pyexiv2 \ - python-feedparser + python-feedparser javascript-common Debian Wheezy +++++++++++++ @@ -53,7 +53,7 @@ Debian Wheezy .. code-block:: bash apt-get install python-django-south python-simplejson libjs-jquery-ui \ - python-pyexiv2 python-feedparser + python-pyexiv2 python-feedparser javascript-common If you are planing to do major import consider the install of `Celery <http://celeryproject.org/>`_. @@ -160,7 +160,7 @@ A *local_settings* file is now used. Report your old settings.py in local_settings.py (at least the database configuration). -Your *ROOT_URLCONF* must be set to **value_of_your_localname.settings**. +Your *ROOT_URLCONF* must be set to **value_of_your_localname.urls**. logs .... diff --git a/example_project/local_settings.py.sample b/example_project/local_settings.py.sample index 9ccd41d..b5939af 100644 --- a/example_project/local_settings.py.sample +++ b/example_project/local_settings.py.sample @@ -9,6 +9,9 @@ CHIMERE_OSM_API_URL = 'api06.dev.openstreetmap.org' # test URL CHIMERE_OSM_USER = 'osm_user' CHIMERE_OSM_PASSWORD = 'osm_pass' +# Make this string unique, and don't share it with anybody. +SECRET_KEY = '' + ADMINS = ( # ('Your Name', 'your_email@domain.com'), ) diff --git a/example_project/settings.py b/example_project/settings.py index 6aaa577..1b72dad 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -122,14 +122,6 @@ MEDIA_ROOT = ROOT_PATH + 'media/' # Example: "http://media.lawrence.com" MEDIA_URL = '/media/' -# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a -# trailing slash. -# deprecated in Django 1.4 but left for Django 1.3 -ADMIN_MEDIA_PREFIX = '/admin-media/' - -# Make this unique, and don't share it with anybody. -SECRET_KEY = 'achanger_!ToChange!' - # List of callables that know how to import templates from various sources. TEMPLATE_LOADERS = ( 'django.template.loaders.filesystem.Loader', |