12 changed files with 88 additions and 287 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -1,22 +0,0 @@
 ---
 kind: pipeline
 type: exec
 name: default1
 clone:
  disable: true
 platform:
  os: linux
  arch: amd64
 steps:
 - name: deploy
  commands:
  - sh /opt/drone/scripts/sync-website.sh
 trigger:
  branch:
  - master
  event:
  - push
--- a/LICENSE.txt
+++ b/LICENSE.txt
@ -1,6 +1,6 @@
 MIT License
-Copyright (c) 2021 mogad0n, cranberry
+Copyright (c) 2021 mogad0n
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@ -1,5 +1,4 @@
 # Static files for LibertaCasa Website
 Welcome to [Liberta Casa](http://liberta.casa)!
 This repository is for generating static pages.
--- a/git.html
+++ b/git.html
@ -1,44 +0,0 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta charset="UTF-8">
  <link rel="stylesheet" href="styles.css">
 <title>LibertaCasa - git</title>
 </head>
 <body>
 <pre>
 ┬   ┌┬┐ ┬─┐ ┬─┐ ┬─┐ ┌┐┐ ┬─┐
 │    │  │─│ │─  │┬┘  │  │─┤
 ┘─┘ └┴┘ │─┘ ┴─┘ │└┘  ┘  ┘ │
 ┌─┐ ┬─┐ ┐─┐ ┬─┐
 │   │─┤ └─┐ │─┤
 └─┘ ┘ │ ──┘ ┘ │
 </pre>
 <h3>Git</h3>
 <pre>
 <p><a href="https://git-scm.com/">What's Git (official website)</a></p>
 > We aim to publish all relevant infrastructure and configuration details to our community in a way that not only allows for easy access, but also allows for uncomplicated contributions.
 > We chose to use a self-hosted Git server to achieve this. Full repository access is possible through Gitea (<a href="https://git.com.de/">https://git.com.de</a>), there you may register for your own account, browse, contribute, and, if desired, also publish your own repositories.
 > For a quick-glance at only LibertaCasa specific repositories we employ a cgit instance on <a href="https://git.casa/">https://git.casa</a> - if you only want to look, without editing anything, this is the perfect place to go, as it is blazing fast and easy to navigate.
 <footer>
    <a href="mailto:hello@liberta.casa">Contact </a>
 </footer>
 </pre>
 </body>
 </html>
--- a/i2p.html
+++ b/i2p.html
@ -49,20 +49,6 @@ You should now be able to connect your IRC client with the following settings:
 	SSL/TLS: Off/Disabled
 	</code>
 Nickname, Username and SASL password are the regular details you would use for connecting to LibertaCasa.
 <footer>
    <a href="mailto:hello@liberta.casa"> Contact </a>
 </footer>
 </pre>
 </body>
 </html>
--- a/index.html
+++ b/index.html
@ -23,64 +23,40 @@ A community with multiple interconnected services which provides a safe space fo
 of various topics under the umbrella of Science, Philosophy, Politics and a general place to hang back and idle away.
-There is a focus on supporting <a href="https://en.wikipedia.org/wiki/Free_and_open-source_software">FOSS</a> protocols.
+There is a focus on supporting <a href="https://en.wikipedia.org/wiki/Free_and_open-source_software">FOSS</a> protocols 
 You can also visit us over The Onion Routing protocol at <a href="http://qzzf2qcfbhievvs5nzkccuwddroipy62qjocqtmgcgh75vd6w57m7yad.onion">our onion address.</a>
-<a href="/rules.html">Rules</a>
+
 Donts:
 ======
    -Repeated harassment of any network user.
    -Distribution of child pornography.
    -Dealing of goods and using the network as a space for commericial operations.
    -Any denial of service against the network or its users.
    -Use of our network resources or services for malicious intent.
    -Connecting to the network for any reason using a compromised machine, including as a proxy or loading trojans or bots.
    -Unwanted advertisement of websites, IRC network, or channels (also known as spamming).
    -Evading bans, either those placed by network staff or by individual channels.
    -Impersonation of network staff or services.
    -Connecting through open proxies.
    -Any other behavior deemed inappropriate by network staff.
-Services (Clearnet):
+Services:
-===================
+=========
-Communications:
+Communcations:
 --------------
-<a href="/irc.html">IRC</a> | <a href="/xmpp.html">XMPP</a>
+<a href="/xmpp.html">XMPP</a> | <a href="/matrix.html">Matrix</a> | <a href="/irc.html">IRC</a> 
 Services:
 ---------
-Others:
+<a href="https://pasta.lysergic.dev">Private Bin</a> | <a href="https://git.com.de">Gitea - Git with a cup of cum.</a> | <a href="https://searx.xkek.net"> Searx search </a> | <a href="https://yacy.xkek.net"> Yacy Search</a>
 ------
 <a href="https://pasta.lysergic.dev">Private Bin</a> | <a href="https://git.com.de">Gitea</a> | <a href="https://party.lysergic.dev">Cytube - Watch together</a>
 Services (Tor):
 ==============
 Communications:
 --------------
 <a href="/irc.html">IRC</a>
 Services (I2P):
 ==============
 Communications:
 --------------
 <a href="/irc.html">IRC</a>
 Contribute:
 ==========
 Check out the <a href="git.html">/git</a> info page or head directly to the <a href="https://git.casa/">main repository.</a>
 <footer>
  <a href="mailto:hello@liberta.casa">Contact </a>
 </footer>
 </pre>
 </body>
 </html>
--- a/irc.html
+++ b/irc.html
@ -16,14 +16,10 @@
 ┌─┐ ┬─┐ ┐─┐ ┬─┐
 │   │─┤ └─┐ │─┤
 └─┘ ┘ │ ──┘ ┘ │
 </pre>
 <h3>IRC</h3>
 <pre>
 <a href="/register">Registration</a>
-<a href="/kiwi">KiwiIRC Webchat</a> | <a href="/gamja">Gamja Webchat</a>
+<a href="/kiwi">KiwiIRC Webchat</a> | <a href="/gamja">Gamja Webchat</a> | <a href="/convos">Convos Webchat/Bouncer</a>
 Connection Details:
@ -46,17 +42,25 @@ you can access the network via
   Port:     6667
   SSL/TLS:  False
-Webchat via Tor is available through the links on the top - KiwiIRC will offer the best experience.
+Webclient via Tor is available <a href="http://qzzf2qcfbhievvs5nzkccuwddroipy62qjocqtmgcgh75vd6w57m7yad.onion">here</a>
 2. I2P
  Guide to setting up i2p <a href="/i2p.html">here</a>
  Use the samle configuration shown above.
  Destination: fzsgc66e52ve5phrcktrekqtko423ihau42u72v4cfg6bg4osuda.b32.i2p
  Port:        6668
  SSL/TLS:     False
 Account registration FAQ
 ========================
 1. How do I register my nickname / account?
-Use this command, substituting your desired password:
+Use this command, substituting your desired password and e-mail address:
-  /msg NickServ register mySecretPassword
+/msg NickServ register mySecretPassword
 You can also register on this page <a href="/register">here</a>
@ -65,11 +69,14 @@ Once you register your nick it becomes your account name. It is the name with wh
 2. How do I authenticate to my nickname?
-You should enable SASL in your client.
+You should enable SASL in your client. For clients like Hexchat the Username field needs to be populated with the name that you registered.
- - If your client doesn't support SASL, then update to a good client!
+If your client doesn't support SASL, there are potential workarounds;
- - Alternatively, you can use the "PASS" method
+you may be able to script your client to authenticate to NickServ
 automatically, with `/msg NickServ identify nickname password`.
 Ask in #help for support with this.
 3. What are the benefits of registering my nickname?
@ -82,17 +89,29 @@ as an "IRC bouncer" on your behalf. Specifically:
  c. Optionally, the server can keep you present on the server even if
     you have no connected clients. To enable this, use the following command:
     `/msg NickServ set always-on true`
-  d. You will be able to receive <a href="https://github.com/ergochat/ergo/blob/master/docs/USERGUIDE.md#history">history</a> playback.
+  d. You will be able to receive history playback (see below).
 You can also request a vhost in the channel #help (i.e., a fake hostname that will be displayed
 in place of your cloaked IP-based hostname).
-For more information checkout the <a href="https://github.com/ergochat/ergo/blob/master/docs/USERGUIDE.md">UserGuide</a> and
+4. History Playback.
-the <a href="https://github.com/ergochat/ergo/blob/master/docs/MANUAL.md">Manual</a>.
+
 1 If you set your client to `always-on` (see the previous section for details), you can set a "device ID" for each device you use. Oragono will then remember the last time your device was present on the server, and each time you sign on, it will attempt to replay exactly those messages you missed.
 2 You can set the SASL Username as `nick@phone` or `nick@laptop` while connecting. This allows you to fetch history based on your "DeviceID" which is `phone` or `laptop` in these cases.
 3 If you only have one device, you can set your client to be always-on and furthermore `/NS SET autoreplay-missed true`. This will replay missed messages, with the caveat that you must be connecting with at most one client at a time.
 4 You can autoreplay a fixed number of lines (e.g., 25) each time you join a channel using `/NS SET autoreplay-lines 25`.
 5 You can manually request history using `/history #channel 1h` (the parameter is either a message count or a time duration). (Depending on your client, you may need to use `/QUOTE history` instead.)
 6 You can also enable history for private messages called `DMs`  by passing the following command: `/NS SET dm-history true`.
 #### Sessions and Clients
 - You can check how many of your sessions are online with `/NS SESSIONS `and the idle times for those.
 - You can list your clients in further detail with `/NS CLIENTS list`
 - You can use `/NS CLIENTS logout client-id/all` to either logout a single session or all sessions.
 <footer>
  <a href="mailto:hello@liberta.casa">Contact </a>
 </footer>
 </pre>
 </body>
 </html>
--- a/matrix.html
+++ b/matrix.html
@ -0,0 +1,24 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta charset="UTF-8">
  <link rel="stylesheet" href="styles.css">
 <title>LibertaCasa</title>
 </head>
 <body>
 <pre>
 ┬   ┌┬┐ ┬─┐ ┬─┐ ┬─┐ ┌┐┐ ┬─┐
 │    │  │─│ │─  │┬┘  │  │─┤
 ┘─┘ └┴┘ │─┘ ┴─┘ │└┘  ┘  ┘ │
 ┌─┐ ┬─┐ ┐─┐ ┬─┐
 │   │─┤ └─┐ │─┤
 └─┘ ┘ │ ──┘ ┘ │
 <a href="https://element.liberta.casa">Matrix WebClient</a>
 </pre>
 </body>
 </html>
--- a/rules.html
+++ b/rules.html
@ -1,53 +0,0 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta charset="UTF-8">
  <link rel="stylesheet" href="styles.css">
 <title>LibertaCasa - Rules</title>
 </head>
 <body>
 <pre>
 ┬   ┌┬┐ ┬─┐ ┬─┐ ┬─┐ ┌┐┐ ┬─┐
 │    │  │─│ │─  │┬┘  │  │─┤
 ┘─┘ └┴┘ │─┘ ┴─┘ │└┘  ┘  ┘ │
 ┌─┐ ┬─┐ ┐─┐ ┬─┐
 │   │─┤ └─┐ │─┤
 └─┘ ┘ │ ──┘ ┘ │
 </pre>
 <h3>Rules</h3>
 <pre>
 Donts:
 ========
  -Repeated harassment of any network user.
  -Distribution of child pornography.
  -Dealing of goods and using the network as a space for commericial operations.
  -Any denial of service against the network or its users.
  -Use of our network resources or services for malicious intent.
  -Connecting to the network for any reason using a compromised machine, including as a proxy or loading trojans or bots.
  -Unwanted advertisement of websites, IRC network, or channels (also known as spamming).
  -Evading bans, either those placed by network staff or by individual channels.
  -Impersonation of network staff or services.
  -Connecting through open proxies.
  -Any other behavior deemed inappropriate by network staff.
 <footer>
  <a href="mailto:hello@liberta.casa"> Contact </a>
 </footer>
 </pre>
 </body>
 </html>
--- a/sso.html
+++ b/sso.html
@ -1,45 +0,0 @@
 <!DOCTYPE html>
 <html>
 <head>
 <meta charset="UTF-8">
  <link rel="stylesheet" href="styles.css">
 <title>LibertaCasa - git</title>
 </head>
 <body>
 <pre>
 ┬   ┌┬┐ ┬─┐ ┬─┐ ┬─┐ ┌┐┐ ┬─┐
 │    │  │─│ │─  │┬┘  │  │─┤
 ┘─┘ └┴┘ │─┘ ┴─┘ │└┘  ┘  ┘ │
 ┌─┐ ┬─┐ ┐─┐ ┬─┐
 │   │─┤ └─┐ │─┤
 └─┘ ┘ │ ──┘ ┘ │
 </pre>
 <h3> Single Sign On </h3>
 <pre>
   <p> With a growing list of services, it becomes apparent that multiple logins aren't LUSER friendly.
      This is being attempted to be resolved by a Single Sign On system. It is a work in progress with many services already having been integrated.
      These are currently: IRC (opt-in), XMPP, Gitea, Etherpad, Confluence.</p>
    Registering for SSO   
   =====================
   1. Click <a href='https://sso.casa'>here</a> and then click on the "Manage" button.
   2. Fill up the fields and ensure the email is valid as it shall recieve a confirmation link.
   3. Click the "Register" link to complete the procedure and recieve the confirmation email.
   3. Once you Verify your account you can log into the sso-enabled services using the same credentials.
 <footer>
 <a href="mailto:hello@liberta.casa"> Contact </a>
 </footer>
 </pre>
 </body>
 </html>
--- a/styles.css
+++ b/styles.css
@ -9,9 +9,5 @@ a {
 }
 a:hover {
-    background-color: rgb(130, 100, 185);
+    background-color: blue;
 }
 footer {
    color: green;
 }
--- a/xmpp.html
+++ b/xmpp.html
@ -16,46 +16,11 @@
 ┌─┐ ┬─┐ ┐─┐ ┬─┐
 │   │─┤ └─┐ │─┤
 └─┘ ┘ │ ──┘ ┘ │
 </pre>
 <h3>XMPP</h3>
 <pre>
 <p><a href="https://xmpp.org/">What's XMPP (official website)</a></p>
 <a href="https://xmpp.org/about/faq.html">XMPP FAQs (more)</a>
 <p><a href="https://xmpp.org/about/technology-overview.html">Overview: </a> XMPP is the Extensible Messaging and Presence Protocol, a set of open technologies for instant messaging, presence, multi-party chat, voice and video calls, collaboration, lightweight middleware, content syndication, and generalized routing of XML data.</p>
 There are quite a few clients available. You can check the overview <a href="https://xmpp.org/software/clients.html">here</a>.
 You can use our XMPP server and federate to others by using your <a href="https://sso.casa/">LibertaCasa SSO credentials</a>.
 JID: username@liberta.casa
 Password: your SSO password
 Currently, you can use any XMPP/Jabber client to connect to the following server:
 Host: xmpp.liberta.casa
 Port: 5222
 TLS/SSL: Enforced
 Installing a desktop client, i.e. <a href="https://dino.im/">Dino</a> or <a href="https://gajim.org/">Gajim</a> is recommended. Mobile client in the form of Android, i.e. <a hreF="https://conversations.im/">Conversations</a>, or iOS, i.e. <a href="https://siskin.im/">Siskin</a>, clients are viable options as well.
 Alternatively, you can use the <a href="https://xmpp.lib.casa/">Converse.JS</a> or <a href="https://liberta.casa/candy/">Candy webchat</a>, however keep in mind that those are both highly experimental services,  making for an extremely rudimentary experience with no guaranteed functionality.
 <br><br><br>
 <a href='https://compliance.conversations.im/server/liberta.casa'><img src='https://compliance.conversations.im/badge/liberta.casa'></a>
 <footer>
  <a href="mailto:hello@liberta.casa">Contact</a>
 </footer>
 </pre>
 </body>
 </html>