diff --git a/about.html b/about.html index ee3c41e..39d778d 100644 --- a/about.html +++ b/about.html @@ -3,6 +3,7 @@ Pub Solar + @@ -30,7 +31,7 @@

Auf unseren Mastodon und Matrix Instanzen ist die Registrierung für alle offen. Wenn Du (oder dein Verein, oder deine Familie) gerne unsere Nextcloud benutzen möchten, schreib uns gerne an.

-

Du kannst uns via Matrix und Mastodon erreichen, oder eine Mail an admins@pub.solar schicken.

+

Du kannst uns via Matrix und Mastodon erreichen, oder eine Mail an crew@pub.solar schicken.

Impressum

@@ -39,7 +40,7 @@ c/o MiOM 202,
Wilhelm-Mauser-Straße 47 Halle 5,
D-50827 Köln,

- admins@pub.solar + crew@pub.solar

Unsere Satzung

@@ -65,7 +66,7 @@

Our Mastodon and Matrix instances are publicly open for registration. If you (or your non profit, or your family) would like to use our Nextcloud, send us a message.

-

You can reach us via Matrix and Mastodon, or send a mail to admins@pub.solar.

+

You can reach us via Matrix and Mastodon, or send a mail to crew@pub.solar.

Imprint

@@ -74,7 +75,7 @@ c/o MiOM 202,
Wilhelm-Mauser-Straße 47 Halle 5,
D-50827 Köln,

- admins@pub.solar + crew@pub.solar

Our Statutes

diff --git a/assets/pubsolar.png b/assets/pubsolar.png new file mode 100644 index 0000000..5b4fe09 Binary files /dev/null and b/assets/pubsolar.png differ diff --git a/index.html b/index.html index 3d74527..56b9f92 100644 --- a/index.html +++ b/index.html @@ -3,6 +3,7 @@ Pub Solar + diff --git a/privacy.html b/privacy.html index b11b34f..1243433 100644 --- a/privacy.html +++ b/privacy.html @@ -1,4 +1,17 @@ + + + + pub.solar n.e.V. privacy policy + + + + + + + + + Privacy Policy Matrix Homeserver | pub.solar n.e.V. @@ -6,13 +19,19 @@ - -
-
- -
-

Privacy Policy

-
+ +
+
+ +
+
+
+

Es gibt momentan leider keine Deutsche Version unserer Datenschutzerklärung.

+
+

Privacy Policy

+

Information on data privacy and protection for the Matrix service operated by pub.solar n.e.V. as required by article 13 DSGVO
@@ -24,10 +43,10 @@ c/o MiOM 202
Wilhelm-Mauser-Straße 47 Halle 5,
D-50827 Köln

-

admins@pub.solar

+

crew@pub.solar

Contact for data protection issues

-

If you have any questions regarding data protection, please contact us at admins@pub.solar or at the postal address given above.

+

If you have any questions regarding data protection, please contact us at crew@pub.solar or at the postal address given above.

What is the purpose of the data processing?

"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.

@@ -67,5 +86,17 @@

We have created the basic structure of this data protection information with the help of DS-GVO.clever-Tools and adapted it to our needs. We have also used parts of Datenschutzerklärung der TU-Dresden and adjusted them accordingly. Text is licensed CC BY-SA 4.0.

-
+ +