update donate page to point to a real location. minor copy updates. changed image to donate QR for tilde.club

updated TOS.

.github/FUNDING.yml

@@ -0,0 +1,5 @@
+# These are supported funding model platforms
+ko_fi: tildeclub # Replace with a single Liberapay username
+github: tildeclub
+custom: https://www.paypal.com/donate?hosted_button_id=DWHSADKJ26HZ8
+custom: https://donate.tilde.club

.gitignore

@@ -1,2 +1,5 @@
 *.swp
 webmail
+includes/report
+report
+tilde.json

.htaccess

@@ -1,7 +1,5 @@
     RewriteEngine On
     RewriteRule ^$           main  [QSA]
     RewriteRule ^index\.php$ wiki.php?page=main  [QSA]
-    RewriteRule ^users$ includes/users.php [QSA,L]
+    RewriteCond %{REQUEST_URI} !(/includes/|/media/|tilde.json|humans.txt|/webmail/|/favicon.ico|/~|githook|sitemap.xml)
-    RewriteRule ^server$ includes/server.php [QSA,L]
-    RewriteCond %{REQUEST_URI} !(/includes/|/media/|tilde.json|humans.txt|/webmail/|/favicon.ico|/~|githook)
     RewriteRule ^([^\d]+)/?$ wiki.php?page=$1 [QSA]

articles/contact.md

@@ -2,8 +2,8 @@ If you have any questions or problems relating to our service, or this website,
 
 <form action='/includes/contact.php'>
 <table>
-<tr><td>Contact Name:</td> <td> <input type='text' name='contact_name'><br></td></tr>
+<tr><td>Contact Name:</td> <td> <input type='text' name='contact_name'></td></tr>
-<tr><td>Email Address:</td> <td> <input type='text' name='email_address'><br></td></tr>
+<tr><td>Email Address:</td> <td> <input type='text' name='email_address'></td></tr>
 <tr><td>Subject:</td> <td>
 <select name="type">
     <option value="abuse">Abuse</option>
@@ -12,7 +12,7 @@ If you have any questions or problems relating to our service, or this website,
     
 </select><br> </td></tr>
 <tr><td>Type the word tildeverse here:</td> <td> <input type='textarea' name='tv'></td></tr>
-<tr><td>Message:</td><td><textarea name='message' rows = "10" cols = "80"></textarea><br><td>
+<tr><td>Message:</td><td><textarea name='message' rows = "10" cols = "80"></textarea><td>
 </table>
 <input type='submit'>
 </form>

articles/copyright.md

@@ -1,5 +1,8 @@
 ## creative commons
 
