Compare commits
1 commit
c0870ccac3
...
2d886def6c
| Author | SHA1 | Date | |
|---|---|---|---|
| 2d886def6c |
12 changed files with 89 additions and 112 deletions
11
.github/workflows/deploy.yml
vendored
11
.github/workflows/deploy.yml
vendored
|
|
@ -1,11 +1,6 @@
|
|||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
on: [push]
|
||||
jobs:
|
||||
build:
|
||||
test:
|
||||
runs-on: nixos-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- run: nix develop
|
||||
- run: colmena build -v --on @fili
|
||||
- run: echo All good!
|
||||
|
|
|
|||
7
.github/workflows/lint.yml
vendored
7
.github/workflows/lint.yml
vendored
|
|
@ -1,7 +0,0 @@
|
|||
on: [push]
|
||||
jobs:
|
||||
lint:
|
||||
runs-on: nixos-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- run: nix fmt -- --check .
|
||||
|
|
@ -16,6 +16,7 @@ _: {
|
|||
networkmanager.enable = true;
|
||||
};
|
||||
|
||||
|
||||
nix.settings = {
|
||||
# users that can interact with nix
|
||||
trusted-users = [
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ baseUrl, clientId }:
|
||||
{
|
||||
{ baseUrl, clientId }: {
|
||||
inherit clientId;
|
||||
|
||||
userAuthUrl = "${baseUrl}/ui/oauth2";
|
||||
|
|
|
|||
|
|
@ -1,11 +1,9 @@
|
|||
{ pkgs, config, ... }:
|
||||
let
|
||||
{pkgs, config, ...}: let
|
||||
lib = pkgs.lib;
|
||||
domain = "auth.donsz.nl";
|
||||
port = 3013;
|
||||
backupsDir = "/var/lib/kanidm/backup";
|
||||
in
|
||||
{
|
||||
in {
|
||||
services.kanidm.enableServer = true;
|
||||
services.kanidm.package = pkgs.kanidm_1_6;
|
||||
services.kanidm.serverSettings = {
|
||||
|
|
@ -28,7 +26,8 @@ in
|
|||
mkdir -p "${backupsDir}"
|
||||
'';
|
||||
serviceConfig = {
|
||||
SupplementaryGroups = [ config.security.acme.certs.${domain}.group ];
|
||||
SupplementaryGroups =
|
||||
[ config.security.acme.certs.${domain}.group ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +1,12 @@
|
|||
{ pkgs, config, ... }:
|
||||
{
|
||||
{pkgs, config, ...}: {
|
||||
sops.secrets.oauth2-proxy = {
|
||||
sopsFile = ../../../secrets/oauth2-proxy.env;
|
||||
};
|
||||
|
||||
services.oauth2-proxy =
|
||||
let
|
||||
auth = import ../../lib/auth.nix {
|
||||
baseUrl = "https://auth.donsz.nl";
|
||||
clientId = "homeserver";
|
||||
};
|
||||
in
|
||||
{
|
||||
auth = import ../../lib/auth.nix { baseUrl = "https://auth.donsz.nl"; clientId = "homeserver"; };
|
||||
in {
|
||||
enable = true;
|
||||
|
||||
provider = "oidc";
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{ lib, pkgs, config, ... }:
|
||||
let
|
||||
cfg = config.services.forgejo;
|
||||
srv = cfg.settings.server;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ pkgs, config, ... }:
|
||||
{
|
||||
{pkgs, config, ...}: {
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
statusPage = true;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ flakes, pkgs, ... }:
|
||||
{
|
||||
{flakes, pkgs, ...}: {
|
||||
services.nginx = {
|
||||
virtualHosts."donsz.nl" = {
|
||||
forceSSL = true;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ flakes, ... }:
|
||||
{
|
||||
{flakes,...}: {
|
||||
# imports = [
|
||||
# flakes.mapf.nixosModules.default
|
||||
# ];
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
{ flakes, pkgs,... }:
|
||||
let
|
||||
totpal = flakes.totpal.packages.${pkgs.system}.default;
|
||||
totpal =
|
||||
flakes.totpal.packages.${pkgs.system}.default
|
||||
;
|
||||
in
|
||||
{
|
||||
services.nginx = {
|
||||
|
|
@ -15,7 +17,8 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
systemd.services.totpal = {
|
||||
systemd.services.totpal =
|
||||
{
|
||||
description = "totpal";
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue