Merge branch 'master' into master

This commit is contained in:
Arya K 2022-11-23 11:47:02 +00:00
commit cd9ef10cf7
25 changed files with 33 additions and 29 deletions

View File

@ -21,6 +21,6 @@
<li><a href=//cobra.vern.cc>Skylar (cobra)</a> - Hosts the tilserv, manages donations, webmaster <br> <a href=//mto.vern.cc/#/@cobra:vern.cc>Matrix</a>, <a href=//mto.vern.cc/#/@cobra:inetd.xyz>spare Matrix</a>, <a href=xmpp:cobra@vern.cc>XMPP</a><br>
Email: cobra (at sym) (main dom) (<a href=/media/cobra.asc>PGP</a>), spare thecobra (at sym) riseup dot net</li>
</ul>
<!--#include file="footer.html" -->
<!--#include file="footer.cgi" -->
</body>
</html>

View File

@ -22,7 +22,7 @@
<p>This canary's SHA256 checksum is <?php echo hash('sha256', file_get_contents("./canaries/latest")); ?></p>
<p>Previous canaries can be found <a href=/canaries>here</a>.</p>
<!--#include file="footer.html" -->
<!--#include file="footer.cgi" -->
</body>
</html>

View File

@ -30,6 +30,6 @@
<p>Any excess money we get (more than $12.75/mo) will be distributed among the admins.</p>
<p>Information about distribution of the money will be provided in a monthly financial report (starting from November 2022).</p>
<!--#include file="footer.html" -->
<!--#include file="footer.cgi" -->
</body>
</html>

View File

@ -118,6 +118,6 @@
}
?>
<!--#include file="footer.html" -->
<!--#include file="footer.cgi" -->
</body>
</html>

View File

@ -11,6 +11,6 @@
<h1>403 Forbidden</h1>
<p>You do not have access to this page. This may be because the www-data user does not have sufficient read permissions on the file.</p>
<!--#include file="/errors/common.html" -->
<!--#include file="/footer.html" -->
<!--#include file="/footer.cgi" -->
</body>
</html>

View File

@ -11,6 +11,6 @@
<h1>404 Not Found</h1>
<p>The page you are trying to reach either does not exist or you do not have permission to view it.</p>
<!--#include file="/errors/common.html" -->
<!--#include file="/footer.html" -->
<!--#include file="/footer.cgi" -->
</body>
</html>

View File

@ -11,6 +11,6 @@
<h1>503 Service Unavailable</h1>
<p>This service is unavailable.</p>
<!--#include file="/errors/common.html" -->
<!--#include file="/footer.html" -->
<!--#include file="/footer.cgi" -->
</body>
</html>

View File

@ -62,6 +62,6 @@
<div class=h><h2 id=contact>I didn't request an account on a chat program and no longer have the E-mail I signed up with. How can I contact an admin?</h2> <a aria-hidden=true href=#contact>#contact</a></div>
<p>Contact any admin by using the contact methods listed at the <a href=/en/admins>admins page</a>. The admin will give you a message signed to your ssh pubkey which you can decrypt with your privkey. If that succeeds, you will be given back access to your ~vern account</p>
<!--#include file="footer.html" -->
<!--#include file="footer.cgi" -->
</body>
</html>

10
en/footer.cgi Executable file
View File

@ -0,0 +1,10 @@
#!/usr/bin/env bash
echo "Content-type: text/html"
echo ""
echo "<footer>"
echo "<hr>"
echo "<p>Made with &lt;3 by ~vern team</p>"
echo "<p>Copyright (C) 2022 <a href=/en/admins>~vern team</a>. <a rel="license" href="/LICENSE.txt">Some rights reserved</a> under CC BY-SA 4.0.</p>"
echo "<p>Find the source code for this website on <a rel="source" href="//git.vern.cc/vern/website">~vern Gitea</a></p>"
echo "Commit Details: <a href=http://git.vern.cc/vern/website/commit/$(git rev-parse HEAD)>$(git rev-parse --short HEAD)-$(git show -s --format=%ci)</a>"
echo "</footer>"

