update log + add migration scheme

Author: Nodraak

cdc.md

@@ -11,7 +11,6 @@ todo long run
 - flake8 compliant (pep8 + other stuff)
 
 to do now
-- log : for each page, log : ip, date, page ??
 - https://docs.djangoproject.com/en/dev/ref/contrib/sitemaps/
 - previsualisation des posts
 - news / tuto / articles : export pdf (pandoc)

iTeam/settings.py

@@ -3,7 +3,7 @@
 # @Author: Adrien Chardon
 # @Date:   2014-09-02 12:01:06
 # @Last Modified by:   Adrien Chardon
-# @Last Modified time: 2014-10-28 19:46:39
+# @Last Modified time: 2014-10-29 13:09:07
 
 # This file is part of iTeam.org.
 # Copyright (C) 2014 Adrien Chardon (Nodraak).
@@ -151,6 +151,7 @@
     'django.contrib.staticfiles',
 
     'email_obfuscator',
+    'south',
 )
 
 MIDDLEWARE_CLASSES = (

iTeam/stats/admin.py

@@ -3,7 +3,7 @@
 # @Author: Adrien Chardon
 # @Date:   2014-10-28 19:45:49
 # @Last Modified by:   Adrien Chardon
-# @Last Modified time: 2014-10-28 19:54:28
+# @Last Modified time: 2014-10-29 12:36:19
 
 # This file is part of iTeam.org.
 # Copyright (C) 2014 Adrien Chardon (Nodraak).
@@ -28,10 +28,10 @@
 
 class LogAdmin(admin.ModelAdmin):
     # fields for ALL publications
-    list_display = ('ip', 'date', 'url', 'method', 'referer')
+    list_display = ('ip', 'date', 'url', 'method', 'referer', 'useragent')
 
-    list_filter = ['ip', 'date', 'url', 'method', 'referer']
-    search_fields = ['ip', 'date', 'url', 'method', 'referer']
+    list_filter = ['ip', 'date', 'method', 'referer', 'useragent']
+    search_fields = ['ip', 'date', 'url', 'method', 'referer', 'useragent']
 
 
 admin.site.register(Log, LogAdmin)

iTeam/stats/migrations/0001_initial.py

@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'Log'
+        db.create_table(u'stats_log', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('ip', self.gf('django.db.models.fields.CharField')(default='-', max_length=256)),
+            ('date', self.gf('django.db.models.fields.DateTimeField')()),
+            ('url', self.gf('django.db.models.fields.CharField')(max_length=256)),
+            ('method', self.gf('django.db.models.fields.CharField')(default='-', max_length=256)),
+            ('referer', self.gf('django.db.models.fields.CharField')(default='-', max_length=256)),
+        ))
+        db.send_create_signal(u'stats', ['Log'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'Log'
+        db.delete_table(u'stats_log')
+
+
+    models = {
+        u'stats.log': {
+            'Meta': {'object_name': 'Log'},
+            'date': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip': ('django.db.models.fields.CharField', [], {'default': "'-'", 'max_length': '256'}),
+            'method': ('django.db.models.fields.CharField', [], {'default': "'-'", 'max_length': '256'}),
+            'referer': ('django.db.models.fields.CharField', [], {'default': "'-'", 'max_length': '256'}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '256'})
+        }
+    }
+
+    complete_apps = ['stats']

iTeam/stats/migrations/0002_auto__add_field_log_useragent.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'Log.useragent'
+        db.add_column(u'stats_log', 'useragent',
+                      self.gf('django.db.models.fields.CharField')(default='-', max_length=256),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'Log.useragent'
+        db.delete_column(u'stats_log', 'useragent')
+
+
+    models = {
+        u'stats.log': {
+            'Meta': {'object_name': 'Log'},
+            'date': ('django.db.models.fields.DateTimeField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip': ('django.db.models.fields.CharField', [], {'default': "'-'", 'max_length': '256'}),
+            'method': ('django.db.models.fields.CharField', [], {'default': "'-'", 'max_length': '256'}),
+            'referer': ('django.db.models.fields.CharField', [], {'default': "'-'", 'max_length': '256'}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'useragent': ('django.db.models.fields.CharField', [], {'default': "'-'", 'max_length': '256'})
+        }
+    }
+
+    complete_apps = ['stats']

iTeam/stats/migrations/__init__.py

@@ -3,7 +3,7 @@
 # @Author: Adrien Chardon
 # @Date:   2014-10-28 19:07:27
 # @Last Modified by:   Adrien Chardon
-# @Last Modified time: 2014-10-28 19:53:46
+# @Last Modified time: 2014-10-29 13:28:08
 
 # This file is part of iTeam.org.
 # Copyright (C) 2014 Adrien Chardon (Nodraak).
@@ -27,21 +27,27 @@
 
 
 class Log(models.Model):
-    ip = models.CharField(max_length=256)
+    ip = models.CharField(max_length=256, default='-')
     date = models.DateTimeField()
     url = models.CharField(max_length=256)
-    method = models.CharField(max_length=256)
-    referer = models.CharField(max_length=256)
+    method = models.CharField(max_length=256, default='-')
+    referer = models.CharField(max_length=256, default='-')
+    useragent = models.CharField(max_length=256, default='-')
 
     def set_attr(self, request):
-        self.ip = request.META['REMOTE_ADDR']
         self.date = timezone.now()
         self.url = request.get_full_path()
-        self.method = request.META['REQUEST_METHOD']
+
+        if 'REQUEST_METHOD' in request.META:
+            self.method = request.META['REQUEST_METHOD']
+
+        if 'HTTP_USER_AGENT' in request.META:
+            self.useragent = request.META['HTTP_USER_AGENT']
+
+        if 'HTTP_X_FORWARDED_FOR' in request.META:
+            self.ip = request.META['HTTP_X_FORWARDED_FOR']
 
         if 'HTTP_REFERER' in request.META:
             self.referer = request.META['HTTP_REFERER']
-        else:
-            self.referer = '-'
 
         return self

iTeam/stats/models.py

@@ -80,7 +80,7 @@ A lire :
 * munin http://sametmax.com/monitorez-vos-serveurs-avec-munin-et-notifications-par-email/
 * django cache https://docs.djangoproject.com/en/dev/topics/cache/
 * nginx + static + gzip : http://sametmax.com/servir-des-fichiers-statiques-avec-nginx/
-
+* migrate http://www.djangopro.com/2011/01/django-database-migration-tool-south-explained/
 
 
 

prod/deploy.md

@@ -20,8 +20,7 @@ sudo ln -s /etc/nginx/sites-available/iteam-maintenance /etc/nginx/sites-enabled
 sudo service nginx reload
 
 # Retrieve prod branch
-git branch prod origin/prod
-git checkout prod
+git branch prod origin/prod  # usefull ?
 # Delete old branch if exists
 git branch -D $1
 # Switch to new tag (Server has git < 1.9, git fetch --tags doesn't retrieve commits...)
@@ -39,7 +38,7 @@ python manage.py collectstatic --noinput
 # Update application data
 source ../bin/activate
 pip install --upgrade -r requirements.txt
-#python manage.py migrate
+python manage.py migrate
 deactivate
 
 # Restart iteam
@@ -58,6 +57,6 @@ HEAD_HASH=$(git rev-parse HEAD)
 echo "$DEPLOYED_TAG" > git_version.txt
 
 echo "Commit deployé :"
-echo "tag    $DEPLOYED_TAG"
-echo "hash   $DEPLOYED_HASH"
-echo "head   $HEAD_HASH"
+echo "tag  - $DEPLOYED_TAG"
+echo "hash - $DEPLOYED_HASH"
+echo "head - $HEAD_HASH"

prod/deploy.sh

@@ -50,10 +50,6 @@ server {
         proxy_set_header X-Scheme $scheme;
 
         proxy_pass http://localhost:8000/;
-
-        #proxy_set_header X-Forwarded-Host $server_name;
-        #proxy_set_header X-Forwaded-For $proxy_add_x_forwarded_for;
-        #proxy_set_header REMOTE_ADDR $remote_addr;
     }