fricloud/server-configs
2
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: fricloud:cbbed221c99a304c360f37c0e2971140cd2aa00f
Branches Tags
fricloud:main
fricloud:proxy_images
fricloud:element
..
compare: fricloud:7313bb83442d881f8ecf431aa3fd00d9fa7eba7c
Branches Tags
fricloud:main
fricloud:proxy_images
fricloud:element

No commits in common. "cbbed221c99a304c360f37c0e2971140cd2aa00f" and "7313bb83442d881f8ecf431aa3fd00d9fa7eba7c" have entirely different histories.
cbbed221c9 ... 7313bb8344

4 changed files with 6 additions and 25 deletions
Show stats Expand all files Collapse all files

2
machines/gerd/services/authelia/authelia-nginx.nix
View file

@ -73,7 +73,7 @@ let
## Legacy Method: When there is a 401 response code from the authz endpoint redirect to the portal with the 'rd' ## Legacy Method: When there is a 401 response code from the authz endpoint redirect to the portal with the 'rd'
## URL parameter set to $target_url. This requires users update 'auth.example.com/' with their external authelia URL. ## URL parameter set to $target_url. This requires users update 'auth.example.com/' with their external authelia URL.
error_page 401 =302 https://${config.mine.shared.settings.authelia.domain}/?rd=$target_url; error_page 401 =302 https://auth.fricloud.dk/?rd=$target_url;
''; '';
in { in {
mine.shared.lib.authelia.mkProtectedWebsite = { vhostConfig, endpoint ? "/" }: lib.recursiveUpdate vhostConfig { mine.shared.lib.authelia.mkProtectedWebsite = { vhostConfig, endpoint ? "/" }: lib.recursiveUpdate vhostConfig {

19
machines/gerd/services/member-website/default.nix
View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { config, pkgs, ... }:
let let
urlpath = "/members"; urlpath = "/members";
@ -24,21 +24,4 @@ in {
proxyPass = "http://localhost:${builtins.toString port}"; proxyPass = "http://localhost:${builtins.toString port}";
}; };
}; };
mine.shared.meta.website-members = {
name = "Members Website";
description = "This website you are looking at right now, which is our members website.";
url = "https://${config.mine.shared.settings.domain}${urlpath}";
package = {
name = "members-website";
version = "v0.0.1";
meta = with lib; {
description = "Members website for ${mine.shared.settings.domain}";
license = licenses.free;
homepage = "https://git.fricloud.dk/fricloud/server-configs/src/branch/main/machines/gerd/services/member-website/app.py";
platforms = platforms.all;
};
};
};
} }

4
machines/gerd/services/murmur.nix
View file

@ -14,9 +14,7 @@ in {
environmentFile = config.age.secrets.murmur-env.path; environmentFile = config.age.secrets.murmur-env.path;
password = "$MURMUR_PASSWORD"; password = "$MURMUR_PASSWORD";
welcometext = ''Welcome to ${config.mine.shared.settings.brand}s Mumble server! welcometext = "Welcome to Friclouds Mumble server!";
Feel free to join our Teeworlds server while waiting. Credentials can be found on the members website here ${config.mine.shared.meta.website-members.url}.
'';
bandwidth = 130000; bandwidth = 130000;
}; };

6
machines/gerd/services/teeworlds.nix
View file

@ -11,10 +11,10 @@
password = "$TEEWORLDS_PASSWORD"; password = "$TEEWORLDS_PASSWORD";
}; };
mine.shared.meta.teeworlds = rec { mine.shared.meta.teeworlds = {
name = "Teeworlds"; name = "Teeworlds";
description = ''We host our own Teeworlds instance. Connect using `nix-shell -p teeworlds --run 'teeworlds "connect ${url}" "password {{secrets.TEEWORLDS_PASSWORD}}"'`, the password is {{secrets.TEEWORLDS_PASSWORD}}''; description = ''We host our own Teeworlds instance. Connect using `nix-shell -p teeworlds --run 'teeworlds "connect teeworlds.fricloud.dk" "password {{secrets.TEEWORLDS_PASSWORD}}"'`, the password is {{secrets.TEEWORLDS_PASSWORD}}'';
url = "teeworlds.${config.mine.shared.settings.domain}"; url = "";
secrets.auth = config.age.secrets.teeworlds-env.path; secrets.auth = config.age.secrets.teeworlds-env.path;