Compare commits

...

12 Commits

Author SHA1 Message Date
Matt Compton 599c64d950 add xhec.one :) 2021-04-19 22:37:34 -04:00
jnats 7d037d47e7 added salyut.one 2021-04-19 20:59:27 +00:00
Ben Harris 84b57684f2 update bsd.tilde.team info 2021-04-15 17:47:37 -04:00
Ben Harris 7c96b58ec4 add gemini and sort services 2021-04-08 11:27:06 -04:00
leah e46b8c8dd9 shill for southlondon 2021-04-06 18:45:58 +00:00
Ben Harris 3b080a5c21 apply patch from eris 2021-04-06 14:28:11 -04:00
Ben Harris 42d41e517a use git -C instead of cd 2021-04-02 11:06:16 -04:00
Ben Harris 987ca2ea92 tidy up user list 2021-03-30 15:21:30 -04:00
Ben Harris de9c94f339 fix accessibility warning 2021-03-29 11:57:03 -04:00
Ben Harris 61369c7ecc fix accessibility warnings 2021-03-17 16:36:11 -04:00
Ben Harris 5e37843626 update tildeteam/wiki to 1.0.0 2021-03-17 13:14:23 -04:00
Ben Harris b294ed9648
switch to using packagist.org version of tildeteam/wiki 2021-03-17 00:33:10 -04:00
11 changed files with 87 additions and 121 deletions

View File

@ -21,6 +21,5 @@ trigger:
steps:
- name: deploy
commands:
- cd /var/www/tilde.team
- sudo -Hu www-data git pull origin master
- sudo -Hu www-data git -C /var/www/tilde.team pull --rebase origin master

View File

@ -1,11 +1,5 @@
{
"require": {
"tildeverse/wiki": "dev-master"
},
"repositories": [
{
"type": "vcs",
"url": "https://tildegit.org/team/tildewiki"
}
]
"tildeteam/wiki": "^1.0.0"
}
}

