MirrorMirror
/
riju
mirror of https://github.com/radian-software/riju.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
plondon 2021-11-10 17:43:33 -05:00
parent 6c8c0ea658 b2de596342
commit 9721ff6b78
14 changed files with 65 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -73,7 +73,7 @@ else
SHELL_PORTS := SHELL_PORTS :=
endif endif
SHELL_ENV := -e Z -e CI -e TEST_PATIENCE -e TEST_CONCURRENCY -e TEST_TIMEOUT_SECS -e FATHOM_SITE_ID SHELL_ENV := -e Z -e CI -e TEST_PATIENCE -e TEST_CONCURRENCY -e TEST_TIMEOUT_SECS -e ANALYTICS_TAG
ifeq ($(I),lang) ifeq ($(I),lang)
LANG_TAG := lang-$(L) LANG_TAG := lang-$(L)

5
README.md
View File

@ -44,8 +44,9 @@ being nice include:
* *Trying to consume as many resources as possible.* All this will do * *Trying to consume as many resources as possible.* All this will do
is prevent others from using Riju, which isn't nice. is prevent others from using Riju, which isn't nice.
* *Mining cryptocurrency.* Since hosting Riju comes out of my * *Mining cryptocurrency.* Since hosting Riju comes out of ~my
paycheck, this is exactly equivalent to stealing, which isn't nice. paycheck~ community donations, this is exactly equivalent to
stealing, which isn't nice.
## Can I help? / Documentation ## Can I help? / Documentation

9
backend/server.js
View File

@ -16,7 +16,10 @@ const host = process.env.HOST || "localhost";
const port = parseInt(process.env.PORT || "") || 6119; const port = parseInt(process.env.PORT || "") || 6119;
const tlsPort = parseInt(process.env.TLS_PORT || "") || 6120; const tlsPort = parseInt(process.env.TLS_PORT || "") || 6120;
const useTLS = process.env.TLS ? true : false; const useTLS = process.env.TLS ? true : false;
const fathomSiteId = process.env.FATHOM_SITE_ID || ""; const analyticsTag = (process.env.ANALYTICS_TAG || "").replace(
/^'(.+)'$/,
"$1"
);
const langs = await langsPromise; const langs = await langsPromise;
const app = express(); const app = express();
@ -28,7 +31,7 @@ app.get("/", (_, res) => {
if (Object.keys(langs).length > 0) { if (Object.keys(langs).length > 0) {
res.render(path.resolve("frontend/pages/index"), { res.render(path.resolve("frontend/pages/index"), {
langs, langs,
fathomSiteId, analyticsTag,
}); });
} else { } else {
res res
@ -63,7 +66,7 @@ app.get("/:lang", cors(), (req, res) => {
} }
res.render(path.resolve("frontend/pages/app"), { res.render(path.resolve("frontend/pages/app"), {
config: langs[lang], config: langs[lang],
fathomSiteId, analyticsTag,
}); });
}); });
app.use("/css", express.static("frontend/styles")); app.use("/css", express.static("frontend/styles"));

7
doc/selfhosting.md
View File

@ -263,9 +263,10 @@ enable all the fun CloudFlare options you'd like.
## Set up analytics (optional) ## Set up analytics (optional)
Sign up for Fathom Analytics, enter your domain name, and get a site Sign up for Fathom Analytics, enter your domain name, and get a tag
ID. Set this as `FATHOM_SITE_ID` in your `.env` file, and build and for embedding. Set this as `ANALYTICS_TAG` in your `.env` file (use
roll out a new web AMI. single quoting, as Makefile handling of quotes is a bit nonstandard),
and build and roll out a new web AMI.
## Set up monitoring (optional) ## Set up monitoring (optional)

18
financials/2021-10/breakdown.txt Normal file
View File

@ -0,0 +1,18 @@
Riju :: $106.77
EC2 :: $81.38
Data Transfer :: $0.03
EBS Snapshot :: $2.36
EBS Volume :: $28.57
EBS Volume :: $28.57
gp2 :: $1.07
gp3 :: $27.49
Instance :: $50.43
t3.large :: $23.05
t3.medium :: $27.38
ECR :: $5.14
Storage :: $5.14
ELB :: $20.14
Data Transfer :: $0.38
LCUs :: $0.07
Load Balancer :: $19.68
S3 :: $0.11

4
frontend/pages/app.ejs
View File

