From 816be36a52439a92d980bb7312f7a60c6a651480 Mon Sep 17 00:00:00 2001
From: 3wc <3wc.cyberia@doesthisthing.work>
Date: Thu, 29 Jul 2021 11:11:51 +0200
Subject: [PATCH] Revert unthemed template changes, tweak theme

---
 capsulflask/templates/account-balance.html |  2 +
 capsulflask/templates/base.html            | 14 ++--
 capsulflask/templates/faq.html             | 90 +++++++++++++++++-----
 capsulflask/templates/index.html           | 33 ++++----
 capsulflask/templates/pricing.html         | 47 ++++++++---
 capsulflask/templates/support.html         | 12 ++-
 capsulflask/theme/yolocolo/base.html       |  8 +-
 capsulflask/theme/yolocolo/index.html      | 12 ++-
 8 files changed, 151 insertions(+), 67 deletions(-)

diff --git a/capsulflask/templates/account-balance.html b/capsulflask/templates/account-balance.html
index 3028baa..3d47e70 100644
--- a/capsulflask/templates/account-balance.html
+++ b/capsulflask/templates/account-balance.html
@@ -49,6 +49,8 @@
           {% if btcpay_enabled %}
           <li><a href="/payment/btcpay">Add funds with Bitcoin/Litecoin/Monero (btcpay)</a></li>
           {% endif %}
+    
+          <li>Cash: email <a href="mailto:treasurer@cyberia.club">treasurer@cyberia.club</a></li>
         </ul>
       </li>
     </ul>
diff --git a/capsulflask/templates/base.html b/capsulflask/templates/base.html
index 325ab0e..43f6266 100644
--- a/capsulflask/templates/base.html
+++ b/capsulflask/templates/base.html
@@ -13,7 +13,7 @@
 <nav>
   <div class="row justify-space-between half-margin">
     <div>
-      🦉 <a href="/"><b>YOLOCOLO</b></a>
+      <a href="/"><b>Capsul</b></a>💊
     </div>
     <div>
       &nbsp;
@@ -27,6 +27,7 @@
   <div class="row justify-center half-margin wrap nav-links">
     <a href="/pricing">Pricing</a>
     <a href="/faq">FAQ</a>
+    <a href="/changelog">Changelog</a>
 
     {% if session["account"] %} 
       <a href="/console">Capsuls</a>
@@ -46,12 +47,11 @@
 </main>
 {% block subcontent %}{% endblock %}
 <footer>
-  This server runs <a
-    href="https://giit.cyberia.club/~forest/capsul-flask">capsul-flask</a> by
-  Cyberia Computer Club, available under the <a
-    href="https://creativecommons.org/licenses/by-sa/4.0/">Attribution-ShareAlike
-    4.0 International</a> licence.<br/><br/>
-  <a href="https://git.autonomic.zone/3wordchant/capsul-flask/src/branch/yolocolo/capsulflask{% block pagesource %}{% endblock %}">View page source</a>
+  (c) Attribution-ShareAlike 4.0 International <br/>
+  &nbsp;&nbsp;&nbsp;&nbsp;A service by Cyberia Computer Club 2020-<span class="bigtext">∞</span> <br/>
+  <br/>
+  <br/>
+  <a href="https://giit.cyberia.club/~forest/capsul-flask/tree/master/capsulflask{% block pagesource %}{% endblock %}">View page source</a>
 </footer>
 </body>
 </html>
diff --git a/capsulflask/templates/faq.html b/capsulflask/templates/faq.html
index 54dbc95..d3a832b 100644
--- a/capsulflask/templates/faq.html
+++ b/capsulflask/templates/faq.html
@@ -10,32 +10,82 @@
 <p>
  <ul>
    <li>
