remove remaining references to glauth
parent
49df89c466
commit
7700905647
14
flake.nix
14
flake.nix
|
@ -9,18 +9,9 @@
|
|||
url = "github:juanfont/headscale/v0.23.0-alpha2";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
glauth = {
|
||||
url = "github:leroycep/glauth";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
glauth-sqlite = {
|
||||
url = "github:leroycep/glauth-sqlite";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, agenix, juanfont-headscale, glauth, glauth-sqlite }: {
|
||||
outputs = { self, nixpkgs, agenix, juanfont-headscale }: {
|
||||
packages.x86_64-linux = let pkgs = import nixpkgs { system = "x86_64-linux"; }; in rec {
|
||||
cockpit-tailscale = pkgs.callPackage ./pkgs/cockpit-tailscale.nix {};
|
||||
cockpit-zfs-manager = pkgs.callPackage ./pkgs/cockpit-zfs-manager.nix {};
|
||||
|
@ -32,15 +23,12 @@
|
|||
({config, pkgs, ...}: {
|
||||
nixpkgs.overlays = [ (final: prev: {
|
||||
juanfont-headscale = juanfont-headscale.packages.${prev.system};
|
||||
glauth = glauth.packages.${prev.system}.glauth.v2;
|
||||
glauth-sqlite = glauth-sqlite.packages.${prev.system}.glauth-sqlite;
|
||||
cockpit-tailscale = self.packages.${prev.system}.cockpit-tailscale;
|
||||
cockpit-zfs-manager = self.packages.${prev.system}.cockpit-zfs-manager;
|
||||
})];
|
||||
})
|
||||
./agenix-config-module.nix
|
||||
./configuration.nix
|
||||
./services/glauth.nix
|
||||
./services/komga.nix
|
||||
agenix.nixosModules.default
|
||||
];
|
||||
|
|
|
@ -1,79 +0,0 @@
|
|||
{config, pkgs, lib, ...}:
|
||||
let
|
||||
cfg = config.services.glauth;
|
||||
settingsFormat = pkgs.formats.toml {};
|
||||
in
|
||||
|
||||
with lib;
|
||||
|
||||
{
|
||||
options = {
|
||||
services.glauth = {
|
||||
enable = mkOption {
|
||||
default = false;
|
||||
type = with types; bool;
|
||||
description = ''
|
||||
Enable the glauth system service
|
||||
'';
|
||||
};
|
||||
|
||||
package = mkPackageOption pkgs "glauth" { };
|
||||
|
||||
dataDir = mkOption {
|
||||
type = types.path;
|
||||
default = "/var/lib/glauth";
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
default = "glauth";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Name of the user.
|
||||
'';
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
default = "glauth";
|
||||
type = types.str;
|
||||
description = ''
|
||||
Name of the group.
|
||||
'';
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
type = settingsFormat.type;
|
||||
default = {};
|
||||
description = ''
|
||||
Configuration for glauth.cfg, see
|
||||
<link xlink:href="https://github.com/glauth/glauth/blob/master/v2/sample-simple.cfg"
|
||||
for supported settings.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
# Add user for glauth
|
||||
users.users."${cfg.user}" = {
|
||||
isSystemUser = true;
|
||||
group = cfg.group;
|
||||
home = cfg.dataDir;
|
||||
};
|
||||
users.groups."${cfg.group}" = {};
|
||||
|
||||
# Add systemd service
|
||||
systemd.services.glauth = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
description = "Start a glauth server.";
|
||||
serviceConfig = {
|
||||
Type = "exec";
|
||||
User = "${cfg.user}";
|
||||
Group = "${cfg.group}";
|
||||
ExecStart = ''${cfg.package}/bin/glauth -c ${settingsFormat.generate "glauth.cfg" cfg.settings}'';
|
||||
StateDirectory = mkIf (cfg.dataDir == "/var/lib/glauth") [ "glauth" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
Loading…
Reference in New Issue