@ -22,8 +22,8 @@
window.rijuConfig = <%- JSON.stringify(config) %>; window.rijuConfig = <%- JSON.stringify(config) %>;
</script> </script>
<script src="/js/app.js" defer></script> <script src="/js/app.js" defer></script>
<% if (fathomSiteId) { %> <% if (analyticsTag) { %>
<script src="https://cdn.usefathom.com/script.js" data-site="<%= fathomSiteId %>" defer></script> <%- analyticsTag %>
<% } %> <% } %>
</head> </head>
<body> <body>

6
frontend/pages/index.ejs
View File

@ -4,6 +4,9 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Riju</title> <title>Riju</title>
<link rel="stylesheet" href="/css/index.css" /> <link rel="stylesheet" href="/css/index.css" />
<% if (analyticsTag) { %>
<%- analyticsTag %>
<% } %>
</head> </head>
<body> <body>
<h1>Riju: <i>fast</i> online playground for every programming language</h1> <h1>Riju: <i>fast</i> online playground for every programming language</h1>
@ -30,8 +33,5 @@
<% } else { %> <% } else { %>
<i>Riju is loading language configuration...</i> <i>Riju is loading language configuration...</i>
<% } %> <% } %>
<% if (fathomSiteId) { %>
<script src="https://cdn.usefathom.com/script.js" data-site="<%= fathomSiteId %>" defer></script>
<% } %>
</body> </body>
</html> </html>

2
packer/provision-web.bash
View File

@ -59,7 +59,7 @@ sudo sed -Ei 's|^#?PermitRootLogin .*|PermitRootLogin no|' /etc/ssh/sshd_config
sudo sed -Ei 's|^#?PasswordAuthentication .*|PasswordAuthentication no|' /etc/ssh/sshd_config sudo sed -Ei 's|^#?PasswordAuthentication .*|PasswordAuthentication no|' /etc/ssh/sshd_config
sudo sed -Ei 's|^#?PermitEmptyPasswords .*|PermitEmptyPasswords no|' /etc/ssh/sshd_config sudo sed -Ei 's|^#?PermitEmptyPasswords .*|PermitEmptyPasswords no|' /etc/ssh/sshd_config
sudo sed -Ei "s|\\\$AWS_REGION|${AWS_REGION}|" /etc/systemd/system/riju.service sudo sed -Ei "s|\\\$AWS_REGION|${AWS_REGION}|" /etc/systemd/system/riju.service
sudo sed -Ei "s|\\\$FATHOM_SITE_ID|${FATHOM_SITE_ID:-}|" /etc/systemd/system/riju.service sudo sed -Ei "s|\\\$ANALYTICS_TAG|${ANALYTICS_TAG:-}|" /etc/systemd/system/riju.service
sudo sed -Ei "s|\\\$S3_BUCKET|${S3_BUCKET}|" /etc/systemd/system/riju.service sudo sed -Ei "s|\\\$S3_BUCKET|${S3_BUCKET}|" /etc/systemd/system/riju.service
sudo sed -Ei "s|\\\$SENTRY_DSN|${SENTRY_DSN:-}|" /etc/systemd/system/riju.service sudo sed -Ei "s|\\\$SENTRY_DSN|${SENTRY_DSN:-}|" /etc/systemd/system/riju.service
sudo sed -Ei "s|\\\$SUPERVISOR_ACCESS_TOKEN|${SUPERVISOR_ACCESS_TOKEN}|" /etc/systemd/system/riju.service sudo sed -Ei "s|\\\$SUPERVISOR_ACCESS_TOKEN|${SUPERVISOR_ACCESS_TOKEN}|" /etc/systemd/system/riju.service

2
packer/riju.service
View File

@ -11,7 +11,7 @@ ExecStart=riju-supervisor
Restart=always Restart=always
RestartSec=5 RestartSec=5
Environment=AWS_REGION=$AWS_REGION Environment=AWS_REGION=$AWS_REGION
Environment=FATHOM_SITE_ID=$FATHOM_SITE_ID Environment=ANALYTICS_TAG=$ANALYTICS_TAG
Environment=S3_BUCKET=$S3_BUCKET Environment=S3_BUCKET=$S3_BUCKET
Environment=SENTRY_DSN=$SENTRY_DSN Environment=SENTRY_DSN=$SENTRY_DSN
Environment=SUPERVISOR_ACCESS_TOKEN=$SUPERVISOR_ACCESS_TOKEN Environment=SUPERVISOR_ACCESS_TOKEN=$SUPERVISOR_ACCESS_TOKEN

22
packer/riju.slice
View File

