add port to server

This commit is contained in:
Tassilo - 2022-06-14 13:40:36 +02:00
parent b85926a2df
commit 788181e15e
Signed by: revol-xut
GPG Key ID: 4F56FF7759627D07
5 changed files with 42 additions and 30 deletions

View File

@ -5,8 +5,11 @@
{ pkgs, config, lib, ... }:
let
port = 8070;
in
{
in {
imports = [
./postgres.nix
];
systemd = {
services = {
"clicky-bunty-server" = {
@ -35,36 +38,11 @@ in
Restart = "always";
};
};
"pg-dvbdump-setup" = {
description = "prepare dvbdump postgres database";
wantedBy = [ "multi-user.target" ];
after = [ "networking.target" "postgresql.service" ];
serviceConfig.Type = "oneshot";
path = [ pkgs.sudo config.services.postgresql.package ];
script = ''
sudo -u ${config.services.postgresql.superUser} psql -c "ALTER ROLE dvbdump WITH PASSWORD '$(cat ${config.sops.secrets.postgres_password.path})'"
'';
};
};
};
services = {
postgresql = {
port = 5432;
enable = true;
ensureUsers = [
{
name = "dvbdump";
ensurePermissions = {
"DATABASE dvbdump" = "ALL PRIVILEGES";
};
}
];
ensureDatabases = [
"dvbdump"
];
};
nginx = {
enable = true;
recommendedProxySettings = true;

View File

@ -3,6 +3,10 @@
*/
{ pkgs, config, lib, ... }: {
imports = [
./postgres.nix
];
systemd = {
services = {
"data-accumulator" = {

View File

@ -0,0 +1,30 @@
{
services.postgresql = {
port = 5432;
enable = true;
ensureUsers = [
{
name = "dvbdump";
ensurePermissions = {
"DATABASE dvbdump" = "ALL PRIVILEGES";
};
}
];
ensureDatabases = [
"dvbdump"
];
};
systemd."pg-dvbdump-setup" = {
description = "prepare dvbdump postgres database";
wantedBy = [ "multi-user.target" ];
after = [ "networking.target" "postgresql.service" ];
serviceConfig.Type = "oneshot";
path = [ pkgs.sudo config.services.postgresql.package ];
script = ''
sudo -u ${config.services.postgresql.superUser} psql -c "ALTER ROLE dvbdump WITH PASSWORD '$(cat ${config.sops.secrets.postgres_password.path})'"
'';
};
}

View File

@ -44,7 +44,7 @@ in
enable = true;
wantedBy = [ "multi-user.target" ];
script = "exec ${pkgs.telegram-decoder}/bin/telegram-decode --config ${cfg.configFile} --server ${builtins.concatStringsSep " " cfg.server} &";
script = "exec ${pkgs.telegram-decoder}/bin/telegram-decode --config ${cfg.configFile} --server ${(builtins.concatStringsSep " " cfg.server)} &";
environment = {
AUTHENTICATION_TOKEN_PATH = cfg.authTokenFile;

View File

@ -21,7 +21,7 @@ in
};
dump-dvb.services.telegram-decoder = {
enable = true;
server = [ "http://10.13.37.1" "http://10.13.37.5" ];
server = [ "http://10.13.37.1:8080" "http://10.13.37.5:8080" ];
configFile = file;
};
}