course-phil: on-metal fixes
This commit is contained in:
parent
a5d29c3338
commit
3c17c0ad6a
|
@ -22,6 +22,7 @@
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
quitte = nixpkgs.lib.nixosSystem {
|
quitte = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
specialArgs = inputs;
|
||||||
modules = [
|
modules = [
|
||||||
inputs.sops-nix.nixosModules.sops
|
inputs.sops-nix.nixosModules.sops
|
||||||
inputs.kpp.nixosModules.default
|
inputs.kpp.nixosModules.default
|
||||||
|
@ -53,6 +54,7 @@
|
||||||
./modules/website.nix
|
./modules/website.nix
|
||||||
./modules/zsh.nix
|
./modules/zsh.nix
|
||||||
./modules/course-management.nix
|
./modules/course-management.nix
|
||||||
|
./modules/courses-phil.nix
|
||||||
./modules/gitea.nix
|
./modules/gitea.nix
|
||||||
{
|
{
|
||||||
sops.defaultSopsFile = ./secrets/quitte.yaml;
|
sops.defaultSopsFile = ./secrets/quitte.yaml;
|
||||||
|
|
|
@ -1,22 +1,42 @@
|
||||||
{ config, lib, ... }:
|
{ config, lib, sops-nix, course-management, ... }:
|
||||||
let
|
let
|
||||||
hostName = "phil.${config.networking.domain}";
|
hostName = "phil.${config.networking.domain}";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
services.nginx.virtualHosts."${hostName}" = {
|
||||||
|
locations."/".proxyPass = "http://127.0.0.1:8084";
|
||||||
|
enableACME = true;
|
||||||
|
forceSSL = true;
|
||||||
|
};
|
||||||
|
|
||||||
containers."courses-phil".config = {
|
containers."courses-phil" = {
|
||||||
|
autoStart = true;
|
||||||
|
# forbidden sadly, I will copy the keys manually. Not very beautiful but it works
|
||||||
|
# bindMounts = {
|
||||||
|
# hostPath = "/etc/ssh";
|
||||||
|
# mountPoint = "/etc/ssh";
|
||||||
|
# };
|
||||||
|
config = { pkgs, config, ... }: {
|
||||||
|
networking.domain = "ifsr.de";
|
||||||
|
imports = [
|
||||||
|
sops-nix.nixosModules.sops
|
||||||
|
course-management.nixosModules.default
|
||||||
|
];
|
||||||
|
sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
||||||
|
sops.age.generateKey = false;
|
||||||
sops.defaultSopsFile = ../secrets/quitte.yaml;
|
sops.defaultSopsFile = ../secrets/quitte.yaml;
|
||||||
sops.secrets =
|
sops.secrets =
|
||||||
let inherit (config.services.course-management) user;
|
let inherit (config.services.course-management) user;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
"course-management/secret-key".owner = user;
|
"course-management-phil/secret-key".owner = user;
|
||||||
"course-management/adminpass".owner = user;
|
"course-management-phil/adminpass".owner = user;
|
||||||
};
|
};
|
||||||
systemd.services.course-management.after = [ "postgresql.service" ];
|
systemd.services.course-management.after = [ "postgresql.service" ];
|
||||||
services.course-management = {
|
services.course-management = {
|
||||||
inherit hostName;
|
inherit hostName;
|
||||||
enable = true;
|
enable = true;
|
||||||
|
listenPort = 5001;
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
secretKeyFile = config.sops.secrets."course-management-phil/secret-key".path;
|
secretKeyFile = config.sops.secrets."course-management-phil/secret-key".path;
|
||||||
|
@ -35,8 +55,16 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
security.acme = {
|
||||||
|
acceptTerms = true;
|
||||||
|
defaults = {
|
||||||
|
email = "root@${config.networking.domain}";
|
||||||
|
};
|
||||||
|
};
|
||||||
services.postgresql = {
|
services.postgresql = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
enableTCPIP = lib.mkForce false;
|
||||||
|
# port = 55555;
|
||||||
ensureUsers = [{
|
ensureUsers = [{
|
||||||
name = "course-management";
|
name = "course-management";
|
||||||
ensurePermissions = {
|
ensurePermissions = {
|
||||||
|
@ -45,10 +73,23 @@ in
|
||||||
}];
|
}];
|
||||||
ensureDatabases = [ "course-management" ];
|
ensureDatabases = [ "course-management" ];
|
||||||
};
|
};
|
||||||
services.nginx.virtualHosts.${hostName} = {
|
systemd.services.postgresql.serviceConfig.ExecStart = lib.mkForce "${pkgs.postgresql}/bin/postgres -c listen_addresses=''";
|
||||||
enableACME = true;
|
services.nginx = {
|
||||||
forceSSL = true;
|
enable = true;
|
||||||
|
recommendedProxySettings = true;
|
||||||
|
recommendedGzipSettings = true;
|
||||||
|
recommendedOptimisation = true;
|
||||||
|
recommendedTlsSettings = true;
|
||||||
|
|
||||||
|
|
||||||
|
virtualHosts.${hostName} = {
|
||||||
|
listen = [{
|
||||||
|
addr = "127.0.0.1";
|
||||||
|
port = 8084;
|
||||||
|
}];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
2
test.sh
Normal file
2
test.sh
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
ldapsearch -o ldif-wrap=no -x -D "uid=search,ou=users,dc=ifsr,dc=de" -w $(cat /run/secrets/portunus/search-password) '(&(objectClass=posixAccount)(uid='rouven.seifert'))' 'sshPublicKey' -b "ou=users,dc=ifsr,dc=de" \
|
||||||
|
| awk '/^sshPublicKey/{$1=""; p=1} /^$/{p=0} {printf p?$0:""}'
|
Loading…
Reference in a new issue