public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/service.tt-rss: improve pgsql support, do not use static uid/gid

Browse Source
This commit is contained in:
Robin Gloster 2018-01-05 14:17:35 +01:00
parent c26ff43905
commit cfed96ca51
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/misc/ids.nix
View File

@ -301,7 +301,6 @@
pykms = 282; pykms = 282;
kodi = 283; kodi = 283;
restya-board = 284; restya-board = 284;
tt_rss = 285;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@ -571,7 +570,6 @@
pykms = 282; pykms = 282;
kodi = 283; kodi = 283;
restya-board = 284; restya-board = 284;
tt_rss = 285;
# When adding a gid, make sure it doesn't match an existing # When adding a gid, make sure it doesn't match an existing
# uid. Users and groups with the same name should have equal # uid. Users and groups with the same name should have equal

28
nixos/modules/services/web-apps/tt-rss.nix
View File

@ -498,7 +498,7 @@ let
callSql = e: callSql = e:
if cfg.database.type == "pgsql" then '' if cfg.database.type == "pgsql" then ''
${optionalString (cfg.database.password != null) "PGPASSWORD=${cfg.database.password}"} \ ${optionalString (cfg.database.password != null) "PGPASSWORD=${cfg.database.password}"} \
${pkgs.postgresql95}/bin/psql \ ${pkgs.sudo}/bin/sudo -u ${cfg.user} ${config.services.postgresql.package}/bin/psql \
-U ${cfg.database.user} \ -U ${cfg.database.user} \
${optionalString (cfg.database.host != null) "-h ${cfg.database.host} --port ${toString dbPort}"} \ ${optionalString (cfg.database.host != null) "-h ${cfg.database.host} --port ${toString dbPort}"} \
-c '${e}' \ -c '${e}' \
@ -523,6 +523,14 @@ let
'' ''
+ (optionalString (cfg.database.type == "pgsql") '' + (optionalString (cfg.database.type == "pgsql") ''
${optionalString (cfg.database.host == null && cfg.database.password == null) ''
if ! [ -e ${cfg.root}/.db-created ]; then
${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createuser ${cfg.database.user}
${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -O ${cfg.database.user} ${cfg.database.name}
touch ${cfg.root}/.db-created
fi
''}
exists=$(${callSql "select count(*) > 0 from pg_tables where tableowner = user"} \ exists=$(${callSql "select count(*) > 0 from pg_tables where tableowner = user"} \
| tail -n+3 | head -n-2 | sed -e 's/[ \n\t]*//') | tail -n+3 | head -n-2 | sed -e 's/[ \n\t]*//')
@ -559,7 +567,7 @@ let
services.mysql = optionalAttrs (cfg.database.type == "mysql") { services.mysql = optionalAttrs (cfg.database.type == "mysql") {
enable = true; enable = true;
package = mkDefault pkgs.mariadb; package = mkDefault pkgs.mysql;
ensureDatabases = [ cfg.database.name ]; ensureDatabases = [ cfg.database.name ];
ensureUsers = [ ensureUsers = [
{ {
@ -571,17 +579,13 @@ let
]; ];
}; };
users = optionalAttrs (cfg.user == "tt_rss") { services.postgresql = optionalAttrs (cfg.database.type == "pgsql") {
extraUsers = singleton { enable = mkDefault true;
name = "tt_rss";
group = "tt_rss";
uid = config.ids.uids.tt_rss;
};
extraGroups = singleton {
name = "tt_rss";
gid = config.ids.gids.tt_rss;
};
}; };
users = optionalAttrs (cfg.user == "tt_rss") {
extraUsers.tt_rss.group = "tt_rss";
extraGroups.tt_rss = {};
};
}; };
} }