Commit 80cd0fc6 authored by piks3l's avatar piks3l

Merge branch 'master' into 'correctingReadMe'

# Conflicts:
#   README.md
parents 1c87821d 0269482a
......@@ -14,6 +14,8 @@ uwsgi.
You need to install some development package to activate al the needed python
modules.
On Debian or Ubuntu, this will be done with the following command:
sudo apt-get install libxml2-dev libxslt-dev build-essential python-dev libsqlite3-dev libjpeg-dev zlib1g-dev libapache2-mod-uwsgi libapache2-mod-wsgi uwsgi-plugin-python libfreetype6-dev uwsgi
## Create a virtualenv
......@@ -47,8 +49,8 @@ manage.py tool.
## Set-up uwsgi
You need to create an application for uwsgi. Create a file in
/etc/uwsgi/apps-available with the fllowing content. Adapat to your needs and
read the documentation:
`/etc/uwsgi/apps-available` with the following content. Adapt to your needs
and read the documentation:
[uwsgi]
plugins = python
......@@ -72,7 +74,7 @@ repository), chdir is the same path. Home, is the path of the virtualenv created
above.
Now you need to activate the apps by creating a symoblic link into
/etc/uwsgi/apps-enabled, and to restart uwsgi.
`/etc/uwsgi/apps-enabled`, and to restart uwsgi.
cd /etc/uwsgi/apps-enabled
ln -s ../apps-available/nnmond.conf
......@@ -87,7 +89,7 @@ need to actvivate the uwsgi module:
service apache2 restart
And now you need to create a VirtualHost in
/etc/apache2/sites-availabe/nnmon.conf
`/etc/apache2/sites-availabe/nnmon.conf`
<virtualhost *:80>
ServerName rmn.example.com
......@@ -107,4 +109,3 @@ production use, you should use a TLS VirtualHost.
a2ensite nnmon
service apache2 reload
......@@ -8,7 +8,7 @@ class CommentInline(admin.TabularInline):
max_num = 1
class ViolationAdmin(admin.ModelAdmin):
list_display = ('state', 'country', 'operator', 'contract', 'resource_name', 'media', 'activationid', 'old')
list_display = ('state', 'country', 'operator', 'contract', 'resource_name', 'media', 'activationid', 'old', 'creation_date')
list_filter = ('state', 'operator_ref', 'contract', 'resource_name', 'media', 'country', 'old')
inlines = [CommentInline, ]
admin.site.register(models.Violation, ViolationAdmin)
......
nnmon/static/img/noise.png

22.5 KB | W: | H:

nnmon/static/img/noise.png

22.5 KB | W: | H:

nnmon/static/img/noise.png
nnmon/static/img/noise.png
nnmon/static/img/noise.png
nnmon/static/img/noise.png
  • 2-up
  • Swipe
  • Onion skin
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