From d06f425aea06080dbb68a929b57334c96a6c9b3f Mon Sep 17 00:00:00 2001 From: Moritz Wilhelmy Date: Thu, 22 Dec 2016 22:30:53 +0100 Subject: [PATCH] reorganize, throw out information about CA --- config.pm | 20 +++++----- content/channels/index.md | 12 ++++++ content/{irc => channels}/modes.md | 0 content/{irc => channels}/ssl.md | 0 content/{irc => }/connect/index.md | 0 content/{irc => }/connect/irssi.md | 0 content/{irc => }/connect/pidgin.md | 0 .../{irc => }/connect/screenshots/pidgin1.png | Bin .../{irc => }/connect/screenshots/pidgin2.png | Bin .../{irc => }/connect/screenshots/pidgin3.png | Bin .../{irc => }/connect/screenshots/pidgin4.png | Bin .../{irc => }/connect/screenshots/pidgin5.png | Bin .../connect/screenshots/weechat1.png | Bin content/{irc => }/connect/weechat.md | 0 content/index.md | 18 +++++---- content/irc/index.md | 35 ------------------ content/people.md | 22 +++++++++++ content/{irc => }/rules.pod | 0 18 files changed, 54 insertions(+), 53 deletions(-) create mode 100644 content/channels/index.md rename content/{irc => channels}/modes.md (100%) rename content/{irc => channels}/ssl.md (100%) rename content/{irc => }/connect/index.md (100%) rename content/{irc => }/connect/irssi.md (100%) rename content/{irc => }/connect/pidgin.md (100%) rename content/{irc => }/connect/screenshots/pidgin1.png (100%) rename content/{irc => }/connect/screenshots/pidgin2.png (100%) rename content/{irc => }/connect/screenshots/pidgin3.png (100%) rename content/{irc => }/connect/screenshots/pidgin4.png (100%) rename content/{irc => }/connect/screenshots/pidgin5.png (100%) rename content/{irc => }/connect/screenshots/weechat1.png (100%) rename content/{irc => }/connect/weechat.md (100%) delete mode 100644 content/irc/index.md create mode 100644 content/people.md rename content/{irc => }/rules.pod (100%) diff --git a/config.pm b/config.pm index a8f312b..cf42d4b 100644 --- a/config.pm +++ b/config.pm @@ -1,21 +1,21 @@ { name => 'Xinutec Network', - slogan => "Xinutec's place on the web", + slogan => "a virtual hackerspace", shortname => 'Xinutec', copyright => 'Xinutec Research Labs', menubar => [ ["Home"], - [irc => "IRC", [ - [connect => "Connecting", [ - [irssi => "Irssi"], - [pidgin => "Pidgin"], - [weechat => "Weechat"] - ]], - [rules => "Rules"], - [modes => "Modes"], - [ssl => "SSL"], + [connect => "Connecting", [ + [irssi => "Irssi"], + [pidgin => "Pidgin"], + [weechat => "Weechat"] ]], + [channels => "Channels", [ + [modes => "Channel Modes"], + [ssl => "Client certificates"], + ]], + [people => "People"], [dev => "Software", [ [contributing => "Contributing"], [cla => "CLA"], diff --git a/content/channels/index.md b/content/channels/index.md new file mode 100644 index 0000000..b76b871 --- /dev/null +++ b/content/channels/index.md @@ -0,0 +1,12 @@ +Channels +-------- + +`#linux` is the main channel. The name is for historical reasons (it was +started as a fork of another channel) and most of the time discussion isn't +about Linux. + +If you run a channel, you may host a channel homepage (static HTML only) on +this website. To do so, simply fork our +[github repository](https://github.com/xinutec/xinutec.github.io/) +and create a pull request once your changes are is in place. A staff member +will then review, fix, and approve it. diff --git a/content/irc/modes.md b/content/channels/modes.md similarity index 100% rename from content/irc/modes.md rename to content/channels/modes.md diff --git a/content/irc/ssl.md b/content/channels/ssl.md similarity index 100% rename from content/irc/ssl.md rename to content/channels/ssl.md diff --git a/content/irc/connect/index.md b/content/connect/index.md similarity index 100% rename from content/irc/connect/index.md rename to content/connect/index.md diff --git a/content/irc/connect/irssi.md b/content/connect/irssi.md similarity index 100% rename from content/irc/connect/irssi.md rename to content/connect/irssi.md diff --git a/content/irc/connect/pidgin.md b/content/connect/pidgin.md similarity index 100% rename from content/irc/connect/pidgin.md rename to content/connect/pidgin.md diff --git a/content/irc/connect/screenshots/pidgin1.png b/content/connect/screenshots/pidgin1.png similarity index 100% rename from content/irc/connect/screenshots/pidgin1.png rename to content/connect/screenshots/pidgin1.png diff --git a/content/irc/connect/screenshots/pidgin2.png b/content/connect/screenshots/pidgin2.png similarity index 100% rename from content/irc/connect/screenshots/pidgin2.png rename to content/connect/screenshots/pidgin2.png diff --git a/content/irc/connect/screenshots/pidgin3.png b/content/connect/screenshots/pidgin3.png similarity index 100% rename from content/irc/connect/screenshots/pidgin3.png rename to content/connect/screenshots/pidgin3.png diff --git a/content/irc/connect/screenshots/pidgin4.png b/content/connect/screenshots/pidgin4.png similarity index 100% rename from content/irc/connect/screenshots/pidgin4.png rename to content/connect/screenshots/pidgin4.png diff --git a/content/irc/connect/screenshots/pidgin5.png b/content/connect/screenshots/pidgin5.png similarity index 100% rename from content/irc/connect/screenshots/pidgin5.png rename to content/connect/screenshots/pidgin5.png diff --git a/content/irc/connect/screenshots/weechat1.png b/content/connect/screenshots/weechat1.png similarity index 100% rename from content/irc/connect/screenshots/weechat1.png rename to content/connect/screenshots/weechat1.png diff --git a/content/irc/connect/weechat.md b/content/connect/weechat.md similarity index 100% rename from content/irc/connect/weechat.md rename to content/connect/weechat.md diff --git a/content/index.md b/content/index.md index 65f7456..63a442f 100644 --- a/content/index.md +++ b/content/index.md @@ -1,16 +1,18 @@ Home ==== -Xinutec is a chat network and associated group of people who sometimes do -projects together, and which exists in the current form since approximately -2006. +Xinutec is an IRC based chat network and associated group of people who +sometimes do projects together. It exists since approximately 2006. -We're a group of people who are enthusiastic for computers and software related -projects, but we also generally like creative ideas, science, social -innovation, free software, talking to each other about our life and a lot more. -If you're interested, even if you think you're none of these things I've just -use to describe us, please check out our IRC network. +Among our shared interests are computers and Free Software related projects, but we +also generally like creative ideas, science, social innovation, talking to each +other like friends normally do and a lot more. + +If you're interested, even if you think none of these things I've just used to +describe us apply to you but we might get along anyway, feel free to check it out. If you're new to this whole IRC business, we recommend that you join using the [Webchat](https://qwebirc.xinutec.net/?channels=%23linux) and we'll just explain everything to you once you're there. Otherwise, [read on](irc/connect). + +We don't bite if it isn't consensual. diff --git a/content/irc/index.md b/content/irc/index.md deleted file mode 100644 index 07f682d..0000000 --- a/content/irc/index.md +++ /dev/null @@ -1,35 +0,0 @@ -Internet Relay Chat -=================== - -We are very concerned with privacy, not for any dubious reasons, but simply -because we feel the need to protect our freedom of speech. It should be -obvious, but let's state it explicitly: - -- our servers do not log any user messages -- we do not provide logger bots or host channel logs - -SSL ---- - -Each of our servers is equipped with a certificate issued by the [Letsencrypt -Certificate Authority](https://letsencrypt.org/). You should verify the -certificate. Please see the menu on the left for client specific instructions. - -Anonymity and authentication ----------------------------- - -We understand that some people may want to remain anonymous, so the use of -real names is not required on the Xinutec IRC network. Authentication is not -orthogonal to anonymity, and as such, we provide full support for [SSL client -certificates](ssl). You can use them in conjunction with [network specific -channel modes](modes) to automatically set certain modes upon channel join. -This way, a cryptographically secure channel registration method is available -on this network. - -Off-the-record messaging ------------------------- - -In case you are concerned that an attacker may compromise one of our servers -and record pre-encryption traffic (since servers must decrypt traffic before -re-encrypting it with the recipient's session key), we recommend establishing -end-to-end encryption with [OTR](http://www.cypherpunks.ca/otr/). diff --git a/content/people.md b/content/people.md new file mode 100644 index 0000000..c4d03c5 --- /dev/null +++ b/content/people.md @@ -0,0 +1,22 @@ +People +------ + +These are the effective network operators with links to their homepages: + +- [ente](https://barfooze.de/) +- [pippijn](http://xinutec.org/~pippijn) + +Additionally, we would like to link to the homepages of some permanent members +here: + +- [maito](http://maito.name/) +- [McManiaC](https://nils.cc/) +- [Palo](http://des-grauens.de/) +- [phryk](http://phryk.net/) + +People with an affiliation (regulars) to the network can also host a user page +on this server, similar to a channel page, or a simple entry like those above. + +Please note that despite distinguishing between network operators and users +in the list above, the function of the network operators is mostly that of a +gatekeeper, not of a dictator. diff --git a/content/irc/rules.pod b/content/rules.pod similarity index 100% rename from content/irc/rules.pod rename to content/rules.pod