-     What is this?
-     <p>
-      This is a <strong>technical demo</strong> of <a
-       href="https://giit.cyberia.club/~forest/capsul-flask">Capsul</a>, for the
-      as-yet-untitled <a href="https://coops.tech">Cotech</a> server hosting
-      initiative, which you can <a
-      href="https://community.coops.tech/t/call-for-input-v2-co-op-vps-survey/2802/9">read
-     about on the Cotech forum</a>.
-     </p>
+     Which instance type should I buy?
+     <p>There are no hard rules for this sort of thing, but here are some guidelines:</p>
+     <p>f1-xs: blog, vpn, bot, cgit</p>
+     <p>f1-s: a bot, owncloud, gitea, popular blog</p>
+     <p>f1-m: docker host, build system</p>
+     <p>f1-l: large webservice, rotund java app</p>
+     <p>f1-x: gitlab (wow such memory very devops</p>
+     <p>f1-xx: something gargantuan</p>
    </li>
    <li>
-     What do you mean, "technical demo"?
-     <p>No backups</p>
-     <p>No service level agreement</p>
-     <p>"Best effort" support</p>
+     How do I log in?
+     <p>ssh to the ip provided to you using the cyberian user.</p>
+     <pre class='code'>$ ssh cyberian@1.2.3.4</pre>
+     <p>For more information, see <a href="/about-ssh">Understanding the Secure Shell Protocol (SSH)</a>.</p>
    </li>
    <li>
-     Where can I get this, but, more reliable?
-     <p>Cyberia, the authors of this platform, run the canonical instance, <a
-      href="https://capsul.org">Capsul.org</a>, on hardware they own. Please
-     send them your money! (cash, crypto, or card accepted).</p>
+     How do I change to the root user?
+     <p>The cyberian user has passwordless sudo access by default. This should work:</p>
+     <pre class='code'>
+# Linux
+$ sudo su -
+
+# OpenBSD
+$ doas su -</pre>
    </li>
    <li>
-     How do I use this system?
-     <p>Please see <a href="https://capsul.org/faq">the official Capsul FAQ
-       page</a>.</p>
+     Do you offer reverse DNS?
+     <p>We do, but right now it's a manual process. Shoot us an email and we'll get it done.</p>
+   </li>
+   <li>
+    What if I don't pay / don't maintain my payments?
+    <p>Your VM will eventually be deleted.
+       Capsul will send you a few inoffensive reminders as that termination date approaches.
+    </p>
+   </li>
+   <li>
+    Besides my virtual machines and payments, what information do you keep about me?
+     <p>We associate an email address with every VM so that we can track payment and respond to support requests.</p>
+     <p>If you pay with a credit card, Stripe stores some additional details about you that we literally cannot delete.</p>
+   </li>
+   <li>
+     What can I do with my VM?
+     <p>Make it into a mailserver, a tor relay, a VPN host, whatever you'd like - we do have one small request, though.</p>
+     <p>Crypto mining on capsul is currently considered obnoxious behavior, because the hashrates on our CPUs is so low and because mining crypto consumes entire processor cores that could have otherwise been shared between many dozens of other users.</p>
+     <p>In the future, if we have plentiful CPU resources, we may come out with a tier more suitable for mining - maybe a high cpu tier or similar, where each VM gets a full dedicated core and sharing them is not anticipated.</p>
+     <p>We will never snoop on your traffic or inspect what's going on inside of our customer virtual machines - we don't want to. We hope that you'll extend us a similar courtesy and try not to use too much of our shared CPU resources. Capsul is currently a shared (resource-wise) world, and we all must live in it together!</p>
+     <p>Also, mandatory: our systems exist within the USA, and as such those systems are bound by US law.</p>
+   </li>
+   <li>
+     Can you recover my passwords/insert new keys?
+     <p>Can we? Technically yes. Will we? No, never. It would violate the trust that our users have in us.
+     We have no interest in touching client VMs after they're running.
+     We promise to keep your machines running smoothly.
+     If you lose access to your VM, that's on you.</p>
+   </li>
+   <li>
+     Do you offer refunds?
+     <p>Not now, but email us and we can probably figure something out.</p>
+   </li>
+   <li>
+    Where do the VMs run? Is it on a machine that you guys own/control?
+     <p>Capsul runs on a server named Baikal which Cyberia built from scratch & mailed to a datacenter
+      in Georgia called CyberWurx. CyberWurx staff installed it for us in a rack space that
+      Cyberia pays for. </p>
+   </li>
+   <li>
+     Do you offer support?
+     <p>Yep, see <a href="/support">our support page</a>.</p>
+   </li>
+   <li>
+     Do you have an SLA?
+     <p>No, but we normally respond pretty quickly.</p>
+   </li>
+   <li>
+    Will you implement feature X?
+    <p>Maybe! Email <a href="mailto:ops@cyberia.club">ops@cyberia.club</a> and ask us about it.</p>
    </li>
  </ul>
 </p>
diff --git a/capsulflask/templates/index.html b/capsulflask/templates/index.html
index f785803..c5ab27b 100644
--- a/capsulflask/templates/index.html
+++ b/capsulflask/templates/index.html
@@ -1,26 +1,31 @@
 {% extends 'base.html' %}
 
-{% block content %}
-  <h1>
-  <pre>
-             _                 _
- _   _  ___ | | ___   ___ ___ | | ___
-| | | |/ _ \| |/ _ \ / __/ _ \| |/ _ \
-| |_| | (_) | | (_) | (_| (_) | | (_) |
- \__, |\___/|_|\___/ \___\___/|_|\___/
- |___/
 
+{% block content %}
+  <h1>CAPSUL</h1>
+  <pre>
+       .-.  
+      /:::\ 
+     /::::/ 
+    / `-:/  
+   /    /   
+   \   /    
+    `"`     
   </pre>
-  <span>Co-operative hosting using <a href="https://cyberia.club">Cyberia</a>'s Capsul</span>
+  <span>Simple, fast, private compute by <a href="https://cyberia.club">cyberia.club</a></span>
 {% endblock %}
 
 {% block subcontent %}
 <p>
  <ul>
-   <li>Sign up for an account!</li>
-   <li>Add some funds!</li>
-   <li>Create a VPS!</li>
-   <li>Give your feedback!</li>
+   <li>Low friction: simply log in with your email address and fund your account with Credit/Debit or Cryptocurrency</li>
+   <li>All root disks are backed up at no charge</li>
+   <li>All storage is fast, local, and solid-state</li>
+   <li>All network connections are low latency</li>
+   <li>Supported by amazing volunteers from Cyberia</li>
+   <li>Upfront prices, no confusing billing</li>
+   <li>Operated by a Minnesota non-profit organization that will never exploit you</li>
+   <li>We donate a portion of our proceeds to likeminded hacker groups around the globe</li>
  </ul>           
 </p>
 {% endblock %}
diff --git a/capsulflask/templates/pricing.html b/capsulflask/templates/pricing.html
index c2156cc..6888660 100644
--- a/capsulflask/templates/pricing.html
+++ b/capsulflask/templates/pricing.html
@@ -7,17 +7,42 @@
     <h1>CAPSUL TYPES & PRICING</h1>
   </div>
   <div class="row half-margin">
-    <p>
-      Rates for this service aren't set yet. You can see Cyberia's Capsul pricing
-      on <a href="https://capsul.org/pricing">their website</a>.
-    </p>
-  </div>
-  <div>
-    <pre>
-      SUPPORTED OPERATING SYSTEMS:
-
-      {% for os_id, os in operating_systems.items() %}   - {{ os.description }} 
+    <table>
+      <thead>
+        <tr>
+          <th>type</th>
+          <th>monthly*</th>
+          <th>cpus</th>
+          <th>mem</th>
+          <th>ssd</th>
+          <th>net</th>
+        </tr>
+      </thead>
+      <tbody>
+      {% for vm_size_key, vm_size in vm_sizes.items() %}
+        <tr>
+          <td>{{ vm_size_key }}</td>
+          <td>${{ vm_size['dollars_per_month'] }}</td>
+          <td>{{ vm_size['vcpus'] }}</td>
+          <td>{{ vm_size['memory_mb'] }}</td>
+          <td>25G</td>
+          <td>{{ vm_size['bandwidth_gb_per_month'] }}</td>
+        </tr>
       {% endfor %}
-    </pre>
+      </tbody>
+    </table>
+  </div>
+  <div class="row half-margin">
+    <pre>
+    * net is calculated as a per-month average
+    * vms are billed for a minimum of 24 hours upon creation
+    * all VMs come standard with one public IPv4 address
+    
+    SUPPORTED OPERATING SYSTEMS:
+
+
+    {% for os_id, os in operating_systems.items() %}   - {{ os.description }} 
+    {% endfor %}
+  </pre>
   </div>
 {% endblock %}
diff --git a/capsulflask/templates/support.html b/capsulflask/templates/support.html
index ded9b82..07888f1 100644
--- a/capsulflask/templates/support.html
+++ b/capsulflask/templates/support.html
@@ -7,14 +7,20 @@
     <h1>SUPPORT</h1>
   </div>
   <div class="row half-margin">
-    <a href="mailto:yolocolo@doesthisthing.work?subject=Please%20help!">yolocolo@doesthisthing.work</a> 
+    <a href="mailto:support@cyberia.club?subject=Please%20help!">support@cyberia.club</a> 
   </div>
 {% endblock %}
 
 {% block subcontent %}
 <p>
-  You can also find us on Matrix: <a
-    href="https://matrix.to/#/#untitled-hosting.public:autonomic.zone">#untitled-hosting.public:autonomic.zone</a>.
+  Note: We maintain a searchable archive of all support emails at 
+  <a href="https://lists.cyberia.club/~cyberia/support">https://lists.cyberia.club/~cyberia/support</a>
+</p>
+<p>
+  If you do not want your mail to appear in a public archive, email <a href="mailto:capsul@cyberia.club?subject=Please%20help!">capsul@cyberia.club</a> instead.
+</p>
+<p>
+  Please describe your problem or feature request, and we will do our best to get back to you promptly. Thank you very much.
 </p>
 {% endblock %}
 
diff --git a/capsulflask/theme/yolocolo/base.html b/capsulflask/theme/yolocolo/base.html
index eae2af4..72d149f 100644
--- a/capsulflask/theme/yolocolo/base.html
+++ b/capsulflask/theme/yolocolo/base.html
@@ -2,7 +2,7 @@
 <head>
   <!-- Namecoin Address: N2aVL6pHtBp7EtNGb3jpsL2L2NyjBNbiB1 -->
   <link href="{{ url_for('static', filename='favicon.yolocolo.ico') }}" rel="icon">
-  <title>{% block title %}{% endblock %}{% if self.title() %} - {% endif %}Capsul</title>
+  <title>{% block title %}{% endblock %}{% if self.title() %} - {% endif %}Serverscoop</title>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <meta name="Description" content="Cyberia Capsul">
@@ -14,7 +14,7 @@
 <nav>
   <div class="row justify-space-between half-margin">
     <div>
-      🦉 <a href="/"><b>YOLOCOLO</b></a>
+      🍞 <a href="/"><b>serverscoop</b></a>
     </div>
     <div>
       &nbsp;
@@ -49,9 +49,7 @@
 <footer>
   This server runs <a
     href="https://giit.cyberia.club/~forest/capsul-flask">capsul-flask</a> by
-  Cyberia Computer Club, available under the <a
-    href="https://creativecommons.org/licenses/by-sa/4.0/">Attribution-ShareAlike
-    4.0 International</a> licence.<br/><br/>
+  Cyberia Computer Club, available under the GNU AFFERO GENERAL PUBLIC LICENSE.<br/><br/>
   <a href="https://git.autonomic.zone/3wordchant/capsul-flask/src/branch/yolocolo/capsulflask{% block pagesource %}{% endblock %}">View page source</a>
 </footer>
 </body>
diff --git a/capsulflask/theme/yolocolo/index.html b/capsulflask/theme/yolocolo/index.html
index f785803..a411c4c 100644
--- a/capsulflask/theme/yolocolo/index.html
+++ b/capsulflask/theme/yolocolo/index.html
@@ -3,13 +3,11 @@
 {% block content %}
   <h1>
   <pre>
-             _                 _
- _   _  ___ | | ___   ___ ___ | | ___
-| | | |/ _ \| |/ _ \ / __/ _ \| |/ _ \
-| |_| | (_) | | (_) | (_| (_) | | (_) |
- \__, |\___/|_|\___/ \___\___/|_|\___/
- |___/
-
+ ___  ___ _ ____   _____ _ __ ___  ___ ___   ___  _ __  
+/ __|/ _ \ '__\ \ / / _ \ '__/ __|/ __/ _ \ / _ \| '_ \ 
+\__ \  __/ |   \ V /  __/ |  \__ \ (_| (_) | (_) | |_) |
+|___/\___|_|    \_/ \___|_|  |___/\___\___/ \___/| .__/ 
+                                                 |_|    
   </pre>
   <span>Co-operative hosting using <a href="https://cyberia.club">Cyberia</a>'s Capsul</span>
 {% endblock %}