mirror of
https://github.com/Gerg-L/nixos.git
synced 2025-12-10 00:43:56 -05:00
re-add builder users shell
formatting
This commit is contained in:
parent
65638ecb1c
commit
71d799541f
3 changed files with 6 additions and 11 deletions
|
|
@ -1,11 +1,11 @@
|
||||||
{ lib, config }:
|
{ config }:
|
||||||
{
|
{
|
||||||
users = {
|
users = {
|
||||||
groups.${config.services.forgejo.group} = { };
|
groups.${config.services.forgejo.group} = { };
|
||||||
users = {
|
users = {
|
||||||
${config.services.forgejo.user} = {
|
${config.services.forgejo.user} = {
|
||||||
isSystemUser = true;
|
isSystemUser = true;
|
||||||
group = config.services.forgejo.group;
|
inherit (config.services.forgejo) group;
|
||||||
extraGroups = [ "postgres" ];
|
extraGroups = [ "postgres" ];
|
||||||
openssh.authorizedKeys.keys = [ config.local.keys.gerg_gerg-desktop ];
|
openssh.authorizedKeys.keys = [ config.local.keys.gerg_gerg-desktop ];
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -8,12 +8,12 @@
|
||||||
nix-serve = { };
|
nix-serve = { };
|
||||||
};
|
};
|
||||||
users = {
|
users = {
|
||||||
|
|
||||||
${config.services.nginx.user}.extraGroups = [ "nix-serve" ];
|
${config.services.nginx.user}.extraGroups = [ "nix-serve" ];
|
||||||
builder = {
|
builder = {
|
||||||
isSystemUser = true;
|
isSystemUser = true;
|
||||||
openssh.authorizedKeys.keys = [ config.local.keys.root_media-laptop ];
|
openssh.authorizedKeys.keys = [ config.local.keys.root_media-laptop ];
|
||||||
group = "builder";
|
group = "builder";
|
||||||
|
shell = pkgs.bashInteractive;
|
||||||
};
|
};
|
||||||
nix-serve = {
|
nix-serve = {
|
||||||
isSystemUser = true;
|
isSystemUser = true;
|
||||||
|
|
@ -33,10 +33,7 @@
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nix.settings = {
|
nix.settings = {
|
||||||
trusted-users = [
|
trusted-users = [ "builder" ];
|
||||||
"builder"
|
|
||||||
"nix-ssh"
|
|
||||||
];
|
|
||||||
allowed-users = [ "nix-serve" ];
|
allowed-users = [ "nix-serve" ];
|
||||||
keep-outputs = true;
|
keep-outputs = true;
|
||||||
keep-derivations = true;
|
keep-derivations = true;
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,11 @@
|
||||||
{ config, pkgs }:
|
{ pkgs }:
|
||||||
{
|
{
|
||||||
services.postgresql = {
|
services.postgresql = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.postgresql_13;
|
package = pkgs.postgresql_13;
|
||||||
dataDir = "/persist/services/postgresql";
|
dataDir = "/persist/services/postgresql";
|
||||||
|
|
||||||
ensureDatabases = [
|
ensureDatabases = [ "miniflux" ];
|
||||||
"miniflux"
|
|
||||||
];
|
|
||||||
ensureUsers = [
|
ensureUsers = [
|
||||||
{
|
{
|
||||||
name = "miniflux";
|
name = "miniflux";
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue