Revert "fix for production"

This reverts commit cded8d8ce6.
This commit is contained in:
bkfox 2016-11-24 16:32:06 +01:00
parent cded8d8ce6
commit 7e571a6794
4 changed files with 7 additions and 14 deletions

View File

@ -49,16 +49,12 @@ Python modules:
* `Pillow`: `aircox.cms` (needed by `wagtail`) * `Pillow`: `aircox.cms` (needed by `wagtail`)
* Django's required database modules * Django's required database modules
External applications used by Aircox: External applications:
* `liquidsoap`: `aircox` (generation of the audio streams) * `liquidsoap`: `aircox` (generation of the audio streams)
* `sox`: `aircox` (check sounds quality and metadatas) * `sox`: `aircox` (check sounds quality and metadatas)
* note there might be external dependencies for python's Pillow too * 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 * 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 ### Configuration
You must write a settings.py file in the `instance` directory (you can just You must write a settings.py file in the `instance` directory (you can just
@ -87,7 +83,7 @@ Create the database if needed, and generate the tables:
```bash ```bash
# apply dependencies' migrations # apply dependencies' migrations
./manage.py makemigrations aircox aircox_cms ./manage.py makemigrations
# create the database # create the database
./manage.py migrate --fake-initial ./manage.py migrate --fake-initial
# create a super-user (needed in order to access the administration) # create a super-user (needed in order to access the administration)

View File

@ -31,7 +31,7 @@ except:
pass pass
# Application definition # Application definition
INSTALLED_APPS = [ INSTALLED_APPS = (
'jet', 'jet',
'wagtail.wagtailforms', 'wagtail.wagtailforms',
'wagtail.wagtailredirects', 'wagtail.wagtailredirects',
@ -60,9 +60,9 @@ INSTALLED_APPS = [
'aircox', 'aircox',
'aircox_cms', 'aircox_cms',
] )
MIDDLEWARE_CLASSES = [ MIDDLEWARE_CLASSES = (
'django.middleware.gzip.GZipMiddleware', 'django.middleware.gzip.GZipMiddleware',
'htmlmin.middleware.HtmlMinifyMiddleware', 'htmlmin.middleware.HtmlMinifyMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware',
@ -76,7 +76,7 @@ MIDDLEWARE_CLASSES = [
'wagtail.wagtailcore.middleware.SiteMiddleware', 'wagtail.wagtailcore.middleware.SiteMiddleware',
'wagtail.wagtailredirects.middleware.RedirectMiddleware', 'wagtail.wagtailredirects.middleware.RedirectMiddleware',
] )
ROOT_URLCONF = 'instance.urls' ROOT_URLCONF = 'instance.urls'

View File

@ -1,12 +1,9 @@
gunicorn>=19.6.0
Django>=1.9a1 Django>=1.9a1
django-taggit>=0.18.3 django-taggit>=0.18.3
watchdog>=0.8.3 watchdog>=0.8.3
wagtail>=1.5.3 wagtail>=1.5.3
django_overextends>=0.4.1
Pillow>=3.3.0 Pillow>=3.3.0
django-honeypot>=0.5.0 django-honeypot>=0.5.0
dateutils>=0.6.6 dateutils>=0.6.6
bleach>=1.4.3 bleach>=1.4.3
django-htmlmin>=0.9.1

View File

@ -21,7 +21,7 @@ autostart = true
autorestart = true autorestart = true
stdout_logfile = /srv/apps/aircox/logs/server.log stdout_logfile = /srv/apps/aircox/logs/server.log
redirect_stderr = true redirect_stderr = true
environment=AIRCOX_DEBUG="False",PATH="/srv/apps/aircox/venv/bin" environment=AIRCOX_DEBUG="False"
[program:aircox_sounds_monitor] [program:aircox_sounds_monitor]
command = /srv/apps/aircox/manage.py sounds_monitor -qsm command = /srv/apps/aircox/manage.py sounds_monitor -qsm