kopia lustrzana https://github.com/hholzgra/maposmatic/
add cookie warning and privacy statement text and link
Hartmut Holzgraefe
rodzic
3a2c41d1dc
commit
e44e2e4121
|
|
@ -38,6 +38,9 @@
|
|||
# Ignore npm installation directory
|
||||
/www/static/node_modules
|
||||
|
||||
# Ignore directories created by django collectstatic
|
||||
/www/static/django-cookie-law
|
||||
|
||||
# Ignore output directories
|
||||
/logs
|
||||
/rendering
|
||||
|
|
|
|||
22
INSTALL.md
22
INSTALL.md
|
|
@ -8,13 +8,16 @@ MapOSMatic depends on :
|
|||
|
||||
* Python, the programming language.
|
||||
|
||||
* OCitySMap, the rendering pipeline for MapOSMatic. See OCitySMap's
|
||||
install file for installation instructions and OCitySMap's
|
||||
dependencies.
|
||||
|
||||
* Django, the Web framework used to develop the Web front-end, but
|
||||
also used for the maposmaticd daemon to conveniently access the
|
||||
database through Django's ORM.
|
||||
|
||||
* OCitySMap, the rendering pipeline for MapOSMatic. See OCitySMap's
|
||||
install file for installation instructions and OCitySMap's
|
||||
dependencies.
|
||||
* The Django Cookie Law application for compliance with EU cookie
|
||||
regulations
|
||||
|
||||
* python-psycopg2, to let Django access the PostgreSQL database.
|
||||
|
||||
|
|
@ -49,11 +52,18 @@ and modified to match your installation configuration.
|
|||
Likewise for ``www/maposmatic.wsgi.dist`` and ``scripts/config.py.dist``,
|
||||
as well as ``www/maposmatic.wsgi`` and ``scripts/config.py``.
|
||||
|
||||
Some static files from django applications need to be copied into
|
||||
the maposmatic static media directory:
|
||||
|
||||
```bash
|
||||
python3 manage.py collectstatic
|
||||
```
|
||||
|
||||
The rendering database must then be initialized with the tables needed for
|
||||
MapOSMatic, using :
|
||||
|
||||
```bash
|
||||
python www/manage.py migrate
|
||||
python3 manage.py migrate
|
||||
```
|
||||
|
||||
The rendering daemon should be run in the background. It will fetch rendering
|
||||
|
|
@ -68,7 +78,7 @@ variables and paths for the daemon to run correctly.
|
|||
Then, you can run the rendering daemon through the wrapper with:
|
||||
|
||||
```bash
|
||||
.../scripts/wrapper.py scripts/daemon.py &
|
||||
scripts/wrapper.py scripts/daemon.py &
|
||||
```
|
||||
|
||||
You'll find in ``support/init-maposmaticd-template`` an init script
|
||||
|
|
@ -85,7 +95,7 @@ Before you think about configuring your web server to provide the
|
|||
maposmatic services, you should try them locally first:
|
||||
|
||||
```bash
|
||||
.../www/manage.py runserver
|
||||
./manage.py runserver
|
||||
```
|
||||
|
||||
Then point your web browser to the address mentioned in the output
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
{% load i18n %}
|
||||
{% load l10n %}
|
||||
{% load extratags %}
|
||||
{% load cookielaw_tags%}
|
||||
|
||||
<!DOCTYPE html>
|
||||
<html lang="{{ LANGUAGE_CODE }}"{% if LANGUAGE_BIDI %} dir="rtl"{% endif %}>
|
||||
|
|
@ -80,6 +81,9 @@
|
|||
|
||||
<link rel="stylesheet" href="/media/css/maposmatic.css" />
|
||||
|
||||
<link rel="stylesheet" href="/media/cookielaw/css/cookielaw.css" />
|
||||
<script src="/media/cookielaw/js/cookielaw.js"></script>
|
||||
|
||||
<style>
|
||||
{% block extracss %}{% endblock %}
|
||||
</style>
|
||||
|
|
@ -88,8 +92,10 @@
|
|||
<body class="{% block body-class %}{% endblock %}">
|
||||
|
||||
{% include "./base-parts/navbar.html" %}
|
||||
|
||||
|
||||
<div class="container" style="margin-top: 5em;">
|
||||
{% cookielaw_banner %}
|
||||
|
||||
{% if MAINTENANCE_NOTICE %}
|
||||
<div class="alert alert-danger">
|
||||
<h1><b><i class="fa fa-wrench"></i> Notice:</b> {{MAINTENANCE_NOTICE|safe }}</h1>
|
||||
|
|
@ -115,11 +121,10 @@
|
|||
{% endif %}
|
||||
</p>
|
||||
{{ EXTRA_FOOTER|safe }}
|
||||
<!--
|
||||
<p class="hosted-by">
|
||||
{% blocktrans %}MapOSMatic website and rendering pipeline hosted by <a href="http://www.enix.org">eNiX</a>.<br />GIS database hosted by the <a href="http://www.fsffrance.org">Free Software Foundation France</a>.{% endblocktrans %}
|
||||
<hr/>
|
||||
<p>
|
||||
<a href="{% url "privacy" %}">{% trans "Privacy statement" %}<a/>
|
||||
</p>
|
||||
-->
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
|
|
|
|||
|
|
@ -35,46 +35,280 @@
|
|||
{% block page %}
|
||||
<h1>{% trans "Privacy Statement" %}</h1>
|
||||
|
||||
<h2>Encryption</h2>
|
||||
<h2>{% trans "Encryption" %}</h2>
|
||||
|
||||
<p>
|
||||
All web traffic is encrypted using TLS/SSL, using certificates provided by LetsEncrypt(url).
|
||||
{% blocktrans %}
|
||||
All web traffic is encrypted using TLS/SSL, using certificates
|
||||
provided by <a href="https://letsencrypt.org/">LetsEncrypt</a>.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
|
||||
<p>
|
||||
When trying to access the site via unencrypted http: URLs you'll automatically be redirected
|
||||
to the encrypted https: URL counterparts.
|
||||
{% blocktrans %}
|
||||
When trying to access the site via unencrypted <tt>http:</tt>
|
||||
URLs you'll automatically be redirected to the encrypted <tt>https:</tt>
|
||||
URL counterparts.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
|
||||
<h2>Logging</h2>
|
||||
|
||||
<p>
|
||||
The web server only logs date and time, requested URL and HTTP status, it does normally not log
|
||||
IP addresses, user agent strings or referer URLs. These additional fields may temporary be added to log entries when necessary to analyze problems (although so far that has never been needed), but such additional access logs will be removed again within 24 hours.
|
||||
{% blocktrans %}
|
||||
The web server only logs date and time, requested URL and HTTP status,
|
||||
it does normally not log IP addresses, user agent strings or referer URLs.
|
||||
These additional fields may temporary be added to log entries when necessary
|
||||
to analyze problems (although so far that has never been needed), but such
|
||||
additional access logs will be removed again within 24 hours.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
|
||||
<p>
|
||||
When submitting an actual map rendering job, your IP address will
|
||||
{% if SUBMITTER_IP_LIFETIME < 0 %}
|
||||
be stored until removed manually
|
||||
{% elif SUBMITTER_IP_LIFETIME == 0 %}
|
||||
not be stored
|
||||
{% else %}
|
||||
stored for {{SUBMITTER_IP_LIFETIME}} hours
|
||||
{% endif %}
|
||||
along with the actual map request.
|
||||
{% blocktrans %}
|
||||
When submitting an actual map rendering job, your IP address will
|
||||
{% endblocktrans %}
|
||||
{% if SUBMITTER_IP_LIFETIME < 0 %}
|
||||
{% blocktrans %}
|
||||
be stored until removed manually
|
||||
{% endblocktrans %}
|
||||
{% elif SUBMITTER_IP_LIFETIME == 0 %}
|
||||
{% blocktrans %}
|
||||
not be stored
|
||||
{% endblocktrans %}
|
||||
{% else %}
|
||||
{% blocktrans %}
|
||||
stored for {{SUBMITTER_IP_LIFETIME}} hours
|
||||
{% endblocktrans %}
|
||||
{% endif %}
|
||||
{% blocktrans %}
|
||||
along with the actual map request.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
|
||||
<p>
|
||||
If you chose to also provide an email address for notification when
|
||||
your request has been processed completely, this mail address will
|
||||
be stored
|
||||
{% if SUBMITTER_MAIL_LIFETIME > 0 %}
|
||||
for {{ SUBMITTER_MAIL_LIFETIME }} hours.
|
||||
{% else %}
|
||||
until removed manually.
|
||||
{% endif %}
|
||||
{% blocktrans %}
|
||||
If you chose to also provide an email address for notification when
|
||||
your request has been processed completely, this mail address will
|
||||
be stored
|
||||
{% endblocktrans %}
|
||||
{% if SUBMITTER_MAIL_LIFETIME > 0 %}
|
||||
{% blocktrans %}
|
||||
for {{ SUBMITTER_MAIL_LIFETIME }} hours.
|
||||
{% endblocktrans %}
|
||||
{% else %}
|
||||
{% blocktrans %}
|
||||
until removed manually.
|
||||
{% endblocktrans %}
|
||||
{% endif %}
|
||||
</p>
|
||||
|
||||
<h2 id="tracking">Tracking / Analytics</h2>
|
||||
{% if PIWIK__BASE_URL %}
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
This site uses <a href="https://matomo.org/">Matomo</a>
|
||||
(formerly known as Piwik) for analytics.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
{% else %}
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
The site does not track users in any way, neither by itself
|
||||
nor by use of any external tracking services.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
{% endif %}
|
||||
|
||||
<h2 id="cookies">Cookies</h2>
|
||||
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
This site may use up to three cookies to store information about you:
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
|
||||
<dl>
|
||||
<dt><tt class="badge badge-secondary">cookielaw_accepted</tt></dt>
|
||||
<dd>
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
This cooke gets created as soon as you click
|
||||
<span class="badge badge-success">Accept</span>
|
||||
on the cookie warning. After this you will not
|
||||
see that warning again on this browser until
|
||||
the cookie gets deleted by you, or expires after
|
||||
ten years.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
The cookie only stores a fixed valie of "1" to
|
||||
remember your acceptance.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
If you do not accept this cookie the cookie
|
||||
warning block will appear every time you load
|
||||
a new page from the site, but it will not otherwise
|
||||
affect functionality of the site apart from the
|
||||
screen space taken.
|
||||
{% endblocktrans %}
|
||||
</dd>
|
||||
<dt><tt class="badge badge-secondary">sessionid</tt></dt>
|
||||
<dd>
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
This cookie is used to tie your browser session to
|
||||
some session specific information stored on the server
|
||||
side.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
So far we use a session only to store and remember
|
||||
certain choices you made in the
|
||||
<span class="badge badge-success">Create Map</span>
|
||||
form, so that we can pre-select or pre-fill form
|
||||
elements accordingly the next time you create
|
||||
a map.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
So the information stored in the session is just
|
||||
for your own convenience, it is not tracked in
|
||||
any way, it does not include any personal information
|
||||
about you, and the information will be removed
|
||||
completely two weeks after your last access of the
|
||||
<span class="badge badge-success">Create Map</span>
|
||||
form.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
If you decide to not accept this cookie the functionality
|
||||
of the site will not be affected, you will just loose
|
||||
the form prefill convenice.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
</dd>
|
||||
<dt><tt class="badge badge-secondary">_osm_topt_token</tt></dt>
|
||||
<dd>
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
This cookie may get set by the OpenStreetMap tile servers
|
||||
providing the map tiles used in the interactive map in the
|
||||
<span class="badge badge-success">Create Map</span> form.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
This cookie stores
|
||||
<a href="https://operations.osmfoundation.org/2017/01/31/january.html"
|
||||
>a time-based one-time password token
|
||||
which can be verified by the OpenStreetMap tile cache servers</a>
|
||||
and so can improve tile access performance.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
To the best of our knowledge this cookie is not used by
|
||||
OpenStreetMap to perform tracking of any kind.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
If you decide to not accept this cookie the map tiles
|
||||
in the interactive map may load slower, but otherwise
|
||||
the functionality of our site will not be reduced in
|
||||
any way.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
</dd>
|
||||
</dl>
|
||||
|
||||
<h2>Data from other sites</h2>
|
||||
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
All images, style sheets, fonts and all javascript code
|
||||
are stored locally on this server. There will be no
|
||||
cross site requests to other sites when accessing this
|
||||
service, with one exception:
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
The site uses map tiles provided by OpenStreetMap in the
|
||||
interactive map shown on the
|
||||
<span class="badge badge-success">Create Map</span>
|
||||
form. These are loaded from the OpenStreetMap tile
|
||||
servers under the <tt>tiles.openstreetmap.org</tt>
|
||||
subdomain by your browser directly.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
Please refer to the
|
||||
<a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy#Where_do_we_store_the_data"
|
||||
>OpenStreetMap Foundations Privacy Policy</a>
|
||||
regarding the access to those
|
||||
map tile images.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
|
||||
<h2>Data uploaded by you</h2>
|
||||
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
The site allows you to upload GPX tracks, GeoJson files and
|
||||
<a href="umap.openstreetmap.fr">Umap</a> map exports to
|
||||
incorporate information stored in them into generated maps.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
Note that all maps generated by this service are publicly
|
||||
visible, so do <strong>not</strong> upload any such files
|
||||
which contain information that should become visible to
|
||||
a global audience, no matter whether this is a problem
|
||||
for privacy, security, copyright, or other legal reasons.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
If you have uploaded such a file by accident, please inform
|
||||
{{ CONTACT_EMAIL }} via email and request a removal of the
|
||||
uploaded file and the generated map. Provide either the
|
||||
URL of the generated map page, or the file name of the
|
||||
uploaded file and the date it was uploaded to this site.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
|
||||
<h2>Generated maps</h2>
|
||||
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
Generated maps are stored on the server for some time
|
||||
until they are finally removed again for storage space
|
||||
reasons. The actual rendering job data remains available
|
||||
though, and so the deleted map files can be regenerated
|
||||
at any time.
|
||||
{% endblocktrans %}
|
||||
<p>
|
||||
|
||||
<p>
|
||||
{% blocktrans %}
|
||||
If you think a map rendering job should be removed
|
||||
completely for whatever reason, please inform
|
||||
{{ CONTACT_EMAIL }} via email and provide the URL
|
||||
of the rendering job you want to have removed.
|
||||
{% endblocktrans %}
|
||||
</p>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -112,12 +112,17 @@ LOCAL_MEDIA_PATH = os.path.join(PROJECT_PATH, 'static')
|
|||
|
||||
INSTALLED_APPS = (
|
||||
'django.contrib.auth',
|
||||
'django.contrib.staticfiles',
|
||||
'django.contrib.contenttypes',
|
||||
'django.contrib.sessions',
|
||||
'cookielaw',
|
||||
'maintenance_mode',
|
||||
'www.maposmatic',
|
||||
)
|
||||
|
||||
STATIC_URL = "/media/"
|
||||
STATIC_ROOT = LOCAL_MEDIA_PATH
|
||||
|
||||
TEST_RUNNER = 'django.test.runner.DiscoverRunner'
|
||||
|
||||
# Available website translations. Note that the language codes must be
|
||||
|
|
|
|||
|
|
@ -0,0 +1,43 @@
|
|||
{% load i18n %}
|
||||
|
||||
<div id="CookielawBanner">
|
||||
<div class="container">
|
||||
<div class="card">
|
||||
<div class="card-header text-white bg-danger text-lg-left font-weight-bold">
|
||||
{% trans "Cookie information" %}
|
||||
</div>
|
||||
<div class="card-body">
|
||||
{% blocktrans %}
|
||||
<p>
|
||||
This site does not use tracking cookies of any kind.
|
||||
It does use up to three cookies for other purposes though:
|
||||
</p>
|
||||
<ul>
|
||||
<li>One cookie to track whether you've seen and accepted this cookie warning (valid for ten years)</li>
|
||||
<li>One session coockie related to session information stored on the server side</li>
|
||||
<li>The map tile servers on openstreetmap.org may also set a cookie of their own</li>
|
||||
</ul>
|
||||
<p>
|
||||
The server side session tied to the session cookie is only used to remember
|
||||
previous choices when filling out the <em>Create map</em> form. The session
|
||||
does not store personalized data in any form.
|
||||
</p>
|
||||
The site will continue to function even when you choose to not accept
|
||||
any cookies, but you'll unfortunately also see this message again and
|
||||
again unless you at least accept the <tt>cookielaw_accepted</tt> cookie
|
||||
that gets sent when hitting the "OK" button below.
|
||||
<p>
|
||||
</p>
|
||||
<p>
|
||||
For further details see the sites <a href="/privacy/#cookies">privacy statemet</a>
|
||||
</p>
|
||||
{% endblocktrans %}
|
||||
</div>
|
||||
<div class="card-footer ">
|
||||
<a class="btn btn-primary" href="javascript:Cookielaw.createCookielawCookie();">{% trans "Accept" %}</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
Ładowanie…
Reference in New Issue