diff --git a/README.md b/README.md index 278563d..f3cf595 100755 --- a/README.md +++ b/README.md @@ -49,12 +49,16 @@ Python modules: * `Pillow`: `aircox.cms` (needed by `wagtail`) * Django's required database modules -External applications: +External applications used by Aircox: * `liquidsoap`: `aircox` (generation of the audio streams) * `sox`: `aircox` (check sounds quality and metadatas) * note there might be external dependencies for python's Pillow too * sqlite, mysql or any database library that you need to run a database, that is supported by python +External applications used to run Aircox properly +* `supervisorctl`: optional, supervise services provided by Aircox +* `gunicorn`: WSGI server (included in `requirements.txt` file) +* `nginx`: HTTP server; ### Configuration You must write a settings.py file in the `instance` directory (you can just @@ -83,7 +87,7 @@ Create the database if needed, and generate the tables: ```bash # apply dependencies' migrations -./manage.py makemigrations +./manage.py makemigrations aircox aircox_cms # create the database ./manage.py migrate --fake-initial # create a super-user (needed in order to access the administration) diff --git a/instance/base_settings.py b/instance/base_settings.py index a8e2526..f93c980 100755 --- a/instance/base_settings.py +++ b/instance/base_settings.py @@ -31,7 +31,7 @@ except: pass # Application definition -INSTALLED_APPS = ( +INSTALLED_APPS = [ 'jet', 'wagtail.wagtailforms', 'wagtail.wagtailredirects', @@ -60,9 +60,9 @@ INSTALLED_APPS = ( 'aircox', 'aircox_cms', -) +] -MIDDLEWARE_CLASSES = ( +MIDDLEWARE_CLASSES = [ 'django.middleware.gzip.GZipMiddleware', 'htmlmin.middleware.HtmlMinifyMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', @@ -76,7 +76,7 @@ MIDDLEWARE_CLASSES = ( 'wagtail.wagtailcore.middleware.SiteMiddleware', 'wagtail.wagtailredirects.middleware.RedirectMiddleware', -) +] ROOT_URLCONF = 'instance.urls' diff --git a/requirements.txt b/requirements.txt index 65cf9c0..bc0fe30 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,12 @@ +gunicorn>=19.6.0 Django>=1.9a1 django-taggit>=0.18.3 watchdog>=0.8.3 wagtail>=1.5.3 +django_overextends>=0.4.1 Pillow>=3.3.0 django-honeypot>=0.5.0 dateutils>=0.6.6 bleach>=1.4.3 +django-htmlmin>=0.9.1 diff --git a/scripts/supervisord_aircox b/scripts/supervisord_aircox index 9657e82..f043426 100755 --- a/scripts/supervisord_aircox +++ b/scripts/supervisord_aircox @@ -21,7 +21,7 @@ autostart = true autorestart = true stdout_logfile = /srv/apps/aircox/logs/server.log redirect_stderr = true -environment=AIRCOX_DEBUG="False" +environment=AIRCOX_DEBUG="False",PATH="/srv/apps/aircox/venv/bin" [program:aircox_sounds_monitor] command = /srv/apps/aircox/manage.py sounds_monitor -qsm