about summary refs log tree commit diff stats
path: root/html
diff options
context:
space:
mode:
Diffstat (limited to 'html')
-rw-r--r--html/faq.html39
-rw-r--r--html/index.html89
-rw-r--r--html/signup.html11
-rwxr-xr-xhtml/submit.php4
4 files changed, 73 insertions, 70 deletions
diff --git a/html/faq.html b/html/faq.html
index 8cd73b1..25f1078 100644
--- a/html/faq.html
+++ b/html/faq.html
@@ -16,49 +16,44 @@
 			<p>Once you've logged in, check the path for your desired shell with</p>
 			<div class="code">$ which fish</div>
 			<p>Replacing <code>fish</code> with the the shell you want. In this case, the path will be
-				<code>/usr/local/bin/fish</code>
-				Now, run:</p>
-			<div class="code">$ EDITOR=nano chsh</div>
+			<code>/usr/local/bin/fish</code> Now, run:</p>
+				<div class="code">$ EDITOR=nano chsh</div>
 			<p>Change the <code>Shell</code> line to read:</p>
-			<div class="code">Shell: /usr/local/bin/fish</div>
+				<div class="code">Shell: /usr/local/bin/fish</div>
 			<p>Save and exit. You'll need to log out then back in.</p>
 
 			<p class="q">How do I change the index page of my site?</p>
 			<p>Because of the way <code>httpd(8)</code> is set up, you'll need to ask in <code>#institute</code> or send
-				an email to <code>admins@tilde.institute</code></p>
+			an email to <code>admins@tilde.institute</code></p>
 
 			<p class="q">Can you install this package for me?</p>
 			<p>As long as it's in the OpenBSD ports tree, and doesn't facilitate any potentially malicious behavior
-				(like <code>nmap</code>),
-				then it's probably not a big deal. Either hop on IRC and ask in <code>#institute</code> or send an email
-				to <code>admins@tilde.institute</code></p>
-			<p>If you compile something on your own that you know you shouldn't be running (like a bittorrent client or a
-				cryptocurrency miner), then you can expect to be summarily ejected from the server.</p>
+			(like <code>nmap</code>),
+			then it's probably not a big deal. Either hop on IRC and ask in <code>#institute</code> or send an email
+			to <code>admins@tilde.institute</code></p>
+			<p>If you compile something on your own that you know you shouldn't be running (like a cryptocurrency miner),
+			then you can expect to be summarily ejected from the server.</p>
 
 			<p class="q">How do I authenticate with SMTP remotely?</p>
 			<p>Only local access to SMTP is allowed. However, you can use an SSH tunnel on your machine to send mail.</p>
 			<div class="code">ssh -nNTL 25:localhost:25 tilde.institute</div>
 			<p>You won't need to supply a username or password when sending mail via <code>localhost:25</code> this way,
-				since you're already authenticated via SSH.</p>
+			since you're already authenticated via SSH.</p>
 
 			<p class="q">Can you whitelist a port for me in the firewall?</p>
 			<p>Sorry, but this presents too much of a security risk on a public-access system.</p>
 
 			<p class="q">Are user services allowed?</p>
-			<p>Generally, yes. If you're running something that's using a ton of resources or in some way affecting
-				other users or the general use of the system,
-				then we'll kill it. Just be aware of what you're running and how it may affect the system and other
-				users, and if you think something will be using a bunch of CPU, please <code>renice</code> the process.</p>
+			<p>Yes. If you're running something that's using a ton of resources or in some way affecting other users or
+			the general use of the system, then we'll either renice it or kill it. Just be aware of what you're running
+			and how it may affect the system and other users, and if something heavily utilizing the CPU, please
+			<code>renice</code> the process.</p>
 
 			<p class="q">Are IRC bots allowed?</p>
 			<p>Yes, though there are restrictions on their use on the <code>tilde.chat</code> IRC network. They should
-				not reside in <code>#meta</code>, instead keep
-				them in a private channel or in <code>#bots</code>. Bots must also conform to the <a
-					href="https://tildegit.org/tildeverse/rfcs/src/branch/master/rfcs/rfc2.md">bot guidelines listed
-					here</a>.</p>
-			<p>Don't run <code>eggdrop</code> from tilde.institute. There are legitimate uses for <code>eggdrop</code>,
-				but separating the people with some kind
-				of legitimate use from malicious users is tiring. So, no <code>eggdrop</code>.</p>
+			not reside in <code>#meta</code>, instead keep them in a private channel or in <code>#bots</code>. Bots must
+			also conform to the
+			<a href="https://tildegit.org/tildeverse/rfcs/src/branch/master/rfcs/rfc2.md">bot guidelines listed here</a>.</p>
 			<br />
 			<br />
 		</div>
diff --git a/html/index.html b/html/index.html
index 8c97241..859825b 100644
--- a/html/index.html
+++ b/html/index.html
@@ -17,7 +17,7 @@
 		aspects of a multi-user UNIX system. Gopher and web space, IRC, games, and more are available!</p>
             <p>User sites are accessible via <code>https://&lt;user&gt;.tilde.institute</code></p>
             <p style="margin-top:-1.0rem">A list of user gopherholes is available at