+# Contributors
+
+A list of all contributors can be found here: [Commit log for Git Repo](https://github.com/ThunixdotNet/www/commits/branch/master)
 # Attribution-ShareAlike 4.0 International
 
 Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.

articles/donate.md

@@ -1,22 +1,13 @@
 # Donations
 
-As this server and our projects are all a labor of love and goodwill for the community, operating the thunix server costs money. We love what we do and we love sharing what we do for free, but over time, operating expenses can have a big impact.
+While this server and our projects are a labor of love and goodwill for the community, operating the thunix server still costs money. We love what we do and we love sharing what we do for free, but over time, operating expenses can have a big impact. In order to keep going, we rely on the good nature of generous people who are willing to donate to us. The price breakdown right now is €80/month. 
 
-That being said, we also rely on the good nature of generous people, who are willing to donate to us. The price breakdown right now is €38/month. So to help with server costs and time spent, you can donate the following ways:
+If you'd like to assist with server costs and help ensure we can spend time on the projects, you can donate in the following ways:
 
 <div style="text-align:center;">
 
-<p>Via BitCoin: 1DFM3qY7XmCxGTFPATSQJVCNjvmWiVubGN</p>
+<p>You can donate via fosspay here: <a href="https://donate.tilde.club/?project=2"><img src="https://www.gravatar.com/avatar/08ba2126a0dd0cb2efa30b854c7b4252?s=129"></a></p>
 
-<p>You can donate via Liberapay here: <a href="https://liberapay.com/ub3g33k/donate"><img src="https://liberapay.com/assets/widgets/donate.svg"></a></p>
-
-<p>Or via Paypal:</a>
-<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
-<input type="hidden" name="cmd" value="_donations" />
-<input type="hidden" name="business" value="GW2H85HY9VJ3L" />
-<input type="hidden" name="currency_code" value="USD" />
-<input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" title="PayPal - The safer, easier way to pay online!" alt="Donate with PayPal button" />
-<img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" />
-</form>
-</p>
 </div>
+
+_Be sure to select the thunix.net project in the dropdown and please add a comment to tell us your thoughts! Thank you!_

articles/faq.md

@@ -2,38 +2,38 @@
 
 **How do I sign up for an account?**
 
-Simply by going to our [signup page](/signup) and filling in the form. You can ask for help in \#thunix on tilde.chat, or you can [contact us](contact), if you run into any difficulties.
+- Simply by going to our [signup page](/signup) and filling in the form. You can ask for help in \#thunix on newnet.net, or you can [contact us](contact), if you run into any difficulties.
+
+**How can I request an account recovery or public key replacement?**
+
+- Just send the request from the email you used to register and we'll poke a new key in for you.
 
 **Who is running thunix?**
 
-The current system administrators are [amcclure](/~amcclure), [ubergeek](/~ubergeek), [Naglfar](/~naglfar), and [fosslinux](/~fosslinux).
+- The current system administrators are [deepend](/~deepend), [Naglfar](/~naglfar).
 
 **What happened to the old thunix? Why the name change?**
 
-The original machine and founder dissappeared without any warning to anyone, including server staff. For this reason, most things were not backed up, and we needed to obtain a new domain name, and a new set of machines.
+- The original machine and founder dissappeared without any warning to anyone, including server staff. For this reason, most things were not backed up, and we needed to obtain a new domain name, and a new set of machines.
 
 **I want a new package installed, or I want something changed on Thunix!**
 
-Excellent! We're looking to make this system useful for the community! You can submit a PR or an issue [here](https://tildegit.org/thunix/ansible) to request the system change.
+- Excellent! We're looking to make this system useful for the community! You can ask for help in \#thunix on newnet.net, or you can [contact us](contact), to request the system change.
 
 **Can I get password-based login? Old thunix had it!**
 
-No. Sorry. Not for shell access. For other integrated services, password auth will be enabled, but not for your ssh connection. We use key based authentication, as it's more secure, and more convienent for you, to be honest.
+- No. Sorry. Not for shell access. For other integrated services, password auth will be enabled, but not for your ssh connection. We use key based authentication, as it's more secure, and more convienent for you, to be honest.
-
-**I want to run {fill in the blank} server, but I can't seem to access it?**
-
-The only exposed ports to the internet are services as defined in our [ansible playbook.](https://tildegit.org/thunix/ansible) If there is a public service you want to see, open an issue, or do a pull request for it, and we'll probably enable it without much question.
 
 **That's too hard! Can you just open the port up for this service I have running?**
 
-No. Due to security issues, we cannot. HOWEVER! You can certainly use an [SSH tunnel](https://duckduckgo.com/?q=ssh+tunnnel) to access it.
+- No. Due to security issues, we cannot. HOWEVER! You can certainly use an [SSH tunnel](https://duckduckgo.com/?q=ssh+tunnnel) to access it.
 
 **Old thunix did {fill in the blank}, and now it doesn't. Make it work like it used to!**
 
-There was a huge changeover. Maybe we can get something going old thunix had, and maybe not. You can mention it in the IRC channel, and we'll see what we can do.
+- There was a huge changeover. Maybe we can get something going old thunix had, and maybe not. You can mention it in the IRC channel, and we'll see what we can do.
 
 **How can I access my thunix email?**
 
-You can use the following for your mail settings (This is Thunderbird's setting screen, but the settings are the same):
+- You can use the following for your mail settings (This is Thunderbird's setting screen, but the settings are the same):
 
 [![](/media/mail.png)](/media/mail.png)

articles/gdpr.md

@@ -1,27 +0,0 @@
-# GDPR Statement and Privacy Policy
-
-Thunix takes privacy seriously, and as such remains committed to being in compliance with the GDPR, which took affect on May 25th, 2018.
-
-## What data do we collect from you?
-
-Thunix collects your email address, during signup, and IPs you log into the system from, in accordance with technical requirements.
-
-We also store whatever data you create or maintain in your home directory on Thunix, which may include emails to and from your Thunix account.
-
-## How long do we retain data about you?
-
-Your email address is retained only long enough to process you account creation request. IPs you log into from are retained for a maximum of 30 days.
-
-## How can I request a copy of my data?
-
-You can submit a request at [contact page](/contact). We will endeavor to provide you a copy of all data we store within 14 days.
-
-## How can I request removal of my information?
-
-You can submit a request at [contact page](/contact), and we will endeavor to remove all personal data of yours from our system within 14 days. However, this will include removal of your user account from our system as well, which will prevent access to most of the services provided by Thunix.
-
-If you request deletion of your account, all of your data will be purged within 14 days from our system.
-
-## How do you protect my data?
-
-All data on thunix is encrypted at rest. Logs are maintained only for as long as is technically required (30 days, for troubleshooting of issues). Personally created data, is protected by the UNIX permissions model, as dictated by yourself, however, by default, your personally created data is viewable by all other users of the system, per design.

articles/main.md

@@ -5,14 +5,10 @@ We're so glad you could drop by and we hope you enjoy your visit. Stay a while!
 
 ## About thunix
 
-thunix offers Secure Shell (SSH) accounts, Web Hosting, Email Accounts, and many other services. But, most of all, we are a community of users. It was founded by hexhaxtron in the Summer of 2017, and was continued by [amcclure](/~amcclure) and [ubergeek](/~ubergeek) since 2018. We aim to provide the best service possible with a wide variety of features, and we hope you have fun with it!
+The Thunix project provide Secure Shell (SSH) accounts, Web Hosting, Email Accounts, and many other UNIX-like services. But, most of all, we are a community of users. It was founded by hexhaxtron in the Summer of 2017, and was continued by [ubergeek](/~ubergeek) since 2018 however in 2023 [deepend](/~deepend) has since taken the role. We aim to provide the best service possible with a wide variety of features, and we hope you have fun with it!
 
 
-## Project Phoenix
+Join us on IRC on irc.newnet.net/6697 in the #thunix channel, or just click here for a web client: [![#thunix channel](https://stats.newnet.net/badges/badge.php?channel=%23thunix)](https://newnet.net/chat.php?channel=%23thunix)
-
-The thunix Phoenix project aims to provide a new user experience for shell users, with integration into the wider Tildeverse network.
-
-Join us on IRC on irc.tilde.chat/6697 in the #thunix channel, or just click here for a web client: [![#thunix channel](https://tilde.chat/badges/badge.php?channel=%23thunix)](https://web.tilde.chat/?join=thunix)
 
 If you want to sign up for an account, simply open our [signup form](/signup) and provide us with:
 

articles/news.md

@@ -1,29 +1,42 @@
-# State of the Thunix - July 09, 2019
+# Changes to Terms of Service and Service Updates - April 2025
 
-Another Month!
+We've updated our Terms of Service to clarify rules around running servers—now explicitly prohibited without prior approval. Please take a moment to review these important changes.
 
-We are at month 7 for Thunix.net!
+Additionally, due to low usage and maintenance overhead, we've decided to discontinue our BZFlag, Minetest, and Minecraft servers effective immediately. We appreciate everyone who participated and hope you enjoyed your time on these services.
 
-Newly, over the past month, we have a wiki now!  It's an effort led by
+Thank you for your understanding and continued support!
-contribute via tildegit, by opening a PR at:
 
-https://tildegit.org/thunix/wiki
+# Gemini is Live on Thunix! - Nov 2024
 
-It's all in markdown, so it's pretty easy to contribute too.  And, if you
+Hey everyone, exciting news—Thunix now supports Gemini! 🎉
-mess something up?  No worries!  It's a wiki!  We can revert :)
 
-Also, new this month, we've made an official process and tool to provision
+You can check out our Gemini capsule at gemini://thunix.net. It's simple, fast, and perfect for sharing cool stuff without all the web bloat.
-MySQL/MariaDB databases (It's MariaDB, btw).  All you need to do is
-request one, and we'll gladly add it :)
 
-No donations this month, and costs to operate the server still sit at
+Got ideas for Gemini content? Let us know! And if you’re new to Gemini, dive in—it’s like the web, but chill. 😎
-feel the need to do so, via https://thunix.net/donate.php
 
-Iris is getting some usage too, so make sure you poke in there, via the
+Catch you in the capsule! 🚀
-cli.
 
-All in all, new features, new stuff, and looking forward to seeing other
+# State of the Thunix - July 2023
-contributions and new features come in from our users.
+
+We are on the mend.   deepend from tilde.club has taken on running Thunix and has started to build it up on his
+own infrastructure.   Sign ups that come in will be kept in queue until the system is ready
+for more users. 
+
+More to come very soon.
+
+# Gemini is Live on Thunix! - Nov 2024
+
+Hey everyone, exciting news—Thunix now supports Gemini! 🎉
+
+You can check out our Gemini capsule at gemini://thunix.net. It's simple, fast, and perfect for sharing cool stuff without all the web bloat.
+
+Got ideas for Gemini content? Let us know! And if you’re new to Gemini, dive in—it’s like the web, but chill. 😎
+
+Catch you in the capsule! 🚀
+
+# State of the Thunix - July 2023
+
+We are on the mend. deepend from tilde.club has taken on running Thunix and has started to build it up on his own infrastructure. Sign-ups that come in will be kept in queue until the system is ready for more users.
+
+More to come very soon.
 
-Your Friendly Neighborhood Sysadmin;
-ubergeek/ub3geek

articles/privacy.md

@@ -0,0 +1,25 @@
+# Privacy Policy
+
+Thunix takes user privacy seriously.
+
+## What data do we collect?
+
+We collect your email address during signup and log the IP addresses used to access the system.
+We also store any data you create or maintain in your home directory, which may include emails to and from your Thunix account.
+
+## How long do we retain data?
+
+- Email addresses: Retained for account management.
+- Login IP addresses: Retained for a maximum of 30 days.
+
+## Requesting data deletion
+
+You may submit a deletion request via our [contact page](/contact). Account deletion will also remove all your data, typically within 14 days.
+
+## How do we protect your data?
+
+Data is **not encrypted at rest**. Access is controlled by standard UNIX file permissions. Users should **not store sensitive or confidential information** on Thunix.
+
+Logs are retained only for as long as necessary for troubleshooting (30 days).
+
+---

articles/server.md

@@ -1,31 +1,33 @@
 # Service Status and Information
 
-## Minetest
-
-Connect to thunix.net:30000 in your minetest client
-
-## Minecraft
-
-Connect to thunix.net in your minecraft client. Running the Paperclip minecraft server.
-
 ## Mail Services
 
 Thunix offers webmail at [https://thunix.net/webmail](/webmail). You can also connect via imap. Thunderbird will autodetect your settings, and we recommend the use of Thunderbird email client, so you can get the best-of-breed email experience. We also recommend using enigmail with Thunderbird as well. You can get it from your distro's package manager, or from [the Thunderbird project's site](https://www.thunderbird.net/)
 
+## SSH Fingerprints
+
+256 SHA256:iuqEWXCqUNihqO7o4xLrJ05M+te09i3P+WrHZsjUdZY thunix.net (ECDSA)  
+3072 SHA256:7gZXCqNUYBfrTQ8wYmLrD6rVc5zL5nYf2l5t8ZrLIBU thunix.net (RSA)  
+256 SHA256:d+J8u5pmQ8sR1BM8/EpUiNAlL9by371utl1ncNgFG6A thunix.net (ED25519)  
+ 
 ## Onion Service
 
-Thunix's services are available as a onion site as well. Our onion address is thunixme5v4rnoby.onion.
+Thunix's websites are available as a onion site as well. (SSH access is currently not available over Tor)
-
+Our Tor network (The Onion Router) address is kbguajmip4jlr2k3vpscmvymtxqnft267ox2ij6pdrgb5jcvx3kctkyd.onion.
-## BZFlag Game Server
-
-BZFlag runs on the standard port. If you have a specific map you want loaded, send an email to root, and we'll look at getting the map swapped out
 
 ## IRC Chat
 
-Thunix is part of the tilde.chat network. You can access chat via the terminal, with the 'chat' command, via your favorite email client at irc.tilde.chat/6697, or via a web chat interface located [here]().
+Thunix is part of the Newnet IRC network. You can access chat via the terminal, with the 'chat' command, via your favorite email client at irc.newnet.net/6697, or via a web chat interface located [![#thunix channel](https://stats.newnet.net/badges/badge.php?channel=%23thunix)](https://web.newnet.net/?join=thunix). 
+
 
 ## FOSS Project Mirrors 
 
 Thunix hosts mirrors for several FOSS projects. You can see the full mirror list in the sidebar link.
 
+## Website and CMS hosting
+
+Collaborative creation, modification and management of digital content.
+- LAMP (Apache HTTP server, MySQL database and PHP scripting language) is an open source software stack on Linux environment, available to host a variety of web sites, content management systems and applications.
+- Django web development framework.
+  
 <!-- Begin autogen content from /includes/server.php -->

articles/signup.md

@@ -14,6 +14,6 @@ If you have any questions or problems, feel free to contact us.
 <input type='submit'>
 </form>
 
-If you don't have a public SSH key, don't worry! Check out [this guide to SSH keys](https://tilde.team/wiki/?page=ssh) and make sure that you only fill in your public SSH key here.
+If you don't have a public SSH key, don't worry! Check out [this guide to SSH keys](https://wiki.thunix.net/wiki/ssh) and make sure that you only fill in your public SSH key here.
 
 Signing up implies that you agree with our [terms of service](/tos). If you haven't done so, please read it before you sign up.

articles/success1.md

@@ -1,3 +1,3 @@
-# Success!
+# Form Failure 
 
-You will hear back shortly from us!
+You didn't properly fill out the signup form.  Please try again.

articles/success3.md

@@ -0,0 +1,3 @@
+# Form Failure 
+
+This username is already registered, please choose another one.

articles/success4.md

@@ -0,0 +1,3 @@
+# Form Failure 
+
+Please check SSH public key format.

articles/tos.md

@@ -2,36 +2,39 @@
 
 Nothing is without its rules and regulations; thunix is no exception.
 
-Below are the site's service terms. Everything in this page should be clear to everyone who wishes to use thunix's services; failure to abide by these terms can result in penalties such as service bans and may result in legal action against any offending users, depending on the severity of each case and any other individuals who may have been affected. Thunix may conduct investigations on any suspected violations, and we will cooperate with law enforcement agencies with their investigations. Be sure to read this page carefully and understand it.
+Below are the site's service terms. All points listed should be clear to anyone wishing to use thunix's services. Failure to abide by these terms can result in penalties, including service bans and potential legal action, depending on the severity of the violation. Thunix may investigate suspected violations and will cooperate fully with law enforcement agencies as necessary. Read and understand these terms carefully.
 
-You are responsibe for checking your local mail account from time to
+You are responsible for regularly checking your local mail account. This email address is our primary means of communication, and any warnings or notices regarding your account or service status will be sent there.
-time. This email address is the only one we retain, and as such, any
-warnings and notices regarding your account, or service status will be
-sent to this account.
 
-1.  Deliberately defacing the accounts of other users
+Prohibited activities include, but are not limited to:
-2.  Deliberately trying to disrupt thunix's server
-3.  Using thunix as a launch pad for disrupting other servers
-4.  Using thunix to impersonate other websites and businesses for
-    criminal purposes
-5.  Storing/distributing pornography of any genre and medium (especially
-    child pornography)
-6.  Storing/distributing content that defames any individual
-7.  Promoting racial, ethnic, religious, political and other forms of
-    bigotry
-8.  Storing/distributing, promoting, or encouraging use of
-    pirated/cracked software, license keys, license/registration
-    circumvention programs, or any questionable programs/scripts that
-    can risk causing unauthorized modifications, or disrupts network
-    services for any programs or devices.
-9.  Mining cryptocurrencies
-10. Spamming on any forums, mailing lists, irc channels,
-    newsgroups, etc.
-11. Leaking or publishing any user's or individual's personal
-    information without that person's consent.
 
-Copyright infringement is not allowed on thunix, and we will not allow any illegal content to be distributed. It's also expected that all users respect the copyrights of those who produce original content of any kind and only share if the author or license grants you permission. Content hosted on accounts used for external file storage must also follow copyright law.
+1. Deliberately defacing or tampering with other users' accounts.
+2. Intentionally disrupting or attempting to disrupt thunix's servers.
+3. Using thunix as a platform to attack or disrupt other servers or services.
+4. Using thunix to impersonate websites, individuals, or businesses for malicious or criminal purposes.
+5. Hosting or distributing pornography of any type or medium, especially child pornography.
+6. Storing, distributing, or promoting content that defames or slanders any individual or entity.
+7. Promoting racial, ethnic, religious, political, or other forms of bigotry or hate speech.
+8. Storing, distributing, promoting, or encouraging the use of pirated or cracked software, unauthorized license keys, or any software or scripts intended to bypass security or disrupt network services.
+9. Mining cryptocurrencies.
+10. Sending spam or unsolicited messages through forums, mailing lists, IRC channels, newsgroups, or other communication channels.
+11. Leaking, publishing, or distributing personal or sensitive information about any individual without explicit consent.
+12. Using thunix services for any activities you believe or suspect might be illegal.
+13. Using thunix services for commercial purposes or profit-making activities.
+14. Running servers or network services (such as web, mail, game, file-sharing, VPN, or proxy servers) without explicit permission.
+15. Reselling or subletting access to thunix services under any circumstances.
+16. Allowing or contributing to frequent attacks or disruptions targeting your account or hosted content. If such activities occur regularly, we reserve the right to disable or remove your service.
 
-If you want to request for content you own the copyright for to be removed from thunix, please refer to our [abuse reporting page](/contact). In the email, please identify who you are, if you are the copyright holder or legally representing them, the exact files you want removed with links to the files and infringed content, and contact information such as phone numbers or a reply-to email address.
+### Additional Conditions:
+
+- Thunix backs up your data on a best-effort basis, but users are responsible for maintaining their own regular backups.
+- Support provided by thunix is volunteer-based; mutual respect and patience are expected at all times.
+
+Copyright infringement and distribution of illegal content are strictly prohibited. Users must respect copyright laws and obtain explicit permission from content owners or valid license holders before sharing any material. Content hosted for external storage purposes must also comply with all relevant copyright laws.
+
+To request the removal of copyrighted material you own from thunix, please use our [abuse reporting page](/contact). Clearly identify your relationship to the copyrighted content, specify the exact files or links involved, and provide detailed contact information, including a reply-to email address or phone number.
+
+Repeated or severe violations of these Terms of Service may result in immediate account removal. These terms apply to all communication platforms hosted by or associated with thunix, including forums, mailing lists, IRC channels, newsgroups, and similar services.
+
+If you notice any violations, please report them through our [abuse reporting page](/contact).
 
-Users that repeatedly violate the Terms of Service will have their account removed. Depending on the degree of the offense, their account may be removed immediately. These terms also apply to communication services such as forums, mailing lists, irc channels, newsgroups, and any other service either hosted on or used for thunix. If you come across anything that violates the terms of service, please let us know with the [abuse reporting page](/contact).

config.php

@@ -1,14 +1,13 @@
 <?php
 //Name of your site
-$site_name="☣  thunix ☣";
+$site_name="🌻  thunix  🌻";
 
 //Root for the site, in a browser
-//$site_root="https://dev.thunix.cf";
 $site_root="https://".$_SERVER['HTTP_HOST'];
 //Local base root for app files
-$doc_root="/var/www/dev.thunix.cf";
+$doc_root="/var/www/thunix.cf";
 
 //Site style
 // site is the default.  Specify something else here to switch
-$site_style="thunix";
+$site_style="newthunix";
 ?>

gen_tdp

@@ -1,46 +0,0 @@
-#!/usr/bin/env python3
-import subprocess,json,os.path,requests
-from bs4 import BeautifulSoup as bs
-
-headers = {
-    'Accept-Encoding': 'gzip, deflate, sdch',
-    'Accept-Language': 'en-US,en;q=0.8',
-    'Upgrade-Insecure-Requests': '1',
-    'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',
-    'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8',
-    'Cache-Control': 'max-age=0',
-    'Connection': 'keep-alive',
-}
-
-tdp = {}
-tdp["name"] = "thunix"
-tdp["url"] = "https://www.thunix.net"
-tdp["signup_url"] = tdp["url"]+"/signup.php"
-users = subprocess.check_output(["/usr/bin/members","tilde"]).decode('ascii').split()
-users.sort()
-tdp["user_count"] = len(users)-1
-tdp["want_users"] = True
-tdp["admin_email"] = "root@thunix.net"
-tdp["description"] = "Thunix is a community, centered around access to a public *nix system.  Thunix offers shell accounts with complete set of programming tools, and follows a continuous integration-continuous deployment of system configuration."
-tdpusers = []
-for user in users:
-	if user=="anton":
-		continue
-	tdpuser = dict(username=user)
-	title = bs(requests.get("https://www.thunix.net/~{}".format(user)).text,"lxml").title
-	if title is None:
-		title = "No title"
-	else:
-		title = title.text
-	tdpuser["title"] = title
-	if os.path.exists(os.path.expanduser("~{}/public_html/index.html".format(user))):
-		tdpuser["mtime"] = os.path.getmtime(os.path.expanduser("~{}/public_html/index.html".format(user)))
-	elif os.path.exists(os.path.expanduser("~{}/public_html/index.htm".format(user))):
-		tdpuser["mtime"] = os.path.getmtime(os.path.expanduser("~{}/public_html/index.htm".format(user)))
-	elif os.path.exists(os.path.expanduser("~{}/public_html/index.php".format(user))):
-		tdpuser["mtime"] = os.path.getmtime(os.path.expanduser("~{}/public_html/index.php".format(user)))
-	tdpusers.append(tdpuser)
-tdp["users"] = tdpusers
-
-with open("tilde.json","w") as f:
-	json.dump(tdp,f)

githook.php

@@ -16,8 +16,6 @@
 
 /* security */
 $access_token     = "secret";
-$ansible_lastrun  = '/dev/shm/ansible-hook-last-run';
-$ansible_dropfile = '/dev/shm/run-ansible';
 $www_lastrun      = '/dev/shm/www-hook-last-run';
 $www_dropfile     = '/dev/shm/run-www';
 $gopher_lastrun   = '/dev/shm/gopher-hook-last-run';
@@ -25,7 +23,7 @@ $gopher_dropfile  = '/dev/shm/run-gopher';
 $wiki_lastrun     = '/dev/shm/wiki-hook-last-run';
 $wiki_dropfile    = '/dev/shm/run-wiki';
 
-$allowedip         = '51.79.32.48';
+$allowedip        = '198.50.210.248';
 $remoteip         = $_SERVER['REMOTE_ADDR'];
 $ratelimit        = 300;
 
@@ -51,24 +49,6 @@ if ( strcmp($remoteip, $allowedip) !== 0 )
 	exit(0);
 }
 
-// Hook for ansible here
-if ($data["repository"]["full_name"] == 'thunix/ansible') {
-	syslog(LOG_INFO, 'Ansible Webhook recieved.');
-	// We limit runs to once per 5 minutes, so they don't try
-	// overlapping.  Systemd shouldn't allow it, but we'll check
-	// anyways
-	if ( time () - filemtime ( $ansible_lastrun ) > $ratelimit ) {
-		touch ( $ansible_dropfile );
-		touch ( $ansible_lastrun );
-		echo "HTTP 200 - Ansible webhook recieved.\n";
-		}
-	else {
-		http_response_code(429);
-		echo "HTTP 429 - Rate Limited.\n";
-		exit(0);
-		}
-}
-
 // Hook for www repo here.  Same rules apply, as above, for www.  We
 // could probably make it able to run more frequently.  Backend job is
 // just a git pull, and is quick.
@@ -119,8 +99,8 @@ elseif ($data["repository"]["full_name"] == 'thunix/wiki') {
     }
 }
 
-// Easter egg for anyone probing the hook.  Enjoy.  We're a coffee maker
+// Easter egg for anyone probing the hook.  Enjoy.  We're a tea pot
-// and not a teapot :)
+// and not a coffee maker :)
 else {
 	http_response_code(418);
 	echo "HTTP 418 - I'm a teapot.\n";
@@ -128,22 +108,5 @@ else {
 	exit(0);
 	}
 
-/*$fp = pfsockopen( "tcp://127.0.0.1", 1234, $errno, $errstr );
-
-if (!$fp)
-{
-    echo "ERROR: $errno - $errstr<br />\n";
-}
-socket_set_timeout ($fp, 10);
-$msg = "Commit '".$data['commits'][0]["message"]."' was pushed to ".$data["repository"]["full_name"].' by '.$data["pusher"]["login"];
-$msg = trim(preg_replace('/\s+/', ' ', $msg));
-$write = fwrite ($fp, $msg);
-fclose($fp);
-
-if (!$write) {
-    echo "error writing to port.<br/>";
-    next;
-}
-*/
 ?>
 

humans.txt

@@ -1,16 +1,16 @@
     /* TEAM */
-    Your title: ubergeek, naglfar, amcclure, fosslinux
+    Your title: deepend, naglfar
     Site: https://thunix.net, root@thunix.net 
-    Location: Frankfurt, Germany
+    Location: Quebec, Canada
     							
     /* THANKS */
-    Name: ubergeek    https://thunix.net/~ubergeek
+    Name: deepend     https://thunix.net/~deepend
-          amcclure    https://thunix.net/~amcclure
+          ubergeek    https://thunix.net/~ubergeek
           naglfar     https://thunix.net/~naglfar
 					fosslinux		https://thunix.net/~fosslinux
                                 
     /* SITE */
-    Last update: 2019/03/22 
+    Last update: 2023/12/26 
     Standards: HTML5
     Components: Apache2, Git, and PHP, Parsedown, Parsedown Extra
     Software: vim, geany, ansible, wiki.php 

includes/contact.php

@@ -3,7 +3,7 @@ include "../config.php";
 // This code is licensed under the AGPL 3 or later by ubergeek (https://tildegit.org/ubergeek)
 
 $name             = $_GET['contact_name'];
-$email            = $_GET['email_address'];
+$return_addr      = $_GET['email_address'];
 $type             = $_GET['type'];
 $body             = $_GET['message'];
 
@@ -14,7 +14,6 @@ $subject          = "Contact Form";
 $mailbody         = "The following submission via the contact form was recieved:
 
 Real Name:      $name
-Email Address:  $email
 Type:           $type
 Message:        $body";
 
@@ -24,7 +23,7 @@ if ( $tv != "tildeverse" ) {
     die();
 }
 
-shell_exec("echo '$mailbody' | /usr/bin/mail -s '$subject' $destination_addr ");
+shell_exec("echo '$mailbody' | /usr/bin/mail -s '$subject' -r '$return_addr' $destination_addr ");
 
 // In the future, here, we *should* be able to build a process that 
 // auto opens an issue in the tildegit project

includes/footer.md

@@ -1,6 +1,4 @@
-Unless otherwise noted, all thunix.net materials (besides all user-generated content) is licensed as [CC BY-SA 4.0license](https://creativecommons.org/licenses/by-sa/4.0/). Permissions beyond the scope of this license may be available [here](/copyright).
+All content is licensed as [CC BY-SA 4.0 license](https://creativecommons.org/licenses/by-sa/4.0/).  Users define their own licensing and own all of their content.
-
-Users define their own licensing and own all of their content.
 
 All questions, comments, and concerns about this site should be sent to [the administration team](/contact).
 

includes/header.md

@@ -1 +1 @@
-![☣ thunix ☣](/media/gotthunix.png)
+![🌻 thunix🌻](/media/thunix.gif)

includes/newthunix.css

@@ -0,0 +1,66 @@
+@font-face { font-family: dot; src: url('https://thunix.net/includes/dot.ttf'); }
+body {
+    font-family: "dot", Courier, monospace;
+    background: #000;
+    color: #F79862;
+}
+#body {
+    width: 95%;
+}
+#body h1, #body h2, #body h3 {
+    color: orange;
+}
+a {
+    background: #000;
+    color: #F79862;
+}
+a:visited {
+    color: orange;
+}
+#header {
+    width: 90%;
+    text-align: center;
+    font-size: xx-large;
+}
+#content {
+    width: 78%;
+    float: left;
+    font-size: medium;
+}
+#content img {
+    max-height: 400px;
+    max-width: 98%;
+}
+.lineitem {
+    border: 1px;
+    border-color: #fff;
+}
+#sidebar {
+    width: 18%;
+    float: right;
+    font-size: small;
+    padding: 15px; /* Increase padding for more internal spacing */
+    margin-top: 20px; /* Add more space between the sidebar and elements above it */
+    margin-left: 10px; /* Add space between the sidebar and content */
+    background-color: #111; /* Ensure the sidebar stands out slightly */
+    line-height: 1.5; /* Increase line height for better readability */
+    border: 1px solid #333; /* Optional: Add a subtle border to separate the sidebar visually */
+}
+#sidebar h1, #sidebar h2 {
+    color: orange;
+    /* background: #000; */
+    margin-bottom: 15px; /* Further space below headings */
+    padding-bottom: 5px; /* Add padding under headings for better distinction */
+    border-bottom: 1px solid #333; /* Optional: Add an underline effect for headings */
+}
+#sidebar ul, #sidebar p {
+    margin: 10px 0; /* Add vertical spacing between sidebar elements */
+    padding-left: 20px; /* Indent list items for better clarity */
+}
+
+#footer {
+    width: 95%;
+    text-align: center;
+    clear: both;
+    font-size: smaller;
+}

includes/server.php

@@ -1,77 +1,9 @@
 <?php
-/*
-This code is licensed under the AGPL 3 or later by ubergeek (https://tildegit.org/ubergeek)
-Parsedown is licensed under the MIT license.
-*/
-
-include('../config.php');
-include('../parsedown-1.7.3/Parsedown.php');
-include('../parsedown-extra-0.7.1/ParsedownExtra.php');
-
-$page = $_GET['page'];
-$style = $_GET['style'];
-$Parsedown = new Parsedown();
-$Parsedown->setMarkupEscaped(true);
-$ParsedownExtra = new ParsedownExtra();
-
-if ( $page == "") {
-	$page = "main";
-	}
-
-if ( $style == "") {
-	if ( $site_style == "") {
-		$site_style="site";
-	}
-}
-else {
-	$site_style=$style;
-}
-
-$header  = file_get_contents("$doc_root/includes/header.md");
-$sidebar = file_get_contents("$doc_root/includes/sidebar.md");
-$content = file_get_contents("$doc_root/articles/server.md");
-$footer  = file_get_contents("$doc_root/includes/footer.md");
- 
-print "<!DOCTYPE html>
-<html lang='en'>
-	<head>
-		<title>$site_name - $page</title>
-		<link rel='stylesheet' type='text/css' href='$site_root/includes/$site_style.css'>
-	</head>
-	<body>
-<!-- Begin Header -->
-
-	<div id='header'>";
-
-print $Parsedown->text($header);
-
-print "
-		</div>
-<!-- End Header -->
-";
-
-print "<hr>
-	<div id='body'>
-
-<!-- Begin Sidebar  -->
-		<div id='sidebar'>
-";
-
-echo $Parsedown->text($sidebar);
-
-print "		</div>
-<!-- End Sidebar -->
-
-<!-- Begin Body -->
-		<div id='content'>";
-
-echo $ParsedownExtra->text($content);
-
 // Monitoring section
 
 $hosts="all";
 
-$f = fopen("./report", "r");
+$f = fopen("$doc_root/report", "r");
 
 echo "Last update: " . date ("H:i", filemtime('./report'))."<p>\n";
 echo "<table style='width:80%'>";
@@ -113,21 +45,4 @@ echo "\n</table>\n";
 fclose($f);
 
 // End monitoring section
-print "		</div>
-<!-- End Body -->
-
-	</div>
-
-<!-- Begin Footer -->
-	<div id='footer'>
-	<hr>
-";
-
-echo $Parsedown->text($footer);
-
-print "	</div>
-<!-- End Footer -->
-
-	</body>
-</html>";
 ?>

includes/sidebar.md

@@ -1,29 +1,29 @@
 -   Main Menu
     ---------
-
     -   [Home](/main)
+    -   [Sign Up](/signup)
     -   [FAQ](/faq)
     -   [Terms of Service](/tos)
-    -   [GDPR Statement and Privacy Policy](/gdpr)
+    -   [Privacy Policy](/privacy)
     -   [Contact Us](/contact)
-    -   [Sign Up](/signup)
-    -   [thunix Mirror Services](https://ftp.thunix.net/)
-    -   [Web Server Stats](https://stats.thunix.net/)
     -   [Donations](/donate)
--   Main Resources On This Site
-    ---------------------------
 
+-   Resources and User Content
+    ---------------------------
     -   [Wiki](https://wiki.thunix.net/)
-    -   [Status of thunix Servers and Services](/server)
-    -   [Service News](/news)
     -   [User Web Directories](/users)
     -   [User Gopher Directories](https://gopher.tildeverse.org/thunix.net)
-    -   [Web Mail](/webmail/)
-    -   [ZNC Service](https://thunix.net:1326/)
--   Server Staff
-    ------------
 
-    -   [Anton McClure](/~amcclure/)
+-   Services and Status
-    -   [Ubergeek](/~ubergeek/)
+    --------------------
+    -   [Status and Information](/server)
+    -   [Service News](/news)
+    -   [thunix Mirror Services](https://ftp.thunix.net/)
+    -   [Web Server Stats](https://stats.thunix.net/)
+    -   [Web Mail](/webmail/)
+    -   [ZNC Service](https://thunix.net:1356/)
+
+-   Server Staff
+    -------------
+    -   [deepend](/~deepend/)
     -   [Naglfar](/~naglfar/)
-    -   [fosslinux](/~fosslinux/)

includes/signup.php

@@ -9,6 +9,13 @@ $interest         = $_GET['interest'];
 $pubkey           = $_GET['pubkey'];
 $tv               = $_GET['tv'];
 
+// username passed lowercased
+$username = strtolower($username);
+
+// strip new line characters from the end
+$pubkey = trim($pubkey);
+
+$from 		  = 'From: www-data <www-data@thunix.net>';
 $destination_addr = "newuser@thunix.net";
 $subject          = "New User Registration";
 $mailbody         = "A new user has tried to register.
@@ -18,19 +25,39 @@ Email Address:  $email
 Interest:       $interest
 Pubkey:         $pubkey";
 
-if ( $tv != "tildeverse" ) {
-    print "Spam attempt";
-    header("Location: $site_root/?page=success1");
-    die();
-}
-
-shell_exec("echo '$mailbody' | /usr/bin/mail -s '$subject' $destination_addr ");
-
 // In the future, here, we *should* be able to build a process that 
 // somehow auto-verifies the user, and instead of email, it'll kick off the new user process here
 
-header("Location: $site_root/?page=success2");
+$user_queue       = '/dev/shm/userqueue';
 
+// Spam attempt
+$success = 'success1';
+if ( $tv == "tildeverse" )
+{
+  // Success!
+  $success = 'success2';
+  
+// Check if username already taken
+if (posix_getpwnam($username)) {
+    $success = 'success3';
+}
+
+// Simple SSH public key format check
+$valid_key_starts = ['ssh-rsa', 'ssh-dss', 'ecdsa-sha2', 'ssh-ed25519'];
+$key_parts = explode(' ', $pubkey, 3);
+if (!in_array($key_parts[0], $valid_key_starts) || count($key_parts) < 2) {
+    $success = 'success4';
+}
+
+if ($success == "success2") {
+    mail($destination_addr, $subject, $mailbody, $from);
+    $fp = fopen($user_queue, 'a');
+    fwrite($fp, "'$username','$email','$pubkey'\n");
+    fclose($fp);
+}
+}
+
+header("Location: $site_root/?page=$success");
 die();
 
 ?>

includes/users.php

@@ -1,98 +1,26 @@
 <?php
-/*
+$html_skel = '/etc/skel/public_html/index.html';
-This code is licensed under the AGPL 3 or later by ubergeek (https://tildegit.org/ubergeek)
-Parsedown and Parsedown Extra is licensed under the MIT license.
-*/
-
-include('../config.php');
-include('../parsedown-1.7.3/Parsedown.php');
-include('../parsedown-extra-0.7.1/ParsedownExtra.php');
-
-$page = $_GET['page'];
-$style = $_GET['style'];
-$Parsedown = new Parsedown();
-$Parsedown->setMarkupEscaped(true);
-$ParsedownExtra = new ParsedownExtra();
-
-if ( $page == "") {
-	$page = "main";
-	}
-
-if ( $style == "") {
-	if ( $site_style == "") {
-		$site_style="site";
-	}
-}
-else {
-	$site_style=$style;
-}
-
-$header  = file_get_contents("$doc_root/includes/header.md");
-$sidebar = file_get_contents("$doc_root/includes/sidebar.md");
-$content = file_get_contents("$doc_root/articles/userdir.md");
-$footer  = file_get_contents("$doc_root/includes/footer.md");
- 
-print "<!DOCTYPE html>
-<html lang='en'>
-	<head>
-		<title>$site_name - $page</title>
-		<link rel='stylesheet' type='text/css' href='$site_root/includes/$site_style.css'>
-	</head>
-	<body>
-<!-- Begin Header -->
-
-	<div id='header'>";
-
-print $Parsedown->text($header);
-
-print "
-		</div>
-<!-- End Header -->
-";
-
-print "<hr>
-	<div id='body'>
-
-<!-- Begin Sidebar  -->
-		<div id='sidebar'>
-";
-
-echo $Parsedown->text($sidebar);
-
-print "		</div>
-<!-- End Sidebar -->
-
-<!-- Begin Body -->
-		<div id='content'>";
-
-echo $ParsedownExtra->text($content);
 
 print "<!-- Begin autogen userdir list -->";
 print "<ul style='list-style: none; margin-left: -40px;'>";
-foreach (glob("/home/*") as $user):
-		if (!is_dir($user . "/public_html") || (!file_exists($user . "/public_html/index.html") && !file_exists($user . "/public_html/index.php")))
-	continue;
-	$user = basename($user);
-	print"<li><a href='$site_root/~$user/'>~$user</a></li>";
-endforeach;
-print "</ul></div>
-<!-- End Autgen userdir list -->";
 
-print "		</div>
+foreach (glob("/home/*") as $userpath) {
-<!-- End Body -->
+    if (is_dir("$userpath/public_html")) {
+        $user = basename($userpath);
 
-	</div>
+        // Use @ to suppress warnings in case the user directory/files are not readable.
+        $skeletonMatch = (@sha1_file($html_skel) === @sha1_file("$userpath/public_html/index.html"));
+        $isEmptyPubhtml = (@count(@scandir("$userpath/public_html")) === 2); // 2 => "." and ".."
 
-<!-- Begin Footer -->
+        if ($skeletonMatch || $isEmptyPubhtml) {
-	<div id='footer'>
+            // If it matches the skeleton index.html or is empty, display without a link
-	<hr>
+            print "<li>~$user</li>\n";
-";
+        } else {
+            // Otherwise, link to the user's directory
+            print "<li><a href='$site_root/~$user/'>~$user</a></li>\n";
+        }
+    }
+}
 
-echo $Parsedown->text($footer);
+print "</ul></div>\n<!-- End Autgen userdir list -->";
-
-print "	</div>
-<!-- End Footer -->
-
-	</body>
-</html>";
 ?>

sitemap.xml

@@ -0,0 +1,427 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset
+      xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9
+            http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
+<!-- created with Free Online Sitemap Generator www.xml-sitemaps.com -->
+
+
+<url>
+  <loc>https://www.thunix.net/</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>1.00</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/main</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.80</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/faq</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.80</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/tos</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.80</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/gdpr</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.80</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/contact</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.80</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/signup</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.80</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/donate</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.80</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/server</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.80</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/news</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.80</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/users</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.80</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~amcclure/</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.80</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~ubergeek/</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.80</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~naglfar/</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.80</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~fosslinux/</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.80</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/copyright</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.80</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~adam/</loc>
+  <lastmod>2019-06-10T13:48:44+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~aniruddh/</loc>
+  <lastmod>2019-04-24T17:25:18+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~brendantcc/</loc>
+  <lastmod>2019-02-17T23:13:11+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~cyphyx/</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~diabla/</loc>
+  <lastmod>2019-01-10T23:22:46+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~gokce/</loc>
+  <lastmod>2019-01-07T22:00:54+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~isaac/</loc>
+  <lastmod>2019-07-09T01:02:26+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~khuxkm/</loc>
+  <lastmod>2019-06-14T13:18:42+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~mandlebroth/</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~ml/</loc>
+  <lastmod>2019-01-23T10:05:23+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~orliesaurus/</loc>
+  <lastmod>2019-01-07T02:00:52+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~quetzalcoatl/</loc>
+  <lastmod>2019-01-21T23:53:53+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~ringo/</loc>
+  <lastmod>2019-01-03T01:11:03+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~sancho/</loc>
+  <lastmod>2019-06-01T22:07:12+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~smtpsupplicant/</loc>
+  <lastmod>2019-05-18T18:47:11+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~techemporium/</loc>
+  <lastmod>2019-06-15T23:44:56+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~thekingofbandit/</loc>
+  <lastmod>2019-05-29T04:46:22+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~usernameak/</loc>
+  <lastmod>2019-01-15T22:17:49+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~amcclure/home</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~amcclure/contact</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~amcclure/documents</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~amcclure/projects</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~amcclure/links</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~amcclure/readme</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~amcclure/license</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~amcclure/tos</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~amcclure/privacy</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~amcclure/etiquette</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~ubergeek/main</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~ubergeek/gopher</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~ubergeek/workstation</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~ubergeek/cli</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~ubergeek/thunix</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~ubergeek/sitecode</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~fosslinux/?C=N;O=D</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~fosslinux/?C=M;O=A</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~fosslinux/?C=S;O=A</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~fosslinux/?C=D;O=A</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~fosslinux/glowing-bear/</loc>
+  <lastmod>2019-02-08T00:38:04+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~fosslinux/proxy.php</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.64</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~adam/copyright.html</loc>
+  <lastmod>2019-06-10T13:44:58+00:00</lastmod>
+  <priority>0.51</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~brendantcc/.</loc>
+  <lastmod>2019-02-17T23:13:11+00:00</lastmod>
+  <priority>0.51</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/en</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.51</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/en/archive</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.51</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~ml/lynx_bookmarks.html</loc>
+  <lastmod>2019-07-15T11:48:29+00:00</lastmod>
+  <priority>0.51</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~ml/fwa.txt</loc>
+  <lastmod>2019-07-16T15:57:08+00:00</lastmod>
+  <priority>0.51</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~ml/tt.txt</loc>
+  <lastmod>2019-01-21T07:45:06+00:00</lastmod>
+  <priority>0.51</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~ml/lw</loc>
+  <lastmod>2019-07-15T11:48:29+00:00</lastmod>
+  <priority>0.51</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~sancho/.</loc>
+  <lastmod>2019-06-01T22:07:12+00:00</lastmod>
+  <priority>0.51</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~sancho/pages/about-me.html</loc>
+  <lastmod>2019-06-01T22:07:12+00:00</lastmod>
+  <priority>0.51</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~sancho/category/general.html</loc>
+  <lastmod>2019-06-01T22:07:12+00:00</lastmod>
+  <priority>0.51</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~sancho/first-post.html</loc>
+  <lastmod>2019-06-01T22:07:12+00:00</lastmod>
+  <priority>0.51</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/copyright.htm</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.51</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~techemporium/htpwdgen.php</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.51</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~techemporium/crapforum.php</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.51</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~techemporium/hcsfs.php</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.51</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~techemporium/pmcms.php</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.51</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~techemporium/sshacs.php</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.51</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~techemporium/warlord.php</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.51</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~techemporium/technes.php</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.51</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~techemporium/browzos.php</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.51</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~fosslinux/?C=N;O=A</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.51</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~fosslinux/?C=M;O=D</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.51</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~fosslinux/?C=S;O=D</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.51</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~fosslinux/?C=D;O=D</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.51</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~techemporium/gpl-3.0.php</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.41</priority>
+</url>
+<url>
+  <loc>https://www.thunix.net/~techemporium/mit_license.php</loc>
+  <lastmod>2019-07-17T01:25:07+00:00</lastmod>
+  <priority>0.41</priority>
+</url>
+
+
+</urlset>

wiki.php

@@ -8,24 +8,20 @@ include('config.php');
 include('parsedown-1.7.3/Parsedown.php');
 include('parsedown-extra-0.7.1/ParsedownExtra.php');
 
-$page = $_GET['page'];
+if(isset($_GET['page']))
-$style = $_GET['style'];
+	$page = $_GET['page'];
+else
+	$page = "main";
+
+if(isset($_GET['style']))
+	$site_style = $_GET['style'];
+
 $Parsedown = new Parsedown();
 $Parsedown->setMarkupEscaped(true);
 $ParsedownExtra = new ParsedownExtra();
 
-if ( $page == "") {
+if (empty($site_style))
-	$page = "main";
-	}
-
-if ( $style == "") {
-	if ( $site_style == "") {
 	$site_style="site";
-	}
-}
-else {
-	$site_style=$style;
-}
 
 $header  = file_get_contents("$doc_root/includes/header.md");
 $sidebar = file_get_contents("$doc_root/includes/sidebar.md");
@@ -67,6 +63,13 @@ print "		</div>
 
 echo $ParsedownExtra->text($content);
 
+switch ($page)
+{
+	case 'users':
+	case 'server':
+	require "includes/$page.php";
+}
+
 print "		</div>
 <!-- End Body -->
 
@@ -79,7 +82,8 @@ print "		</div>
 
 echo $Parsedown->text($footer);
 
-print "	</div>
+print "	<a href=\"https://tildegit.org/thunix/www\">Site Source</a> | <a href=\"https://tildegit.org/thunix/www/src/branch/master/articles/$page.md\">Page Source</a>
+	</div>
 <!-- End Footer -->
 
 	</body>