121
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "a88f8d05a0f0cb5d15c4597d5616f036",
"content-hash": "21b797601a3035a039996278b8e9b035",
"packages": [
{
"name": "erusev/parsedown",
@ -101,26 +101,26 @@
},
{
"name": "mnapoli/front-yaml",
"version": "1.7.0",
"version": "1.8.0",
"source": {
"type": "git",
"url": "https://github.com/mnapoli/FrontYAML.git",
"reference": "7602e0ffe84ca07b68865960d255d3ae9502e5d4"
"reference": "76baa8ca538e111bfe53ac49c6a512ec5ea2bf54"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mnapoli/FrontYAML/zipball/7602e0ffe84ca07b68865960d255d3ae9502e5d4",
"reference": "7602e0ffe84ca07b68865960d255d3ae9502e5d4",
"url": "https://api.github.com/repos/mnapoli/FrontYAML/zipball/76baa8ca538e111bfe53ac49c6a512ec5ea2bf54",
"reference": "76baa8ca538e111bfe53ac49c6a512ec5ea2bf54",
"shasum": ""
},
"require": {
"erusev/parsedown": "~1.0",
"php": "^7.2",
"php": ">=7.3",
"symfony/yaml": "~2.1|^3.0|^4.0|^5.0"
},
"require-dev": {
"league/commonmark": "~1.4",
"phpunit/phpunit": "~8.5"
"phpunit/phpunit": "^9.4"
},
"type": "library",
"autoload": {
@ -132,7 +132,7 @@
"license": [
"MIT"
],
"time": "2020-05-21T08:30:56+00:00"
"time": "2020-12-04T10:52:19+00:00"
},
{
"name": "symfony/deprecation-contracts",
@ -182,34 +182,20 @@
],
"description": "A generic function and convention to trigger deprecation notices",
"homepage": "https://symfony.com",
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-09-07T11:33:47+00:00"
},
{
"name": "symfony/polyfill-ctype",
"version": "v1.20.0",
"version": "v1.22.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41"
"reference": "c6c942b1ac76c82448322025e084cadc56048b4e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f4ba089a5b6366e453971d3aad5fe8e897b37f41",
"reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e",
"reference": "c6c942b1ac76c82448322025e084cadc56048b4e",
"shasum": ""
},
"require": {
@ -221,7 +207,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.20-dev"
"dev-main": "1.22-dev"
},
"thanks": {
"name": "symfony/polyfill",
@ -258,34 +244,20 @@
"polyfill",
"portable"
],
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-10-23T14:02:19+00:00"
"time": "2021-01-07T16:49:33+00:00"
},
{
"name": "symfony/yaml",
"version": "v5.1.7",
"version": "v5.2.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "e147a68cb66a8b510f4b7481fe4da5b2ab65ec6a"
"reference": "298a08ddda623485208506fcee08817807a251dd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/e147a68cb66a8b510f4b7481fe4da5b2ab65ec6a",
"reference": "e147a68cb66a8b510f4b7481fe4da5b2ab65ec6a",
"url": "https://api.github.com/repos/symfony/yaml/zipball/298a08ddda623485208506fcee08817807a251dd",
"reference": "298a08ddda623485208506fcee08817807a251dd",
"shasum": ""
},
"require": {
@ -306,11 +278,6 @@
"Resources/bin/yaml-lint"
],
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "5.1-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\Yaml\\": ""
@ -333,64 +300,58 @@
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Yaml Component",
"description": "Loads and dumps YAML files",
"homepage": "https://symfony.com",
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-09-27T03:44:28+00:00"
"time": "2021-03-06T07:59:01+00:00"
},
{
"name": "tildeverse/wiki",
"version": "dev-master",
"name": "tildeteam/wiki",
"version": "1.0.0",
"source": {
"type": "git",
"url": "https://tildegit.org/team/tildewiki",
"reference": "413c46fc21d1cd02d0dd1f8a1ea6ca3b58f36c8c"
"reference": "519497aa9ed64b5f614a544d98096e448b8860e2"
},
"require": {
"erusev/parsedown-extra": "^0.8.1",
"mnapoli/front-yaml": "^1.7.0"
"mnapoli/front-yaml": "^1.8.0"
},
"require-dev": {
"phpunit/phpunit": "^9.5"
},
"type": "library",
"autoload": {
"psr-4": {
"Tildeverse\\Wiki\\": "src/"
"tildeteam\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPLv3"
"GPL-3.0-or-later"
],
"authors": [
{
"name": "Ben Harris",
"email": "ben@tilde.team"
"email": "ben@tilde.team",
"homepage": "https://tilde.team/~ben/",
"role": "Developer"
}
],
"description": "parsedown extensions for tilde wikis",
"time": "2020-10-27T18:43:33+00:00"
"homepage": "https://tildegit.org/team/tildewiki",
"keywords": [
"markdown",
"wiki"
],
"time": "2021-03-17T16:29:47+00:00"
}
],
"packages-dev": [],
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
"tildeverse/wiki": 20
},
"stability-flags": [],
"prefer-stable": false,
"prefer-lowest": false,
"platform": [],
"platform-dev": [],
"plugin-api-version": "1.1.0"
"platform-dev": []
}

View File

@ -2,7 +2,10 @@
$filepath = __FILE__;
include 'header.php';
require __DIR__.'/vendor/autoload.php';
$parser = Tildeverse\Wiki\Parser::factory();
use tildeteam\wiki;
$parser = wiki::factory();
wiki::$bootstrap = wiki::$forkawesome = true;
?>
<div class="jumbotron">
@ -55,7 +58,7 @@ $parser = Tildeverse\Wiki\Parser::factory();
<br>
<hr>
<h3>tilde.team services</h3>
<h2>tilde.team services</h2>
<?php include 'services.php'; ?>
@ -64,7 +67,7 @@ $parser = Tildeverse\Wiki\Parser::factory();
<div class="row">
<div class="col-md-6">
<h1 id="news">~news~</h1>
<h2 id="news">~news~</h2>
<?php foreach (array_slice(array_reverse(glob("news/pages/*.md")), 0, 4) as $page):
$parsed = $parser->parse(file_get_contents($page));
@ -92,7 +95,7 @@ $parser = Tildeverse\Wiki\Parser::factory();
</div>
<div class="col-md-6">
<h1 id="projects">~projects~</h1>
<h2 id="projects">~projects~</h2>
<?php foreach (json_decode(file_get_contents("https://tildegit.org/api/v1/orgs/team/repos")) ?? [] as $repo):
if ($repo->archived) continue; ?>
@ -122,7 +125,7 @@ $parser = Tildeverse\Wiki\Parser::factory();
<hr>
<div class="clearfix">
<h1 id="users">~users~</h1>
<h2 id="users">~users~</h2>
<p><em><a href="/tilde.24h.html"><i class="fa fa-clock-o"></i> recent updates</a></em> | <a href="/users/">all users</a></p>
<p>if you're not listed here, make some changes to your page</p>