-                <code>gopher://tilde.institute</code></p>
+                <code><a href="gopher://tilde.institute">gopher://tilde.institute</a></code></p>
             <p style="margin-top:-1.0rem">User git repositories are at <code><a href="https://git.tilde.institute">
                 https://git.tilde.institute</a></code></p>
             <p>The mailing list will be the primary means of communication between tilde.institute admins and users
@@ -53,67 +53,69 @@
             <p>The compilers and interpreters available are:</p>
             <ul>
 		<li><code>apl 1.8</code></li>
-                <li><code>brainf*ck 2.7.1</code></li>
-		<li><code>chicken (Scheme) 5.2.0</code></li>
+                <li><code>brainfuck 2.7.1</code></li>
+		<li><code>chicken (Scheme) 5.3.0</code></li>
 		<li><code>cim (Simula) 5.1</code></li>
-                <li><code>clang 8.0.1</code></li>
+                <li><code>clang 13.0.0</code></li>
                 <li><code>clisp 2.49</code></li>
-                <li><code>clojure 1.10.1.469</code></li>
-                <li><code>crystal 0.30.1</code></li>
-		<li><code>cython 0.29.14 (Py2 and Py3)</code></li>
-                <li><code>elixir 1.10.2</code></li>
+                <li><code>clojure 1.10.3</code></li>
+                <li><code>crystal 1.2.2</code></li>
+		<li><code>cython 0.29.27 (Py2 and Py3)</code></li>
+                <li><code>elixir 1.11.4</code></li>
                 <li><code>erlang 21.2</code></li>
-		<li><code>fpc (Pascal) 3.0.4</code></li>
+		<li><code>fpc (Pascal) 3.2.2</code></li>
 		<li><code>flang (Fortran via LLVM) 8.0.1</code></li>
-		<li><code>gambit (Scheme) 4.9.3</code></li>
-                <li><code>gcc 8.3.0 (see the <a href="https://wiki.tilde.institute/w/gcc8">wiki page</a>)</code></li>
+		<li><code>gambit (Scheme) 4.9.4</code></li>
+                <li><code>gcc 11.2.0 (see the <a href="https://wiki.tilde.institute/w/gcc">wiki page</a>)</code></li>
 		<li><code>gerbil (Scheme) 0.15.1 (see the <a href="https://wiki.tilde.institute/w/gerbilscheme">wiki page</a>)</code></li>
                 <li><code>gforth 0.7.3</code></li>
-                <li><code>gfortran / g95 8.3.0 (see the <a href="https://wiki.tilde.institute/w/gcc8">wiki page</a>)</code></li>
-                <li><code>ghc (Haskell) 8.6.4</code></li>
-                <li><code>gnat (Ada) 8.3.0</code></li>
-		<li><code>gnucobol 2.2</code></li>
-		<li><code>go 1.13.9</code></li>
+                <li><code>gfortran / g95 11.2.0 (see the <a href="https://wiki.tilde.institute/w/gcc">wiki page</a>)</code></li>
+                <li><code>ghc (Haskell) 8.10.6</code></li>
+                <li><code>gnat (Ada) 11.2.0</code></li>
+		<li><code>gnucobol 3.1.2</code></li>
+		<li><code>go 1.17.7</code></li>
 		<li><code>gpc (Pascal) 20070904</code></li>
-		<li><code>gprolog 1.4.5</code></li>
-                <li><code>guile 1.8.8 and 2.2.6</code></li>
-		<li><code>janet 1.8.1</code></li>
-                <li><code>jdk 11 and 8 (see the <a href="https://wiki.tilde.institute/w/jdk">wiki page</a>)</code></li>
-                <li><code>lua 5.3.5 and 5.1.5</code></li>
-                <li><code>mono 6.8.0.105</code></li>
-                <li><code>nasm 2.14.02</code></li>
-		<li><code>nbfc (brainf*ck) 0.1</code></li>
+		<li><code>gprolog 1.5.0</code></li>
+                <li><code>guile 1.8.8 and 2.2.7</code></li>
+		<li><code>janet 1.21.1</code></li>
+                <li><code>jdk 1.8, 11, 17 (see the <a href="https://wiki.tilde.institute/w/jdk">wiki page</a>)</code></li>
+                <li><code>lua 5.3.6</code></li>
+                <li><code>mono 6.12.0.122</code></li>
+                <li><code>nasm 2.15.05</code></li>
+		<li><code>nbfc (brainfuck) 0.1</code></li>
 		<li><code>newlisp 10.7.5</code></li>
