Merge "bgpwtf/machines: allow new customer prefix from hscloud/dcr01sw37"
diff --git a/hswaw/cebulacamp/landing/cebula2020.jpeg b/hswaw/cebulacamp/landing/cebula2020.jpeg
index 5794856..1025ab8 100644
--- a/hswaw/cebulacamp/landing/cebula2020.jpeg
+++ b/hswaw/cebulacamp/landing/cebula2020.jpeg
Binary files differ
diff --git a/hswaw/cebulacamp/landing/index.html b/hswaw/cebulacamp/landing/index.html
index b2d4e95..1385a31 100644
--- a/hswaw/cebulacamp/landing/index.html
+++ b/hswaw/cebulacamp/landing/index.html
@@ -1,18 +1,18 @@
<!DOCTYPE html>
<meta charset="utf-8">
-<title>Cebulacamp 2020</title>
+<title>Cebulacamp 2021</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href="style/main.css">
<header class="hero">
<h1>Kongres Komunikacyjny Cebula 2021</h1>
<h2>Testing in <s>production</s> pandemic</h2>
- <p class="acc0">2021/xx/xx - 2021/xx/xx</p>
+ <p class="acc0">2021/10/01 - 2021/10/03</p>
<p class="acc1">Hotel Orle, Gdańsk</p>
<p>
Three days of under-organized hacking and talking in a hotel in northern Poland. We might talk about the Polish hacker scene. We might get technical. We might even speak mostly Polish, but we'll do our best to welcome people who don't speak encrypted. We're friendly.
</p>
<p class="acc2">
- Happening any day now! Hopefully in 2021. Waiting for vaccines.
+ Tentatively planned. Still arranging details, including hygiene/vaccination/test rules. Stay tuned.
</p>
</header>
<main>
@@ -24,7 +24,10 @@
<header>
<h2>Tickets</h2>
<p>
- Get your tickets now at <a href="https://tickets.hackerspace.pl/cebulacamp/kkc20/1">tickets.hackerspace.pl/cebulacamp/kkc20/1</a>.
+ If you already have tickets from 2020: they're still valid. We will also start another small round of ticket sales very soon.
+ </p>
+ <p>
+ The ticket shop is available at <a href="https://tickets.hackerspace.pl/cebulacamp/kkc20/1">tickets.hackerspace.pl/cebulacamp/kkc20/1</a>.
</p>
<p>
An all-inclusive ticket (bed in shared room for two nights, food for three days) is 500 PLN. If you want a solo room, or to share a room with someone in particular, contact <a href="mailto:cebula@hackerspace.pl">cebula@hackerspace.pl</a>, or (once you bought your ticket) <a href="mailto:info@orle.pl">info@orle.com.pl</a>.
@@ -53,10 +56,10 @@
<header>
<h2>Contact</h2>
<p>
- Reach the organizers at <a href="mailto:cebula@hackerspace.pl">cebula@hackerspace.pl</a>. Reach the hotel (in case of room requests, etc) at <a href="mailto:info@orle.com.pl">info@orle.com.pl</a>, and CC cebula@hackerspace.pl if you so with.
+ Reach the organizers at <a href="mailto:cebula@hackerspace.pl">cebula@hackerspace.pl</a>. Reach the hotel (in case of room requests, etc) at <a href="mailto:info@orle.com.pl">info@orle.com.pl</a>, and CC cebula@hackerspace.pl if you so wish.
</p>
<p>
- irc: #cebulacamp on Freenode
+ <a href="https://kiwiirc.com/nextclient/irc.libera.chat/cebulacamp">irc: #cebulacamp on Libera.chat</a>
</p>
<p>
Cebula Camp is an inclusive event. Be excellent to each other, or stay home. Harassment and discrimination are not welcome or tolerated, online or AFK. If you're a subject, observer, or third-party to any of these, please, get in touch, write to <a href="mailto:cebula@hackerspace.pl">cebula@hackerspace.pl</a> or <a href="mailto:q3k@q3k.org">q3k personally</a>.
diff --git a/personal/q3k/minecraft/Dockerfile-vanilla-1.16.5 b/personal/q3k/minecraft/Dockerfile-vanilla-1.16.5
new file mode 100644
index 0000000..59bcdef
--- /dev/null
+++ b/personal/q3k/minecraft/Dockerfile-vanilla-1.16.5
@@ -0,0 +1,16 @@
+FROM ubuntu:20.04
+
+RUN set -e -x ;\
+ export DEBIAN_FRONTEND=noninteractive ;\
+ apt-get -y update ;\
+ apt-get -y upgrade ;\
+ apt-get -y install git openjdk-8-jre-headless wget unzip
+
+RUN set -e -x ;\
+ useradd -rm minecraft
+
+USER minecraft
+WORKDIR /home/minecraft
+
+RUN set -e -x ;\
+ wget --quiet -O server.jar https://launcher.mojang.com/v1/objects/1b557e7b033b583cd9f66746b7a9ab1ec1673ced/server.jar
diff --git a/personal/q3k/minecraft/prod.jsonnet b/personal/q3k/minecraft/prod.jsonnet
index dfadbc3..c7493e0 100644
--- a/personal/q3k/minecraft/prod.jsonnet
+++ b/personal/q3k/minecraft/prod.jsonnet
@@ -8,6 +8,7 @@
"paper-1.16.1": "registry.k0.hswaw.net/q3k/minecraft:paper-1.16.1-r2",
"paper-1.16.4": "registry.k0.hswaw.net/q3k/minecraft:paper-1.16.4-r1",
"paper-1.16.5": "registry.k0.hswaw.net/q3k/minecraft:paper-1.16.5-r2",
+ "vanilla-1.16.5": "registry.k0.hswaw.net/enleth/minectaft:vanilla-1.16.5",
},
server(name, version):: {
local server = self,
@@ -213,8 +214,19 @@
ns: kube.Namespace("minecraft"),
+ admins: minecraft.ns.Contain(kube.RoleBinding("admins")) {
+ roleRef: {
+ apiGroup: "rbac.authorization.k8s.io",
+ kind: "ClusterRole",
+ name: "system:admin-namespace",
+ },
+ subjects: [
+ kube.User("enleth@hackerspace.pl"),
+ ],
+ },
+
q3k: {
- "nova-arcana": minecraft.server("q3k-nova-arcana", "paper-1.16.5") {
+ "nova-arcana": minecraft.server("q3k-nova-arcana", "vanilla-1.16.5") {
overviewer: false,
worldedit: false,
properties+: {
@@ -222,6 +234,7 @@
//"enforce-whitelist": true,
"enable-rcon": "true",
"rcon.password": "dupa.8",
+ "enable-command-block": true,
},
startSteps+: [
|||
