update workadventure setup

This commit is contained in:
Ingolf Wagner 2021-05-23 13:37:02 +02:00
parent 76033ccc51
commit 285868654e
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
6 changed files with 46 additions and 13 deletions

View file

@ -4,7 +4,7 @@
services.nginx.virtualHosts.codimd = { services.nginx.virtualHosts.codimd = {
enableACME = true; enableACME = true;
addSSL = true; addSSL = true;
serverName = "codimd.ingolf-wagner.de"; serverName = "codimd.${config.workadventure.domain}";
locations."/".extraConfig = '' locations."/".extraConfig = ''
client_max_body_size 4G; client_max_body_size 4G;
proxy_set_header Host $host; proxy_set_header Host $host;

View file

@ -1,20 +1,34 @@
{ config, pkgs, lib, ... }: { { config, pkgs, lib, ... }: {
imports = [ imports = [
# ./options.nix
# codimd.${hostName}
./codimd.nix ./codimd.nix
./hardware-configuration.nix ./hardware-configuration.nix
# meet.${hostName}
./jitsi.nix ./jitsi.nix
./netdata.nix # netdata.${hostName}
#./netdata.nix
./ssh.nix ./ssh.nix
# party.${hostName}
# api.party.${hostName}
# push.party.${hostName}
# play.party.${hostName}
# upload.party.${hostName}
./workadventure.nix ./workadventure.nix
]; ];
environment.systemPackages = environment.systemPackages =
[ pkgs.git pkgs.docker-compose pkgs.ag pkgs.htop ]; [ pkgs.git pkgs.docker-compose pkgs.ag pkgs.htop ];
networking.hostName = "host"; # party.${hostName}
# api.party.${hostName}
# push.party.${hostName}
# play.party.${hostName}
# upload.party.${hostName}
security.acme.email = "contact@ingolf-wagner.de"; networking.hostName = "host";
workadventure.domain = "nerilex.org";
security.acme.email = "bg+party@nerilex.org";
security.acme.acceptTerms = true; security.acme.acceptTerms = true;
} }

View file

@ -1,3 +1,4 @@
{config, ...}:
{ {
# + + # + +
# | | # | |
@ -25,7 +26,7 @@
# This is a one server setup # This is a one server setup
services.jitsi-meet = { services.jitsi-meet = {
enable = true; enable = true;
hostName = "meet.ingolf-wagner.de"; hostName = "meet.${config.workadventure.domain}";
# JItsi COnference FOcus is a server side focus component used in Jitsi Meet conferences. # JItsi COnference FOcus is a server side focus component used in Jitsi Meet conferences.
# https://github.com/jitsi/jicofo # https://github.com/jitsi/jicofo

View file

@ -1,3 +1,4 @@
{config, ... }:
{ {
services.netdata = { services.netdata = {
enable = true; enable = true;
@ -14,7 +15,7 @@
}; };
services.nginx.enable = true; services.nginx.enable = true;
services.nginx.virtualHosts."netdata.party.ingolf-wagner.de" = { services.nginx.virtualHosts."netdata.${config.workadventure.domain}" = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
basicAuth.admin = "NYsXfBKRwkkS60WIeZONtFTv3nz4tPy52uqLkzJzuc"; basicAuth.admin = "NYsXfBKRwkkS60WIeZONtFTv3nz4tPy52uqLkzJzuc";

View file

@ -0,0 +1,16 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.workadventure;
in {
options.workadventure = {
domain = mkOption {
type = with types; str;
description = ''
domain of the server
'';
};
};
}

View file

@ -11,9 +11,9 @@ let
workadventureSecretKey = "YXNkZnNkZmxranNhZGxma2phc2RsZmtqYXNsa2Zkago="; workadventureSecretKey = "YXNkZnNkZmxranNhZGxma2phc2RsZmtqYXNsa2Zkago=";
jitsiURL = "meet.ingolf-wagner.de"; jitsiURL = "meet.${config.workadventure.domain}";
domain = "party.ingolf-wagner.de"; domain = "party.${config.workadventure.domain}";
# domain will redirect to this map. (not play.${domain}) # domain will redirect to this map. (not play.${domain})
defaultMap = "mrvandalo.github.io/workadventure-worlds/main.json"; defaultMap = "mrvandalo.github.io/workadventure-worlds/main.json";
@ -29,10 +29,11 @@ let
uploaderURL = "upload.${domain}"; uploaderURL = "upload.${domain}";
uploaderPort = 9006; uploaderPort = 9006;
frontImage = "thecodingmachine/workadventure-front:develop"; version = "v1.1.0";
pusherImage = "thecodingmachine/workadventure-pusher:develop"; frontImage = "thecodingmachine/workadventure-front:${version}";
apiImage = "thecodingmachine/workadventure-back:develop"; pusherImage = "thecodingmachine/workadventure-pusher:${version}";
uploaderImage = "thecodingmachine/workadventure-uploader:develop"; apiImage = "thecodingmachine/workadventure-back:${version}";
uploaderImage = "thecodingmachine/workadventure-uploader:${version}";
in { in {