View File

@ -1,6 +0,0 @@
<footer>
<hr>
<p>Made with &lt;3 by ~vern team</p>
<p>Copyright (C) 2022 <a href=/en/admins>~vern team</a>. <a rel="license" href="/LICENSE.txt">Some rights reserved</a> under CC BY-SA 4.0.</p>
<p>Find the source code for this website on <a rel="source" href="//git.vern.cc/vern/website">~vern Gitea</a></p>
</footer>

View File

@ -13,6 +13,6 @@
<div class=h><h1 id=i2p>Eepsites</h1> <a aria-hidden=true href=#i2p>#i2p</a></div>
<p>We respect your privacy and want you to be able to choose to be anonymous if you want. So most of our services have corresponding <a href=//i2p.net>I2P</a> <a href=//wl.vern.cc/wiki/I2P#Terminology>eepsites</a>. If a service doesn't have an address helper, its address is the default vern.i2p. You can use the Redirector extension in your browser to avoid clearnet connections.</p>
<!--#include file="i2p-services.html" -->
<!--#include file="footer.html" -->
<!--#include file="footer.cgi" -->
</body>
</html>

View File

@ -46,6 +46,6 @@
<div class=h><h2 id=sysinfo>What computers do ~vern servers run on?</h2> <a aria-hidden=true href=#sysinfo>#sysinfo</a></div>
<p>~vern has many servers running in different ways. You can find a list of them and their uses at <a href=/en/sysinfo>/sysinfo</a>.</p>
<!--#include file="footer.html" -->
<!--#include file="footer.cgi" -->
</body>
</html>

View File

@ -274,6 +274,6 @@ search for and delete.</p>
<p>To exercise these rights, send an email to deletion@vern.cc</p>
<!--#include file="footer.html" -->
<!--#include file="footer.cgi" -->
</body>
</html>

View File

@ -30,6 +30,6 @@
<div class=h><h2 id=full-transparent>Full transparent form (<a href=/media/vernfulltrans.xcf>XCF file</a>)</h2> <a aria-hidden=true href=#full-transparent>#full-transparent</a></div>
<img src=/media/vernfulltrans.png alt="Full ~vern logo with a transparent background">
<!--#include file="footer.html" -->
<!--#include file="footer.cgi" -->
</body>
</html>

View File

@ -13,6 +13,6 @@
<div class=h><h1 id=onion>Onion sites</h1> <a aria-hidden=true href=#onion>#onion</a></div>
<p>We respect your privacy and want you to be able to choose to be anonymous if you want. So most of our services have corresponding <a href=//torproject.org>Tor</a> <a href=//community.torproject.org/onion-services/>.onion</a> sites.</p>
<!--#include file="onion-services.html" -->
<!--#include file="footer.html" -->
<!--#include file="footer.cgi" -->
</body>
</html>

View File

@ -34,6 +34,6 @@
<ol>
<?php echo $list; ?>
</ol>
<!--#include file="/footer.html" -->
<!--#include file="/footer.cgi" -->
</body>
</html>

View File

@ -13,6 +13,6 @@
<div class=h><h1 id=privacy>Privacy Statement</h1> <a aria-hidden=true href=#privacy>#privacy</a></div>
<p>The only circumstances in which we collect and store data from our users is when such information is directly provided to us, i.e. when one registers to any of our services. Any automatically generated information (log files) that contains personal user information such as IP addresses, locations, or full names is to be deleted from our servers in at most 48 hours. If you decide that you want any of your accounts with us to be closed, send an e-mail to: <code>deletion (AT SYMBOL) vern (PERIOD) cc</code>. Any associated personal information will be deleted from our servers in up to 96 hours.</p>
<p>A full legalese privacy policy can be found <a href="/legal-privacy">here</a>.</p>
<!--#include file="footer.html" -->
<!--#include file="footer.cgi" -->
</body>
</html>

