forked from pub-solar/pub.solar
Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
64267221ac
19
.drone.yml
Normal file
19
.drone.yml
Normal file
|
|
@ -0,0 +1,19 @@
|
||||||
|
kind: pipeline
|
||||||
|
type: docker
|
||||||
|
name: default
|
||||||
|
steps:
|
||||||
|
- name: publish
|
||||||
|
when:
|
||||||
|
branch:
|
||||||
|
- main
|
||||||
|
image: appleboy/drone-scp
|
||||||
|
repo: pub-solar/pub.solar
|
||||||
|
settings:
|
||||||
|
host: pub.solar
|
||||||
|
port: 2020
|
||||||
|
username:
|
||||||
|
from_secret: ps_ssh_user
|
||||||
|
key:
|
||||||
|
from_secret: ps_ssh_key
|
||||||
|
source: ./*
|
||||||
|
target: /data/www/pub.solar/matrix-domain/
|
||||||
27
index.html
27
index.html
|
|
@ -116,13 +116,14 @@
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-weight: 900;
|
font-weight: 900;
|
||||||
font-size: 8rem;
|
font-size: 8rem;
|
||||||
|
padding: 0 200vw;
|
||||||
text-shadow: 5px 0px 0px white;
|
text-shadow: 5px 0px 0px white;
|
||||||
transition: text-shadow 0.1s ease;
|
transition: text-shadow 0.1s ease;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ps-page--link:hover {
|
.ps-page--link:hover {
|
||||||
text-shadow: 5px 0px 0px #00ffab;
|
text-shadow: 10px 0px 0px var(--accent);
|
||||||
}
|
}
|
||||||
|
|
||||||
.ps-background {
|
.ps-background {
|
||||||
|
|
@ -170,19 +171,23 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.ps-logo--base {
|
.ps-logo--base {
|
||||||
animation-duration: 30s;
|
animation-name: rotate;
|
||||||
animation-name: appear;
|
animation-duration: 0.3s;
|
||||||
animation-timing-function: linear;
|
animation-timing-function: linear;
|
||||||
|
animation-play-state: paused;
|
||||||
animation-iteration-count: infinite;
|
animation-iteration-count: infinite;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ps-logo:nth-child(2n) .ps-logo--base { animation-delay: -2.5s; }
|
.ps-logo--base:hover {
|
||||||
.ps-logo:nth-child(3n) .ps-logo--base { animation-delay: -5s; }
|
animation-play-state: running;
|
||||||
.ps-logo:nth-child(5n) .ps-logo--base { animation-delay: -7.5s; }
|
}
|
||||||
.ps-logo:nth-child(7n) .ps-logo--base { animation-delay: -10s; }
|
|
||||||
.ps-logo:nth-child(11n) .ps-logo--base { animation-delay: -12.5s; }
|
.ps-logo:nth-child(2n) .ps-logo--base { animation-delay: -0.1s; }
|
||||||
.ps-logo:nth-child(13n) .ps-logo--base { animation-delay: -15s; }
|
.ps-logo:nth-child(3n) .ps-logo--base { animation-delay: -0.3s; }
|
||||||
.ps-logo:nth-child(3n) .ps-logo--base { animation-delay: -17.5s; }
|
.ps-logo:nth-child(5n) .ps-logo--base { animation-delay: -0.5s; }
|
||||||
|
.ps-logo:nth-child(7n) .ps-logo--base { animation-delay: -7s; }
|
||||||
|
.ps-logo:nth-child(11n) .ps-logo--base { animation-delay: -0.9s; }
|
||||||
|
.ps-logo:nth-child(13n) .ps-logo--base { animation-delay: -1s; }
|
||||||
|
|
||||||
.ps-logo--base::before {
|
.ps-logo--base::before {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|
@ -193,7 +198,7 @@
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes appear {
|
@keyframes rotate {
|
||||||
0% {
|
0% {
|
||||||
transform: rotate(0deg);
|
transform: rotate(0deg);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
71
privacy.html
Normal file
71
privacy.html
Normal file
|
|
@ -0,0 +1,71 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title>Privacy Policy Matrix Homeserver | pub.solar n.e.V.</title>
|
||||||
|
<meta charset="utf-8" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
|
||||||
|
<meta name="theme-color" content="#ffffff">
|
||||||
|
</head>
|
||||||
|
<body class="is-preload">
|
||||||
|
<div id="page-wrapper">
|
||||||
|
<section id="main" class="container ">
|
||||||
|
|
||||||
|
<header>
|
||||||
|
<h2>Privacy Policy</h2>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<div class="box">
|
||||||
|
<p>Information on data privacy and protection for the Matrix service operated by pub.solar n.e.V. as required by article 13 DSGVO<br>
|
||||||
|
<em>Explanation: Our Matrix service consists of the “Homeserver” <code>https://matrix.pub.solar</code>, as well as the web-based Element-Messenger (<a href="https://chat.pub.solar/">chat.pub.solar</a>).</em></p>
|
||||||
|
|
||||||
|
<h3 id="responsible-persons">Responsible for operating the service</h3>
|
||||||
|
<p><strong>pub.solar n.e.V.</strong><br>
|
||||||
|
Benjamin Bädorf, Jhonas Wernery<br>
|
||||||
|
c/o MiOM 202<br>
|
||||||
|
Maarweg 143<br>
|
||||||
|
50825 Köln</p>
|
||||||
|
<p><a href="mailto:admins@pub.solar">admins@pub.solar</a></p>
|
||||||
|
|
||||||
|
<h3 id="contact-for-data-protection-issues">Contact for data protection issues</h3>
|
||||||
|
<p>If you have any questions regarding data protection, please contact us at <a href="mailto:admins@pub.solar">admins@pub.solar</a> or at the postal address given above.</p>
|
||||||
|
|
||||||
|
<h3 id="purpose-of-data-processing">What is the purpose of the data processing?</h3>
|
||||||
|
<p>"Matrix" is an open, decentralized communication service for real-time communication. It enables members of pub.solar n.e.V., as well as other interested parties, to communicate with other users of this server as well as other Matrix users of federated Matrix servers via chat and audio/video telephony by means of a Matrix account.</p>
|
||||||
|
|
||||||
|
<h3 id="personal-data">What personal data is processed?</h3>
|
||||||
|
<p>The processing includes the following personal data:</p>
|
||||||
|
<ul>
|
||||||
|
<li>Access control: matrix ID, display name, e-mail address (optional), phone number (optional)</li>
|
||||||
|
<li>Authentication: username and password</li>
|
||||||
|
<li>User content: all data that the user enters into the system (end-to-end encryption is enabled by default in 1:1 rooms)</li>
|
||||||
|
<li>Device identification: IP addresses with time stamp and device name; type of end device used (mobile / desktop), operating system</li>
|
||||||
|
<li>Server log: IP addresses with timestamp</li>
|
||||||
|
<li>Audio/video chat: IP addresses, audio/video data</li>
|
||||||
|
<li>Notifications (e-mail)</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<h3 id="duration-personal-data-saved">How long will the personal data be stored?</h3>
|
||||||
|
<p>The personal data will be deleted from our server after 15 months of inactivity. The deletion requests are forwarded to the federated servers. However, we have no influence on their execution.</p>
|
||||||
|
|
||||||
|
<h3 id="wo-werden-die-personenbezogenen-daten-gespeichert">Where is the personal data stored?</h3>
|
||||||
|
<p>We run our Matrix service on servers of the company <a href="https://greenbaum.cloud/">Greenbaum Cloud</a>.</p>
|
||||||
|
|
||||||
|
<h3 id="data-subject-rights">Data subject rights</h3>
|
||||||
|
<p>When we process personal data about you, you have the following rights:</p>
|
||||||
|
<ul>
|
||||||
|
<li>right of access to the data processed and right to obtain a copy of it,</li>
|
||||||
|
<li>right of rectification if we process incorrect data about you,</li>
|
||||||
|
<li>right to deletion, unless exceptions apply as to why we are still storing the data, for example, retention obligations or limitation periods</li>
|
||||||
|
<li>right to restriction of processing,</li>
|
||||||
|
<li>right to withdraw consent to data processing at any time,</li>
|
||||||
|
<li>right to object to processing in the public or legitimate interest,</li>
|
||||||
|
<li>right to data portability,</li>
|
||||||
|
<li>right to lodge a complaint with a data protection supervisory authority if you believe that we are not processing your data properly. The State Commissioner for Data Protection and Freedom of Information in Nordrhein-Westfalen is responsible in our case. However, if you are in another federal state or not in Germany, you can also contact the data protection authority there.</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<h3 id="references-license">References/License</h3>
|
||||||
|
<p>We have created the basic structure of this data protection information with the help of <a href="https://www.baden-wuerttemberg.datenschutz.de/ds-gvo.clever/">DS-GVO.clever-Tools</a> and adapted it to our needs. We have also used parts of <a href="https://doc.matrix.tu-dresden.de/privacy/">Datenschutzerklärung der TU-Dresden</a> and adjusted them accordingly. Text is licensed <a href="https://creativecommons.org/licenses/by-sa/4.0/deed.de">CC BY-SA 4.0</a>.</p>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</div>
|
||||||
|
</html>
|
||||||
Loading…
Reference in a new issue