Cleaning up unneeded linebreaks

This commit is contained in:
Ubergeek 2019-07-10 11:30:35 +00:00
parent 18bb8ea329
commit 56f603c1ad
7 changed files with 49 additions and 167 deletions

View File

@ -1,14 +1,8 @@
# 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.
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.
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:
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:
<div style="text-align:center;">

View File

@ -2,65 +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 tilde.chat, or you can [contact us](contact), if you run into any difficulties.
**Who is running thunix?**
The current system administrators are [amcclure](/~amcclure),
[ubergeek](/~ubergeek), [Naglfar](/~naglfar), and
[fosslinux](/~fosslinux).
The current system administrators are [amcclure](/~amcclure), [ubergeek](/~ubergeek), [Naglfar](/~naglfar), and [fosslinux](/~fosslinux).
**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!**
**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 submit a PR or an issue [here](https://tildegit.org/thunix/ansible) 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?**
**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.
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?**
**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!**
**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)

View File

@ -1,43 +1,27 @@
# 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.
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.
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.
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.
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.
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.
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.
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.
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.

View File

@ -1,30 +1,20 @@
# Welcome to thunix!
We're so glad you could drop by and we hope you enjoy your visit. Stay a
while! Feel free to inquire about what we have to offer and explore our
services.
We're so glad you could drop by and we hope you enjoy your visit. Stay a while! Feel free to inquire about what we have to offer and explore our services.
## 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!
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!
## Project Phoenix
The thunix Phoenix project aims to provide a new user experience for
shell users, with integration into the wider Tildeverse network.
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)
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:
If you want to sign up for an account, simply open our [signup form](/signup) and provide us with:
* Your contact name
* Your email address (so that we can contact you with login details)
@ -32,9 +22,7 @@ form](/signup) and provide us with:
* How you heard about us and what interests you in thunix
* Your Public SSH Key
thunix tries to adhere to the values and philosophy of the Hacker Ethic
whenever possible. The hacker ethics and beliefs as described by Levy
are:
thunix tries to adhere to the values and philosophy of the Hacker Ethic whenever possible. The hacker ethics and beliefs as described by Levy are:
* Access to computers - and anything which might teach you something about the way the world works - should be unlimited and total. Always yield to the Hands-On Imperative!
* All information should be free
@ -43,8 +31,6 @@ are:
* You can create art and beauty on a computer
* Computers can change your life for the better
thunix will never use proprietary software but users can do that if they
wish. This is something they should avoid however.
thunix will never use proprietary software but users can do that if they wish. This is something they should avoid however.
If you want to help keep thunix running, please consider
[donating](/donate).
If you want to help keep thunix running, please consider [donating](/donate).

View File

@ -2,39 +2,18 @@
Another month, another update!
Not too much to announce, as far as front end changes. New user requests
should happen much faster now that we've written/stolen a tool from
tilde.team that we can use to expedite user creation, and automation of
a bunch of the steps we take to onboard users.
Not too much to announce, as far as front end changes. New user requests should happen much faster now that we've written/stolen a tool from tilde.team that we can use to expedite user creation, and automation of a bunch of the steps we take to onboard users.
We're considering adding in user aging for accounts. Lots of accounts
get created, and then never logged into. This can actually post a
security problem for the system, as often times, accounts get created
now, to be used months from today for botnets and the like. Let us know
what your thoughts are on a reasonable time to age off users. At this
time, I am personally leaning towards 180 days. Plenty of time to log
into your shell, and use it a bit. And, once every 6 months isn't much
to ask, since we expect members to actually contribute to the community,
anyways.
We're considering adding in user aging for accounts. Lots of accounts get created, and then never logged into. This can actually post a security problem for the system, as often times, accounts get created now, to be used months from today for botnets and the like. Let us know what your thoughts are on a reasonable time to age off users. At this time, I am personally leaning towards 180 days. Plenty of time to log into your shell, and use it a bit. And, once every 6 months isn't much to ask, since we expect members to actually contribute to the community, anyways.
We've terminated one account already for running a botnet member from
here, and we'll keep a vigilant eye for any others.
We've terminated one account already for running a botnet member from here, and we'll keep a vigilant eye for any others.
This leads to another point: Just running a znc process doesn't count
for login. Neither does checking your email. You'll need to actually log
into the shell, in order to reset the counter. You should, anyways,
since we have a lot of services internally, that we don't offer external
access too.
This leads to another point: Just running a znc process doesn't count for login. Neither does checking your email. You'll need to actually log into the shell, in order to reset the counter. You should, anyways, since we have a lot of services internally, that we don't offer external access too.
We are also looking at terminating the minecraft and minetest instances
here. If anyone is using them, speak up now, or forever hold you peace!
Not really. We wouldn't be deleting anything, just shutting down the
processes, and removing them from the backup scheme.
We are also looking at terminating the minecraft and minetest instances here. If anyone is using them, speak up now, or forever hold you peace! Not really. We wouldn't be deleting anything, just shutting down the processes, and removing them from the backup scheme.
We do need to welcome our newest sysadmin here: fosslinux. Give them a
warm welcome if you see them around.
We do need to welcome our newest sysadmin here: fosslinux. Give them a warm welcome if you see them around.
And again, any questions, or concerns, feel free to drop myself, or any
of the other admins a line.
And again, any questions, or concerns, feel free to drop myself, or any of the other admins a line.
Ubergeek/ub3g33k

View File

@ -6,38 +6,26 @@ Connect to thunix.net:30000 in your minetest client
## Minecraft
Connect to thunix.net in your minecraft client. Running the Paperclip
minecraft server.
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/)
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/)
## Onion Service
Thunix's services are available as a onion site as well. Our onion
address is thunixme5v4rnoby.onion.
Thunix's services are available as a onion site as well. Our onion address is thunixme5v4rnoby.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
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 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]().
## FOSS Project Mirrors
Thunix hosts mirrors for several FOSS projects. You can see the full
mirror list in the sidebar link.
Thunix hosts mirrors for several FOSS projects. You can see the full mirror list in the sidebar link.
<!-- Begin autogen content from /includes/server.php -->

View File

@ -1,14 +1,8 @@
# Terms of Service
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. 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.
You are responsibe for checking your local mail account from time to
time. This email address is the only one we retain, and as such, any
@ -36,24 +30,8 @@ sent to this account.
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.
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.
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.
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.
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).
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).