View File

@ -223,6 +223,6 @@
}
?>
<!--#include file="footer.html" -->
<!--#include file="footer.cgi" -->
</body>
</html>

View File

@ -24,6 +24,6 @@
<ol>
<li>We want our community to be as friendly and welcoming as possible, so please be kind to others.</li>
</ol>
<!--#include file="footer.html" -->
<!--#include file="footer.cgi" -->
</body>
</html>

View File

@ -33,6 +33,6 @@
<p>The ~vern team can change these rules at any time. It is likely that we will announce when doing so, but make sure when referencing the rules to check them.</p>
<p>Thanks for being part of ~vern!</p>
<!--#include file="footer.html" -->
<!--#include file="footer.cgi" -->
</body>
</html>

View File

@ -37,7 +37,7 @@
<?php echo file_get_contents("./gnuplot/crescent/net/" . date("Y-m-d") . ".svg"); ?>
<?php echo file_get_contents("./gnuplot/crescent/power/" . date("Y-m-d") . ".svg"); ?>
<!--#include file="footer.html" -->
<!--#include file="footer.cgi" -->
</body>
</html>

View File

@ -97,6 +97,6 @@
</ul>
<p><small>Do you get it? We <i>really</i> like Debian</small></p>
<!--#include file="footer.html" -->
<!--#include file="footer.cgi" -->
</body>
</html>

View File

@ -28,6 +28,6 @@
<li>VERN SERVICES ARE PROVIDED ON AN "AS IS" AND "AS AVAILABLE" BASIS, AND WE DO NOT GUARANTEE THAT THE SERVICE WILL BE AVAILABLE AT ALL TIMES, NOR THE ACCURACY OF THE SERVICE OR ANY MATERIAL PROVIDED BY THE SERVICE OR ON THE ~VERN WEBSITE. IN NO EVENT SHALL THE ADMINISTRATORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY ARISING FROM, OUT OF OR IN CONNECTION WITH THE SERVICE OR USE OF OTHER DEALINGS IN THE SERVICE. YOU ARE SOLELY RESPONSIBLE FOR YOUR USE OF THE SERVICE.</li>
<li>BY AGREEING TO THE TERMS AND CONDITIONS, YOU AGREE THAT YOU ARE TO BE HELD LIABLE FOR ANY DAMAGES, INCIDENTS, INJURIES, CONFLICTS OR ACCIDENTS RESULTING FROM YOUR USE OF OUR SERVICES AND THAT VERN IS IN NO WAY WHATSOEVER LIABLE FOR ANYTHING. THERE IS NO WARRANTY GUARANTEED TO THE EXTENT PERMITTED BY APPLICABLE LAW REGARDING PROTECTION OF YOUR DATA AND CONTENT STORED, SHARED OR USED IN ANY AND ALL WAYS BY ~VERN INFRASTRUCTURE. YOU ARE FULLY RESPONSIBLE FOR THE LEGALITY OF THE CONTENT YOU SHARE, USE, STORE, UPLOAD, EXCHANGE, CREATE, MODIFY OR PUBLISH ON ~VERN SERVICES. ~VERN WILL ERASE ANY ILLEGAL CONTENT IN OUR JURISDICTIONS.</li>
</ol>
<!--#include file="footer.html" -->
<!--#include file="footer.cgi" -->
</body>
</html>

View File

@ -70,6 +70,6 @@
<ol>
<?php echo $list; ?>
</ol>
<!--#include file="footer.html" -->
<!--#include file="footer.cgi" -->
</body>
</html>

View File

@ -30,7 +30,7 @@ nav li { display:inline-block no; margin-right:20px; }
a { color:#ff6c6b; text-decoration:none; }
a:hover { color:#ff6c6b; text-decoration:underline; }
h1, h2, h3 {
display:block; /* Sidenote: who decided on inline? */
display:inline; /* Sidenote: who decided on inline? */
line-height:1.2;
color:#51afef;
font-size:1.3em;