Merge branch 'main' of git.b12f.io:pub-solar/pub.solar
This commit is contained in:
commit
2234476755
25
.drone.yml
25
.drone.yml
|
|
@ -15,5 +15,28 @@ steps:
|
|||
from_secret: ps_ssh_user
|
||||
key:
|
||||
from_secret: ps_ssh_key
|
||||
source: ./*
|
||||
source:
|
||||
- "!.envrc"
|
||||
- "!.git"
|
||||
- "!.gitignore"
|
||||
- "!.drone.yml"
|
||||
- "!LICENSE.md"
|
||||
- "!shell.nix"
|
||||
- ./*
|
||||
target: /data/www/pub.solar/matrix-domain/
|
||||
overwrite: true
|
||||
|
||||
- name: fix permissions
|
||||
image: appleboy/drone-ssh
|
||||
settings:
|
||||
host: pub.solar
|
||||
port: 2020
|
||||
username:
|
||||
from_secret: ps_ssh_user
|
||||
key:
|
||||
from_secret: ps_ssh_key
|
||||
envs:
|
||||
- ps_ssh_user
|
||||
script:
|
||||
- export SSH_USER=$PS_SSH_USER
|
||||
- chown -R $SSH_USER:991 /data/www/pub.solar/matrix-domain
|
||||
|
|
|
|||
34
about.html
34
about.html
|
|
@ -19,18 +19,18 @@
|
|||
<section lang="de" class="ps-page--section">
|
||||
<p class="mobile-only">English version below</p>
|
||||
<h1>Hi! Wir sind pub.solar</h1>
|
||||
<p>Wir sind ein nicht eingetragener Verein mit Sitz in Köln. Unser Ziel ist es mehr Menschen zu ermöglichen Freie Software zu benutzen, sicher digital zu kommunizieren, und Datensparsamer zu leben. Wir stellen für dich und alle Menschen die du lieb hast auf transparente und demokratische Weise Freie Software zur verfügung.</p>
|
||||
<p>Wir sind ein nicht eingetragener Verein mit Sitz in Köln. Unser Ziel ist es mehr Menschen zu ermöglichen, Freie Software zu benutzen, sicher digital zu kommunizieren, und datensparsamer zu leben. Wir stellen für Dich und alle Menschen die Du lieb hast auf transparente und demokratische Weise Freie Software zur Verfügung.</p>
|
||||
|
||||
<p>Momentan haben wir vier größere Projekte:</p>
|
||||
<ul>
|
||||
<li><a href="https://element.pub.solar">Matrix</a>: dezentraler, end-to-end verschlüsselter Chat, ähnlich wie Slack oder Discord</li>
|
||||
<li><a href="https://chat.pub.solar">Matrix</a>: dezentraler, Ende-zu-Ende verschlüsselter Chat, ähnlich wie Slack oder Discord</li>
|
||||
<li><a href="https://mastodon.pub.solar">Mastodon</a>: dezentrale Mikrobloggingplattform, ähnlich wie Twitter</li>
|
||||
<li><a href="https://cloud.pub.solar">Nextcloud</a>: Cloud mit Office Möglichkeiten, ähnlich wie Teile der Google Suite und office365</li>
|
||||
<li><a href="https://cloud.pub.solar">Nextcloud</a>: Cloud mit Office Möglichkeiten, ähnlich wie Teile der Google Suite und Microsoft Office 365</li>
|
||||
<li><a href="https://get.pub.solar">PubSolarOS</a>, eine Linux Distribution die auf NixOS basiert</li>
|
||||
</ul>
|
||||
<p>Unsere Mastodon und Matrix Instanzen sind offen für alle zum registrieren. Wenn du (oder dein Verein, oder deine Familie) gerne Unsere Nextcloud benutzen möchte, rede gerne mal mit uns.</p>
|
||||
<p>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.</p>
|
||||
|
||||
<p>Du kannst mit uns per Matrix und Mastodon reden, oder eine mail an <a href="mailto:admins@pub.solar">admins@pub.solar</a> schicken.</p>
|
||||
<p>Du kannst uns via <a href="https://matrix.to/#/#general:pub.solar?via=chat.pub.solar">Matrix</a> und <a href="https://mastodon.pub.solar/@teutat3s">Mastodon</a> erreichen, oder eine Mail an <a href="mailto:admins@pub.solar">admins@pub.solar</a> schicken.</p>
|
||||
|
||||
<h2>Impressum</h2>
|
||||
<p>
|
||||
|
|
@ -42,26 +42,26 @@
|
|||
<a href="mailto:admins@pub.solar">admins@pub.solar</a>
|
||||
</p>
|
||||
|
||||
<h3>Satzung</h3>
|
||||
<p>Findest du <href="https://cloud.pub.solar/s/2KErtaYeLn5d6MZ">hier</a>.</p>
|
||||
<h3>Unsere Satzung</h3>
|
||||
<p>Findest Du <a href="https://cloud.pub.solar/s/2KErtaYeLn5d6MZ">hier</a>.</p>
|
||||
|
||||
<h2>Datenschutzerklärung</h2>
|
||||
<p>Findest du <a href="https://pub.solar/privacy">hier</a>.</p>
|
||||
<h2>Unsere Datenschutzerklärung</h2>
|
||||
<p>Findest Du <a href="https://pub.solar/privacy">hier</a>.</p>
|
||||
</section>
|
||||
<section lang="en" class="ps-page--section">
|
||||
<h1>Hi! We're pub.solar</h1>
|
||||
<p>We are a non-registered association seated in Cologne, Germany. Our goal is to enable more people to use free software, have secure digital communications, and to have more private data. We offer free software for you and all the people you love. We do this transparently and democratically.</p>
|
||||
<p>We are a non-registered association seated in Cologne, Germany. Our goal is to enable more people to use free software, have secure digital communications, and to take control over their private data. We offer free software for you and all the people you love. We do this transparently and democratically.</p>
|
||||
|
||||
<p> We currently have four larger projects:</p>
|
||||
<ul>
|
||||
<li><a href="https://element.pub.solar">Matrix</a>: a decentralized, end-to-end encrypted chat, similar to Slack or Discord.</li>
|
||||
<li><a href="https://chat.pub.solar">Matrix</a>: a decentralized, end-to-end encrypted chat, similar to Slack or Discord.</li>
|
||||
<li><a href="https://mastodon.pub.solar">Mastodon</a>: a decentralized microblogging platform, similar to Twitter.</li>
|
||||
<li><a href="https://cloud.pub.solar">Nextcloud</a>: a cloud with office capabilities, similar to the Google suite and Office 365.</li>
|
||||
<li><a href="https://cloud.pub.solar">Nextcloud</a>: a cloud with office capabilities, similar to the Google Suite and Microsoft Office 365.</li>
|
||||
<li><a href="https://get.pub.solar">PubSolarOS</a>, a GNU+Linux Distribution that is based on NixOS</li>
|
||||
</ul>
|
||||
<p>Our Mastodon and Matrix instances are publicly open for registration. If you (or your non profit, or your family) wants to use our Nextcloud, talk to us.</p>
|
||||
<p>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.</p>
|
||||
|
||||
<p>You can talk to us via Matrix and Mastodon, or send a mail to <a href="mailto:admins@pub.solar">admins@pub.solar</a>.</p>
|
||||
<p>You can reach us via <a href="https://matrix.to/#/#general:pub.solar?via=chat.pub.solar">Matrix</a> and <a href="https://mastodon.pub.solar/@teutat3s">Mastodon</a>, or send a mail to <a href="mailto:admins@pub.solar">admins@pub.solar</a>.</p>
|
||||
|
||||
<h2>Imprint</h2>
|
||||
<p>
|
||||
|
|
@ -73,10 +73,10 @@
|
|||
<a href="mailto:admins@pub.solar">admins@pub.solar</a>
|
||||
</p>
|
||||
|
||||
<h3>Statutes</h3>
|
||||
<p>Are over <href="https://cloud.pub.solar/s/2KErtaYeLn5d6MZ">here</a>.</p>
|
||||
<h3>Our Statutes</h3>
|
||||
<p>Are over <a href="https://cloud.pub.solar/s/2KErtaYeLn5d6MZ">here</a>.</p>
|
||||
|
||||
<h2>Privacy Policy</h2>
|
||||
<h2>Our Privacy Policy</h2>
|
||||
<p>Is over <a href="https://pub.solar/privacy">here</a>.</p>
|
||||
</section>
|
||||
</main>
|
||||
|
|
|
|||
|
|
@ -18,12 +18,12 @@
|
|||
<main class="ps-main--page ps-page ps-page_home">
|
||||
<a href="https://en.wikipedia.org/wiki/Free_software" target="_blank" class="ps-page--link">Fucking Free</a>
|
||||
<a href="https://get.pub.solar/" target="_blank" class="ps-page--link">PubSolarOS</a>
|
||||
<a href="https://element.pub.solar/" target="_blank" class="ps-page--link">Matrix</a>
|
||||
<a href="https://chat.pub.solar/" target="_blank" class="ps-page--link">Matrix</a>
|
||||
<a href="https://mastodon.pub.solar/" target="_blank" class="ps-page--link">Mastodon</a>
|
||||
<a href="https://cloud.pub.solar/" target="_blank" class="ps-page--link">Nextcloud</a>
|
||||
<a href="./about" target="_blank" class="ps-page--link">About</a>
|
||||
<a href="./about" target="_blank" class="ps-page--link">Imprint</a>
|
||||
<a href="./about" target="_blank" class="ps-page--link">Privacy policy</a>
|
||||
<a href="./about" class="ps-page--link">About</a>
|
||||
<a href="./about" class="ps-page--link">Imprint</a>
|
||||
<a href="./privacy" class="ps-page--link">Privacy policy</a>
|
||||
</main>
|
||||
<script>
|
||||
document.getElementById('x1312').innerHTML = (new Array(400)).fill("0x1312").join(" ");
|
||||
|
|
|
|||
|
|
@ -20,10 +20,10 @@
|
|||
|
||||
<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>
|
||||
Benjamin Bädorf, Jhonas Wernery, Hendrik Sokolowki<br>
|
||||
c/o MiOM 202<br>
|
||||
Maarweg 143<br>
|
||||
50825 Köln</p>
|
||||
Wilhelm-Mauser-Straße 47 Halle 5,<br>
|
||||
D-50827 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>
|
||||
|
|
|
|||
Loading…
Reference in a new issue