zoey/zoeys.computer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

changess...

Browse source
This commit is contained in:
zack 2024-10-21 20:37:53 -04:00
parent 52506df236
commit f4ef07084b
No known key found for this signature in database
GPG key ID: 5F873416BCF59F35
1 changed files with 37 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

55
flake.nix
View file

@ -78,7 +78,7 @@
database = { database = {
name = mkOption rec { name = mkOption rec {
type = types.str; type = types.str;
default = "zoeyscomputer_prod"; default = "zoeyscomputer";
example = default; example = default;
description = "Database name"; description = "Database name";
}; };
@ -118,26 +118,50 @@
locations."/".proxyPass = "http://127.0.0.1:${toString cfg.phx.port}"; locations."/".proxyPass = "http://127.0.0.1:${toString cfg.phx.port}";
}; };
# Create a oneshot service to set up the database user with password
systemd.services.init-zoeyscomputer-db = {
description = "Initialize ZoeysComputer Database User";
wantedBy = ["multi-user.target"];
after = ["postgresql.service"];
before = ["zoeyscomputer.service"];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
User = config.services.postgresql.superUser;
};
script = ''
${optionalString (cfg.phx.database.passwordFile != null) ''
# Read password from file
PASSWORD=$(cat ${cfg.phx.database.passwordFile})
# Check if user exists
if ! psql -tAc "SELECT 1 FROM pg_roles WHERE rolname='${cfg.phx.database.user}'" | grep -q 1; then
# Create user with password if it doesn't exist
psql -c "CREATE USER ${cfg.phx.database.user} WITH PASSWORD '$PASSWORD'"
else
# Update password if user exists
psql -c "ALTER USER ${cfg.phx.database.user} WITH PASSWORD '$PASSWORD'"
fi
# Ensure user has access to database
psql -c "GRANT ALL PRIVILEGES ON DATABASE ${cfg.phx.database.name} TO ${cfg.phx.database.user}"
''}
'';
path = [config.services.postgresql.package];
};
# Ensure database exists # Ensure database exists
services.postgresql.ensureDatabases = [ services.postgresql.ensureDatabases = [
cfg.phx.database.name cfg.phx.database.name
]; ];
# Ensure database user exists
services.postgresql.ensureUsers = [
{
name = cfg.phx.database.user;
ensureDBOwnership = true;
}
];
systemd.services."zoeyscomputer-phx" = let systemd.services."zoeyscomputer-phx" = let
release_name = "zoeyscomputer"; release_name = "zoeyscomputer";
working_directory = "/var/lib/zoeycomputer"; working_directory = "/var/lib/zoeycomputer";
in { in {
wantedBy = ["multi-user.target"]; wantedBy = ["multi-user.target"];
after = ["network.target" "postgresql.service"]; after = ["network.target" "postgresql.service" "init-zoeyscomputer-db.service"];
requires = ["network-online.target" "postgresql.service"]; requires = ["network-online.target" "postgresql.service" "init-zoeyscomputer-db.service"];
description = "zoey computer"; description = "zoey computer";
environment = { environment = {
RELEASE_TMP = working_directory; RELEASE_TMP = working_directory;
@ -145,14 +169,9 @@
PHX_HOST = cfg.domain; PHX_HOST = cfg.domain;
PHX_SERVER = toString cfg.phx.enableServer; PHX_SERVER = toString cfg.phx.enableServer;
}; };
preStart = optionalString (cfg.phx.database.passwordFile != null) ''
# Set the password for the database user
export PGPASSWORD=$(cat ${cfg.phx.database.passwordFile})
echo "ALTER USER ${cfg.phx.database.user} WITH PASSWORD '$PGPASSWORD'" | \
runuser -u ${config.services.postgresql.superUser} -- ${config.services.postgresql.package}/bin/psql
'';
serviceConfig = { serviceConfig = {
Type = "exec"; Type = "exec";
User = "zoeycomputer-phx";
DynamicUser = true; DynamicUser = true;
WorkingDirectory = working_directory; WorkingDirectory = working_directory;
PrivateTmp = true; PrivateTmp = true;
@ -186,7 +205,7 @@
StartLimitBurst = 3; StartLimitBurst = 3;
StartLimitInterval = 10; StartLimitInterval = 10;
}; };
path = with pkgs; [bash util-linux]; path = [pkgs.bash];
}; };
}; };
}; };