-                <li><code>nim 1.2.0</code></li>
-                <li><code>node.js 12.16.1</code></li>
-		<li><code>ocaml 4.09.0</code></li>
-                <li><code>perl 5.30.2</code></li>
-                <li><code>php 7.3.18</code></li>
-		<li><code>pypy 7.2.0</code></li>
-                <li><code>python 2.7.18 and 3.7.7</code></li>
-                <li><code>racket 7.6</code></li>
-                <li><code>rakudo (Raku / Perl6) 2018.12</code></li>
-                <li><code>regina (Rexx) 3.9.1</code></li>
-                <li><code>ruby 2.5.8, 2.6.6, 2.7.1</code></li>
-                <li><code>rust 1.42</code></li>
-		<li><code>sbcl (Common Lisp) 2.0.1</code></li>
+                <li><code>nim 1.6.4</code></li>
+                <li><code>node.js 16.14.2</code></li>
+		<li><code>ocaml 4.12.1</code></li>
+                <li><code>perl 5.32.1</code></li>
+                <li><code>php 7.4.30</code></li>
+		<li><code>pypy 7.3.1</code></li>
+                <li><code>python 2.7.18, 3.9.13</code></li>
+                <li><code>racket 8.4</code></li>
+                <li><code>rakudo (Raku / Perl6) 2021.12</code></li>
+                <li><code>regina (Rexx) 3.9.4</code></li>
+                <li><code>ruby 2.5.8, 2.6.6, 2.7.6, 3.0.4, 3.1.2</code></li>
+                <li><code>rust 1.59</code></li>
+		<li><code>sbcl (Common Lisp) 2.1.11-threads</code></li>
 		<li><code>scala 2.12.9</code></li>
-		<li><code>squeak-vm (Smalltalk) 3.10.1</code></li>
+		<li><code>squeak-vm (Smalltalk) 3.10.2</code></li>
 		<li><code>swi-prolog 7.6.0</code></li>
-		<li><code>tinyscheme 1.41</code></li>
+		<li><code>tinyscheme 1.42</code></li>
                 <li><code>yasm 1.3.0</code></li>
             </ul>
-            <p>The interactive shells available are:</p>
+            <p>The shells available are:</p>
             <ul>
+                <li><code>/bin/csh</code></li>
                 <li><code>/bin/ksh (default)</code></li>
                 <li><code>/bin/sh</code></li>
-                <li><code>/bin/csh</code></li>
                 <li><code>/usr/local/bin/bash</code></li>
                 <li><code>/usr/local/bin/dash</code></li>
-                <li><code>/usr/local/bin/zsh</code></li>
+                <li><code>/usr/local/bin/elvish</code></li>
                 <li><code>/usr/local/bin/fish</code></li>
                 <li><code>/usr/local/bin/tcsh</code></li>
-                <li><code>/usr/local/bin/elvish</code></li>
+		<li><code>/usr/local/bin/yash</code></li>
+                <li><code>/usr/local/bin/zsh</code></li>
+		<li><code>/usr/local/plan9/bin/rc</code></li>
             </ul>
 		<br />
 		<br />
@@ -133,3 +135,4 @@
 </body>
 
 </html>
+
diff --git a/html/signup.html b/html/signup.html
index 482a4ba..a5d5966 100644
--- a/html/signup.html
+++ b/html/signup.html
@@ -12,7 +12,10 @@
         <div id="content" class="signup">
             <h1>Request an Account</h1>
             <p>
-                If you haven't received the welcome email within 24 hours, please check your spam folder.
+                If you haven't received the welcome email within 24 hours, please check your spam folder. If you use <code>icloud.com</code> for mail, our welcome email will be rejected, so keep an eye on our fediverse account (navigation bar) to see when your user is added.
+	    </p>
+	    <p>
+	        Your email address is only used to send you a welcome email.
             </p>
             <p>
             <form action="submit.php">
@@ -23,8 +26,10 @@
                 <h3>What interests you about
                     tilde.institute?<br /></h3>
                 <input type="text" size="48" name="interest" />
-                <h3>Paste Your SSH Key in OpenSSH Format:<br /></h3>
+                <h3>Paste Your SSH Public Key in OpenSSH Format:<br /></h3>
                 <input type="text" size="48" name="sshkey" /><br />
+		You must be at least 13 years old to use this system.<br />
+		<br />
                 <input type="submit" value="Submit" />
             </form>
             </p>
@@ -32,4 +37,4 @@
     </div>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/html/submit.php b/html/submit.php
index 1b297e8..fee7461 100755
--- a/html/submit.php
+++ b/html/submit.php
@@ -101,7 +101,7 @@ if (isset($_REQUEST["username"]) && isset($_REQUEST["email"])) {
             $message .= "<li>invalid email address. did you mean:  " . htmlspecialchars($result["email"]) . "</li>";
     }
 
-    if ($_REQUEST["sshkey"] == "") {
+    if ($_REQUEST["sshkey"] == "" || (substr($_REQUEST["sshkey"], 0, 4) !== "ssh-" && substr($_REQUEST["sshkey"], 0, 3) !== "sk-" && substr($_REQUEST["sshkey"], 0, 5) !== "ecdsa")) {
         $message .= "<li>ssh key required: please create one and submit the public key</li>";
     }
 
@@ -109,7 +109,7 @@ if (isset($_REQUEST["username"]) && isset($_REQUEST["email"])) {
     if ($message == "") { // no validation errors
 
 	    // remember:
-	    $username = $_REQUEST["username"];
+	    $username = strtolower($_REQUEST["username"]);
 	    $email = $_REQUEST["email"];
 	    $interest = $_REQUEST["interest"];
 	    $sshkey = $_REQUEST["sshkey"];