sync
This commit is contained in:
parent
6f8cb649d3
commit
7210a662cb
10 changed files with 82 additions and 98 deletions
|
@ -1,9 +1,8 @@
|
|||
{ lib, config, pkgs, inputs, ... }: {
|
||||
|
||||
hardware.opengl = {
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
driSupport = true;
|
||||
driSupport32Bit = true;
|
||||
enable32Bit = true;
|
||||
extraPackages = with pkgs; [
|
||||
vaapiVdpau
|
||||
libvdpau-va-gl
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
services.iceshrimp = {
|
||||
enable = true;
|
||||
# package = inputs.iceshrimp.packages.${pkgs.system}.iceshrimp;
|
||||
package = inputs.iceshrimp-withdrawal.packages.${pkgs.system}.iceshrimp.withdrawal;
|
||||
settings = {
|
||||
url = "https://dis.sociat.ing";
|
||||
enableMetrics = true;
|
||||
|
|
|
@ -33,10 +33,12 @@ in rec {
|
|||
ps2l_aggpop.servers."${tsHost "ps2live" 8201}" = {};
|
||||
ps2l_metagame.servers."${tsHost "ps2live" 8301}" = {};
|
||||
pdr.servers."${tsHost "porcelain-doll-repair" 3000}" = {};
|
||||
dsi.servers."${tsHost "dis-sociat-ing" 3000}" = {};
|
||||
se.servers."${tsHost "sapphic-engineer" 4000}" = {};
|
||||
git.servers."${tsHost "git" 3000}" = {};
|
||||
staticsites.servers."${tsHost "static-sites" 80}" = {};
|
||||
ldr.servers."${tsHost "live-doll-repair" 80}" = {};
|
||||
jitsi.servers."${tsHost "jitsi" 443}" = {};
|
||||
};
|
||||
|
||||
proxyCachePath."pdr" = {
|
||||
|
@ -98,10 +100,11 @@ in rec {
|
|||
"saerro.ps2.live" = ps2live "saerro";
|
||||
"metagame.ps2.live" = ps2live "metagame";
|
||||
|
||||
"live.doll.repair" = {
|
||||
"flesh.doll.repair" = {
|
||||
serverAliases = [ "conference.flesh.doll.repair" "auth.flesh.doll.repair" ];
|
||||
locations."/" = {
|
||||
recommendedProxySettings = true;
|
||||
proxyPass = "http://ldr";
|
||||
proxyPass = "https://jitsi";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
} // defaultConfig;
|
||||
|
@ -121,6 +124,21 @@ in rec {
|
|||
};
|
||||
} // defaultConfig // { forceSSL = false; };
|
||||
|
||||
"dis.sociat.ing" = {
|
||||
# serverAliases = ["p.doll.repair"]; # Media Proxy
|
||||
locations."/" = {
|
||||
recommendedProxySettings = true;
|
||||
proxyPass = "http://dsi";
|
||||
proxyWebsockets = true;
|
||||
extraConfig = ''
|
||||
proxy_cache pdr;
|
||||
proxy_cache_lock on;
|
||||
proxy_cache_use_stale updating;
|
||||
add_header X-Cache $upstream_cache_status;
|
||||
'';
|
||||
};
|
||||
} // defaultConfig;
|
||||
|
||||
"sapphic.engineer" = {
|
||||
# serverAliases = ["p.sapphic.engineer"];
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
10.100.1.42
|
||||
10.100.1.50
|
||||
|
|
|
@ -8,4 +8,48 @@
|
|||
networking.hostName = "jitsi";
|
||||
system.stateVersion = "24.11";
|
||||
nixpkgs.hostPlatform = "x86_64-linux";
|
||||
|
||||
services.jitsi-meet = {
|
||||
enable = true;
|
||||
hostName = "flesh.doll.repair";
|
||||
excalidraw.enable = true;
|
||||
interfaceConfig = {
|
||||
APP_NAME = "Doll Repair Hole??";
|
||||
SHOW_JITSI_WATERMARK = false;
|
||||
DISABLE_PRESENCE_STATUS = true;
|
||||
SHOW_POWERED_BY = false;
|
||||
SHOW_PROMOTIONAL_CLOSE_PAGE = false;
|
||||
VIDEO_QUALITY_LABEL_DISABLED = false;
|
||||
};
|
||||
config = {
|
||||
startAudioOnly = true;
|
||||
startWithAudioMuted = true;
|
||||
desktopSharingFrameRate = {
|
||||
min = 30;
|
||||
max = 60;
|
||||
};
|
||||
analytics.disabled = true;
|
||||
useTurnUdp = true;
|
||||
};
|
||||
};
|
||||
|
||||
# services.nginx.virtualHosts."flesh.doll.repair" = {
|
||||
# enableACME = false;
|
||||
# forceSSL = false;
|
||||
# };
|
||||
|
||||
services.jitsi-videobridge = {
|
||||
nat = {
|
||||
localAddress = "10.100.1.50";
|
||||
publicAddress = "136.56.240.152";
|
||||
};
|
||||
openFirewall = true;
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [ 80 443 ];
|
||||
|
||||
security.acme = {
|
||||
acceptTerms = true;
|
||||
defaults.email = "acme@kat.cafe";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
10.100.1.47
|
|
@ -1,88 +0,0 @@
|
|||
{ inputs, pkgs, config, lib, ... }: {
|
||||
imports = [
|
||||
../../templates/proxmox-lxc.nix
|
||||
../../server.nix
|
||||
];
|
||||
|
||||
networking.hostName = "live-doll-repair";
|
||||
system.stateVersion = "24.05";
|
||||
nixpkgs.hostPlatform = "x86_64-linux";
|
||||
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
additionalModules = [
|
||||
pkgs.nginxModules.rtmp
|
||||
];
|
||||
|
||||
virtualHosts."live.doll.repair" = {
|
||||
locations."/" = {
|
||||
root = pkgs.writeTextDir "index.html" ''
|
||||
<!doctype html>
|
||||
<link href="https://vjs.zencdn.net/8.10.0/video-js.css" rel="stylesheet" />
|
||||
<style>:root {margin: 0; padding: 0;} video { width: 100vw; height: 100vh; }</style>
|
||||
<!-- Or if you want the latest version from the main branch -->
|
||||
<!-- <script src="https://cdn.jsdelivr.net/npm/hls.js@canary"></script> -->
|
||||
<video id="video" class="video-js" preload="auto" controls autoplay muted data-setup='{"liveui": true, "autoplay": "play", "fluid": true, "liveTracker": { "liveTolerance": 5 }}'>
|
||||
<source src="https://live.doll.repair/stream/meow.m3u8">
|
||||
<source src="https://live.doll.repair/stream-dash/meow.mpd">
|
||||
</video>
|
||||
<script src="https://vjs.zencdn.net/8.10.0/video.min.js"></script>
|
||||
<script>
|
||||
window.HELP_IMPROVE_VIDEOJS = false;
|
||||
</script>
|
||||
'';
|
||||
};
|
||||
|
||||
locations."/stream" = {
|
||||
root = "/tmp";
|
||||
extraConfig = ''
|
||||
autoindex on;
|
||||
add_header Cache-Control no-cache;
|
||||
types {
|
||||
application/vnd.apple.mpegurl m3u8;
|
||||
video/mp2t ts;
|
||||
application/dash+xml mpd;
|
||||
}
|
||||
'';
|
||||
};
|
||||
locations."/stream-dash" = {
|
||||
root = "/tmp";
|
||||
extraConfig = ''
|
||||
autoindex on;
|
||||
add_header Cache-Control no-cache;
|
||||
types {
|
||||
application/vnd.apple.mpegurl m3u8;
|
||||
video/mp2t ts;
|
||||
application/dash+xml mpd;
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
appendConfig = ''
|
||||
rtmp {
|
||||
server {
|
||||
listen 1935;
|
||||
chunk_size 4096;
|
||||
|
||||
application live {
|
||||
live on;
|
||||
|
||||
allow publish 100.64.0.0/10;
|
||||
deny publish all;
|
||||
deny play all;
|
||||
|
||||
hls on;
|
||||
hls_path /tmp/stream;
|
||||
hls_playlist_length 2s;
|
||||
hls_fragment 1s;
|
||||
hls_continuous on;
|
||||
|
||||
dash on;
|
||||
dash_path /tmp/stream-dash;
|
||||
}
|
||||
}
|
||||
}
|
||||
'';
|
||||
};
|
||||
}
|
|
@ -53,12 +53,16 @@
|
|||
in with ports; [
|
||||
(static "aerial" [ node ])
|
||||
(static "cider" [ node ])
|
||||
(static "dis-sociat-ing" [ node ])
|
||||
(static "git" [ node ])
|
||||
(static "ingress-proxy" [ node nginx ])
|
||||
(static "jitsi" [ node ])
|
||||
(static "keylime" [ node ])
|
||||
(static "live-doll-repair" [ node ])
|
||||
(static "monitoring" [ node ])
|
||||
(static "mumble" [ node ])
|
||||
(static "nas0" [ node ])
|
||||
(static "nextcloud" [ node ])
|
||||
(static "pihole" [ node ])
|
||||
(static "porcelain-doll-repair" [ node ])
|
||||
(static "ps2live" [ node ])
|
||||
|
@ -99,6 +103,14 @@
|
|||
metrics_path = "/metrics";
|
||||
scheme = "https";
|
||||
}
|
||||
{
|
||||
job_name = "dis-sociat-ing-iceshrimp";
|
||||
static_configs = [
|
||||
{ targets = [ "dis.sociat.ing" ]; }
|
||||
];
|
||||
metrics_path = "/metrics";
|
||||
scheme = "https";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
10.100.1.42
|
||||
10.100.1.49
|
||||
|
|
|
@ -1 +1 @@
|
|||
10.100.1.42
|
||||
10.100.1.51
|
||||
|
|
Loading…
Add table
Reference in a new issue