Skynet/nixos
6
1
Fork 0
Code Issues 43 Pull requests 1 Projects Releases Packages Wiki Activity Actions

bitwarden: final changes

Browse source
This commit is contained in:
silver 2023-11-16 01:12:09 +00:00
parent 4c0f3a1645
commit 82b0b4aff4
1 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
applications/bitwarden/_bitwarden_sync_module.nix
View file

@ -9,26 +9,6 @@ with lib; let
ldap_data = builtins.toJSON cfg.ldap; ldap_data = builtins.toJSON cfg.ldap;
sync_data = builtins.toJSON cfg.sync; sync_data = builtins.toJSON cfg.sync;
# coping directly from nix https://github.com/NixOS/nixpkgs/blob/da4024d0ead5d7820f6bd15147d3fe2a0c0cec73/nixos/modules/config/nix.nix#L62C1-L76C49
semanticConfType = with types; let
confAtom =
nullOr
(oneOf [
bool
int
float
str
path
package
])
// {
description = "Nix config atom (null, bool, int, float, str, path or package)";
};
in
attrsOf (either confAtom (listOf confAtom));
json_string = string: builtins.replaceStrings ["\""] ["\\\""] string;
in { in {
imports = []; imports = [];
@ -81,7 +61,7 @@ in {
ldap = mkOption { ldap = mkOption {
description = lib.mdDoc "Options to configurate LDAP."; description = lib.mdDoc "Options to configurate LDAP.";
type = types.submodule { type = types.submodule {
freeformType = semanticConfType; freeformType = types.attrsOf (pkgs.formats.json {}).type;
options = { options = {
ssl = mkOption { ssl = mkOption {
@ -144,7 +124,7 @@ in {
sync = mkOption { sync = mkOption {
description = lib.mdDoc "Options to configurate what gets synced."; description = lib.mdDoc "Options to configurate what gets synced.";
type = types.submodule { type = types.submodule {
freeformType = semanticConfType; freeformType = types.attrsOf (pkgs.formats.json {}).type;
options = { options = {
removeDisabled = mkOption { removeDisabled = mkOption {
@ -303,6 +283,9 @@ in {
ExecStartPre = pkgs.writeShellScript "bitwarden_directory_connector-config" '' ExecStartPre = pkgs.writeShellScript "bitwarden_directory_connector-config" ''
# create the config file # create the config file
${cfg.package}/bin/${cfg.binary_name} data-file ${cfg.package}/bin/${cfg.binary_name} data-file
touch -- ${escapeShellArg cfg.directory}/data.json.tmp
chmod 600 ${escapeShellArg cfg.directory}/data.json
chmod 600 -- ${escapeShellArg cfg.directory}/data.json.tmp
${cfg.package}/bin/${cfg.binary_name} config server ${cfg.domain} ${cfg.package}/bin/${cfg.binary_name} config server ${cfg.domain}
@ -326,7 +309,11 @@ in {
${cfg.package}/bin/${cfg.binary_name} config ldap.password --secretenv ${cfg.pw_env} ${cfg.package}/bin/${cfg.binary_name} config ldap.password --secretenv ${cfg.pw_env}
''; '';
ExecStart = ''${cfg.package}/bin/${cfg.binary_name} sync''; ExecStart = "${cfg.package}/bin/${cfg.binary_name} sync";
ExecStartPost = pkgs.writeShellScript "bitwarden_directory_connector-cleanup" ''
rm -f -- ${escapeShellArg cfg.directory}/data.json
'';
EnvironmentFile = [ EnvironmentFile = [
"${cfg.env.ldap}" "${cfg.env.ldap}"