make submitter IP tracking optional and prepare for automatic purge

www/maposmatic/apis.py

@@ -327,7 +327,11 @@ def _jobs_post(request):
 
     if not result['error']:
         job.status = 0
-        job.submitterip = request.META['REMOTE_ADDR']
+        if www.settings.SUBMITTER_IP_LIFETIME != 0:
+            job.submitterip = request.META['REMOTE_ADDR']
+        else:
+            job.submitterip = None
+
         job.index_queue_at_submission = (models.MapRenderingJob.objects.queue_size())
         job.nonce = helpers.generate_nonce(models.MapRenderingJob.NONCE_SIZE)
         try:

www/maposmatic/views.py

@@ -137,7 +137,11 @@ def new(request):
             job.paper_width_mm = form.cleaned_data.get('paper_width_mm')
             job.paper_height_mm = form.cleaned_data.get('paper_height_mm')
             job.status = 0 # Submitted
-            job.submitterip = request.META['REMOTE_ADDR']
+            if www.settings.SUBMITTER_IP_LIFETIME != 0:
+                job.submitterip = request.META['REMOTE_ADDR']
+            else:
+                job.submitterip = None
+
             job.submitteremail = form.cleaned_data.get('submitteremail')
             job.map_language = form.cleaned_data.get('map_language')
             job.index_queue_at_submission = (models.MapRenderingJob.objects
@@ -268,7 +272,10 @@ def recreate(request):
             newjob.paper_height_mm = job.paper_height_mm
 
             newjob.status = 0 # Submitted
-            newjob.submitterip = request.META['REMOTE_ADDR']
+            if www.settings.SUBMITTER_IP_LIFETIME != 0:
+                newjob.submitterip = request.META['REMOTE_ADDR']
+            else:
+                newjob.submitterip = None
             newjob.submittermail = None # TODO
             newjob.map_language = job.map_language
             newjob.index_queue_at_submission = (models.MapRenderingJob.objects

www/settings_local.py.dist

@@ -161,6 +161,11 @@ PAYPAL_ID = ''
 
 PIWIK_BASE_URL = ''
 
+# how long to store the submitter IP address in the database
+# value in hours, 0 for no storage at all, -1 for unlimited
+# storage without purging
+SUBMITTER_IP_LIFETIME=-1
+
 # Weblate base URL - link to translation service
 WEBLATE_BASE_URL = 'https://translate.get-map.org/'