@ -3,12 +3,26 @@ Description=Resource limits for Riju user containers
Before=slices.target Before=slices.target
[Slice] [Slice]
# t3.large instance has baseline CPU performance of 60% and is
# burstable up to 200%. Reserve bursting for server + operating
# system.
CPUAccounting=true CPUAccounting=true
CPUQuota=100% CPUQuota=60%
# t3.large instance has 8GB memory, so reserve 3GB for server +
# operating system. Disable swap for now.
MemoryAccounting=true MemoryAccounting=true
MemoryMax=3G MemoryMax=5G
MemorySwapMax=8G MemorySwapMax=0
# Empirically, EC2 instances appear to have /proc/sys/kernel/pid_max
# equal to 2^22 = 4194304. It should be safe to give about a tenth of
# this space to user code.
TasksAccounting=true TasksAccounting=true
TasksMax=2048 TasksMax=400000
# Attempt to deny access to EC2 Instance Metadata service from user
# code.
IPAccounting=true IPAccounting=true
IPAddressDeny=169.254.169.254 IPAddressDeny=169.254.169.254

8
packer/web.pkr.hcl
View File

@ -8,9 +8,9 @@ variable "aws_region" {
default = "${env("AWS_REGION")}" default = "${env("AWS_REGION")}"
} }
variable "fathom_site_id" { variable "analytics_tag" {
type = string type = string
default = "${env("FATHOM_SITE_ID")}" default = "${env("ANALYTICS_TAG")}"
} }
variable "grafana_api_key" { variable "grafana_api_key" {
@ -35,7 +35,7 @@ variable "supervisor_access_token" {
data "amazon-ami" "ubuntu" { data "amazon-ami" "ubuntu" {
filters = { filters = {
name = "ubuntu/images/hvm-ssd/ubuntu-*-21.04-amd64-server-*" name = "ubuntu/images/hvm-ssd/ubuntu-*-21.10-amd64-server-*"
root-device-type = "ebs" root-device-type = "ebs"
virtualization-type = "hvm" virtualization-type = "hvm"
} }
@ -116,7 +116,7 @@ build {
environment_vars = [ environment_vars = [
"ADMIN_PASSWORD=${var.admin_password}", "ADMIN_PASSWORD=${var.admin_password}",
"AWS_REGION=${var.aws_region}", "AWS_REGION=${var.aws_region}",
"FATHOM_SITE_ID=${var.fathom_site_id}", "ANALYTICS_TAG=${var.analytics_tag}",
"GRAFANA_API_KEY=${var.grafana_api_key}", "GRAFANA_API_KEY=${var.grafana_api_key}",
"S3_BUCKET=${var.s3_bucket}", "S3_BUCKET=${var.s3_bucket}",
"SENTRY_DSN=${var.sentry_dsn}", "SENTRY_DSN=${var.sentry_dsn}",

2
supervisor/src/main.go
View File

@ -355,7 +355,7 @@ func (sv *supervisor) reload() error {
"-v", "/var/cache/riju:/var/cache/riju", "-v", "/var/cache/riju:/var/cache/riju",
"-v", "/var/run/docker.sock:/var/run/docker.sock", "-v", "/var/run/docker.sock:/var/run/docker.sock",
"-p", fmt.Sprintf("127.0.0.1:%d:6119", port), "-p", fmt.Sprintf("127.0.0.1:%d:6119", port),
"-e", "FATHOM_SITE_ID", "-e", "ANALYTICS_TAG",
"-e", "RIJU_DEPLOY_CONFIG", "-e", "RIJU_DEPLOY_CONFIG",
"-e", "SENTRY_DSN", "-e", "SENTRY_DSN",
"--label", fmt.Sprintf("riju.deploy-config-hash=%s", deployCfgHash), "--label", fmt.Sprintf("riju.deploy-config-hash=%s", deployCfgHash),

6
system/src/riju-system-privileged.c
View File

@ -233,13 +233,11 @@ void session(char *uuid, char *lang, char *imageHash)
"--name", "--name",
container, container,
"--cpus", "--cpus",
"1", "0.6",
"--memory", "--memory",
"1g", "1g",
"--memory-swap",
"8g",
"--pids-limit", "--pids-limit",
"2048", "4000",
"--cgroup-parent", "--cgroup-parent",
"riju.slice", "riju.slice",
"--label", "--label",

2
tf/ec2.tf
View File

@ -37,7 +37,7 @@ resource "aws_security_group" "server" {
resource "aws_launch_template" "server" { resource "aws_launch_template" "server" {
name = "riju-server" name = "riju-server"
image_id = data.aws_ami.server.id image_id = data.aws_ami.server.id
instance_type = "t3.medium" instance_type = "t3.large"
security_group_names = [aws_security_group.server.name] security_group_names = [aws_security_group.server.name]
iam_instance_profile { iam_instance_profile {