View File

@ -1,6 +1,7 @@
<?php
$filepath = __FILE__;
require __DIR__.'/../vendor/autoload.php';
use tildeteam\wiki;
$additional_head = "
<meta property='og:type' content='website'>
@ -8,7 +9,8 @@ $additional_head = "
<meta property='og:site_name' content='tilde.team news'>
";
$parser = Tildeverse\Wiki\Parser::factory();
$parser = wiki::factory();
wiki::$bootstrap = wiki::$forkawesome = true;
if (!isset($_GET["page"]) || !file_exists("pages/{$_GET['page']}.md")) {

View File

@ -28,7 +28,7 @@ issues that i've been wanting to fix for quite some time now
the ip address is the same and everything should be as you left it. please let me
know on irc or shoot an email if something is amiss.
i have an ongoing list [here](/~ben/todo.txt) that i will update as i get things
i have an [ongoing list](/~ben/todo.txt) that i will update as i get things
back up and running.
another important note: python is now 3.8 by default and you will need to

View File

@ -1,17 +1,18 @@
<?php
$services = [
'irc' => ['fa' => 'comments-o', 'url' => '/wiki/irc'],
'xmpp' => ['fa' => 'xmpp', 'url' => '/wiki/xmpp'],
'cryptpad' => ['fa' => 'sticky-note', 'url' => 'https://pad.tildeverse.org'],
'forum' => ['fa' => 'comment', 'url' => 'https://bbj.tildeverse.org'],
'gitea' => ['fa' => 'code-fork', 'url' => 'https://tildegit.org/team'],
'gopher' => ['fa' => 'floppy-o', 'url' => 'https://gopher.tildeverse.org/tilde.team'],
'gemini' => ['fa' => 'gem', 'url' => 'gemini://tilde.team'],
'gopher' => ['fa' => 'floppy-o', 'url' => 'gopher://tilde.team'],
'irc' => ['fa' => 'comments-o', 'url' => '/wiki/irc'],
'mastodon' => ['fa' => 'retweet', 'url' => 'https://tilde.zone'],
'nextcloud' => ['fa' => 'cloud', 'url' => 'https://cloud.tilde.team/'],
'nullpointer' => ['fa' => 'file-code-o', 'url' => 'https://ttm.sh'],
'pastebin' => ['fa' => 'paste', 'url' => 'https://paste.tildeverse.org/'],
'webmail' => ['fa' => 'envelope', 'url' => 'https://mail.tilde.team/'],
'webring' => ['fa' => 'life-ring', 'url' => '/ring/'],
'xmpp' => ['fa' => 'xmpp', 'url' => '/wiki/xmpp'],
];
$nav = isset($navbar) && $navbar;
@ -19,7 +20,7 @@ unset($navbar);
foreach ($services as $name => $service) {
if ($nav) { ?>
<li><a href="<?=$service["url"]?>"><i class="fa fa-<?=$service["fa"]?>"></i> <?=$name?></a></li>
<li><a href="<?=$service["url"]?>" role="menuitem"><i class="fa fa-<?=$service["fa"]?>"></i> <?=$name?></a></li>
<?php } else { ?>
<a href="<?=$service["url"]?>" class="btn btn-default"><i class="fa fa-<?=$service["fa"]?>"></i> <?=$name?></a>
<?php }

View File

@ -2,32 +2,26 @@
$filepath = __FILE__;
include __DIR__.'/../header.php';
$online_users = shell_exec("online-users");
$online_users = shell_exec("online-users | head -n1 | awk '{print $3}'");
$total_users = shell_exec("members team | wc -w");
?>
<div class="row">
<h1>users</h1>
</div>
<div class="row">
<?=$online_users?> of <?=$total_users?> total users
<p><a href="https://kiwi.tilde.chat/#team">
<img src="https://tilde.chat/badges/badge.php?channel=%23team" alt="users online in #team">
</a></p>
<p><?=$online_users?> of <?=$total_users?> total users logged in</p>
<p><em><a href="/tilde.24h.html"><i class="fa fa-clock-o"></i> recent updates</a></em></p>
</div>
<div class="row">
<img src="https://tilde.chat/badges/badge.php?channel=%23team" alt="users online in #team">
</div>
<div class="row">
<div class="col-md-5">
<p><em><a href="/tilde.24h.html"><i class="fa fa-clock-o"></i> recent updates</a></em></p>
<br><br>
<div class="list-group">
<ul>
<?php
foreach (glob("/home/*") as $user):
if (!is_dir("$user/public_html")) continue;
$user = basename($user); ?>
<li style="list-style: none; margin-left: -40px;">
<a href="/~<?=$user?>/" class="list-group-item">

View File

@ -1,6 +1,7 @@
<?php
$filepath = __FILE__;
require __DIR__.'/../vendor/autoload.php';
use tildeteam\wiki;
$additional_head = "
<meta property='og:type' content='website'>
@ -8,7 +9,8 @@ $additional_head = "
<meta property='og:site_name' content='tilde.team wiki'>
";
$parser = Tildeverse\Wiki\Parser::factory();
$parser = wiki::factory();
wiki::$bootstrap = wiki::$forkawesome = true;
if (!isset($_GET["page"]) || !file_exists("pages/{$_GET['page']}.md")) {
@ -31,16 +33,18 @@ if (!isset($_GET["page"]) || !file_exists("pages/{$_GET['page']}.md")) {
</p>
<hr>
<h3>pages:</h3>
<h2>pages:</h2>
<?php
foreach (glob("pages/*.md") as $page) {
<ul>
<?php foreach (glob("pages/*.md") as $page) {
$yaml = $parser->parse(file_get_contents($page))->getYAML();
if (!$yaml["published"]) continue; ?>
<a href="<?=basename($page, ".md")?>"><?=$yaml["title"]?></a><br>
<?php }
<li><a href="<?=basename($page, ".md")?>"><?=$yaml["title"]?></a></li>
<?php } ?>
</ul>
} else {
<?php } else {
$pg = $parser->parse(file_get_contents("pages/{$_GET["page"]}.md"));
$yml = $pg->getYAML();

View File

@ -9,13 +9,17 @@ category:
# bsd.tilde.team
tilde.team offers an alternate host: [bsd.tilde.team](https://bsd.tilde.team), which runs freebsd 12.
tilde.team offers an alternate host: [bsd.tilde.team](https://bsd.tilde.team), which runs freebsd 13.
currently it supports:
- webhosting out of `~/public_html` at `https://<user>.bsd.tilde.team` or `https://bsd.tilde.team/~<user>`
- email with user@bsd.tilde.team - feel free to forward this elsewhere or to your main @tilde.team address
- finger
- local irc server: localhost:6667 plaintext or bsd.tilde.chat:6697
currently, this vm is hosted on a server i rent from hetzner in germany, so feel free to put your chat client
etc here if you get better ping.
the user creation script copied over the `~/.ssh/authorized_keys` file in your $HOME on ~team. feel free to adjust as needed or holler if you need an admin for something. you should be able to just ssh user@bsd.tilde.team instead of user@tilde.team

View File

@ -27,7 +27,9 @@ https://tildegit.org/team/site/src/branch/master/wiki/pages/other-tildes.md)
| [rawtext.club](https://rawtext.club) | rawtext.club (RTC) is an experimental public access shell server with a focus on use of collaborative projects for gnu/linux skill building. Projects include simple, command line social tools and utilities, or whatever lightweight programs users are interested in. RTC does not use IRC, and instead focuses on other slower and more thoughtful forms of user interaction. | Send email to admin@rawtext.club with your ssh pubkey, desired username, and a statement describing your interest in joining. | |
| [remotes.club](https://remotes.club) | Anyone who works remotely is welcome. | [signup form](https://www.remotes.club/request.php) | |
| [rw.rs](http://rw.rs) | An experimental software community with a 199X aesthetic. | [signup via pull request](https://github.com/adsr/rw.rs/) | |
| [salyut.one](https://salyut.one) | a new, freebsd based tilde ! we don't bite :) | [signup instructions](https://salyut.one/welcome.html) | |
| [skylab.org](http://skylab.org) | An open-source community co-operative with ~150 members that has existed since 1997. Based in Portland, Oregon, United States with a userbase across the world, we have quietly existed. Featuring geektalk community chat, a variety of tools and hosting running on FreeBSD. | Email [skylabstatus@gmail.com](mailto:skylabstatus@gmail.com) with subject line SKYLAB.ORG and an email containing your desired username, full name, public SSH key and an acknowledgement to play nice. | |
| [southlondon.cc](https://southlondon.cc) | a nice debian server hosted in the uk. it's got ssh access, web hosting, an xmpp server that sorta works and some slightly more interesting things coming soon. | [take a look at this page](https://southlondon.cc/signup) | |
| [squiggle.city](http://squiggle.city) | squiggle.city is a Debian server in the spirit of tilde.club. It's for making web pages and learning about the command line. If you are reading [userland](https://p1k3.com/userland-book/), which is about how to unix, squiggle.city is a place to explore the ideas it contains. | email [bbearnes@gmail.com](mailto:bbearnes@gmail.com) with your ssh pubkey and a promise to not be a jerk | |
| [summit pubnix](https://www.summit.tildex.com) | summit is an intentional and inclusive community for developing, making, learning, teaching, socializing, and enjoying various aspects of GNU/Linux in a free/non-commercial environment. If you need help or have any questions, feel free to ask in #pubnix on irc.tilde.chat. | [signup form](https://www.summit.tildex.com/join) | |
| [texto-plano.xyz](https://texto-plano.xyz) | A small UNIX system community in the spirit of [Tilde.club](https://tilde.club), [RTC](https://rawtext.club) and the [small Internet](http://gopher.muffinlabs.com/republic.circumlunar.space/~spring/phlog/2019-01-16__The_Small_Internet.txt) in Spanish language (we use OpenBSD) | Send your public key and your username to [admin@texto-plano.xyz](mailto:admin@texto-plano.xyz) | |
@ -44,5 +46,7 @@ https://tildegit.org/team/site/src/branch/master/wiki/pages/other-tildes.md)
| [tilde.pw](https://tilde.pw) | tilde.pw is a unix server with some people on it and that unix server hosts webpages and other things too. | [signup form](https://tilde.pw/signup.php) | |
| [tilde.town](https://tilde.town) | tilde.town is an open, welcoming and safe place for the exploration of lo-fi HTML art, hi-fi javascript experiments, generative poetic works, and digital socialization in a post-facebook age. | [signup form](https://cgi.tilde.town/users/signup) | |
| [tildespark](https://tildespark.ddns.net) | Tilde Spark is a constantly evolving intentional community devoted to free software, open hardware and meeting new people! | [signup info here](https://tildespark.ddns.net/ikiwiki/tildespark/howtojoin/) | down |
| [unix.lgbt](https://unix.lgbt) | unix.lgbt is an explictly LGBTQ+ friendly public unix/tilde! we offer web, gemini, irc and various other community services. | [signup form](https://unix.lgbt/register.php) | |
| [wilde.ftp.sh](http://wilde.ftp.sh/) | The world's first (and possibly only) Windows-based tilde! | [signup form](http://wilde.ftp.sh/signup.php) | down |
| [xhec.one](https://xhec.one) | A brand new ~ running on Arch Linux. Seeking members and suggestions for content :) | [signup instructions](https://xhec.one)
| [yourtilde.com](https://yourtilde.com) | If you're looking for a new ~, to learn and play, come check us out. | [signup form](https://yourtilde.com/sign-up) | |