remove vaultwarden ldap
This commit is contained in:
@@ -3,7 +3,7 @@ let
|
|||||||
domain = "paraclub.cloonar.dev";
|
domain = "paraclub.cloonar.dev";
|
||||||
dataDir = "/var/www/${domain}";
|
dataDir = "/var/www/${domain}";
|
||||||
in {
|
in {
|
||||||
# systemd.services."phpfpm-${domain}".serviceConfig.ProtectHome = lib.mkForce false;
|
systemd.services."phpfpm-${domain}".serviceConfig.ProtectHome = lib.mkForce false;
|
||||||
|
|
||||||
services.phpfpm.pools."${domain}" = {
|
services.phpfpm.pools."${domain}" = {
|
||||||
user = domain;
|
user = domain;
|
||||||
|
|||||||
@@ -30,9 +30,9 @@ in {
|
|||||||
../nur.nix
|
../nur.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
# environment.systemPackages = with pkgs; [
|
||||||
nur.repos.mic92.vaultwarden_ldap
|
# nur.repos.mic92.vaultwarden_ldap
|
||||||
];
|
# ];
|
||||||
|
|
||||||
services.vaultwarden = {
|
services.vaultwarden = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -53,27 +53,27 @@ in {
|
|||||||
EnvironmentFile = [config.sops.secrets.bitwarden-smtp-password.path];
|
EnvironmentFile = [config.sops.secrets.bitwarden-smtp-password.path];
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.services.vaultwarden_ldap = {
|
# systemd.services.vaultwarden_ldap = {
|
||||||
wantedBy = ["multi-user.target"];
|
# wantedBy = ["multi-user.target"];
|
||||||
|
#
|
||||||
preStart = ''
|
# preStart = ''
|
||||||
sed \
|
# sed \
|
||||||
-e "s=@LDAP_PASSWORD@=$(<${config.sops.secrets.bitwarden-ldap-password.path})=" \
|
# -e "s=@LDAP_PASSWORD@=$(<${config.sops.secrets.bitwarden-ldap-password.path})=" \
|
||||||
-e "s=@ADMIN_TOKEN@=$(<${config.sops.secrets.bitwarden-admin-token.path})=" \
|
# -e "s=@ADMIN_TOKEN@=$(<${config.sops.secrets.bitwarden-admin-token.path})=" \
|
||||||
${ldapConfigFile} \
|
# ${ldapConfigFile} \
|
||||||
> /run/vaultwarden_ldap/config.toml
|
# > /run/vaultwarden_ldap/config.toml
|
||||||
'';
|
# '';
|
||||||
|
#
|
||||||
serviceConfig = {
|
# serviceConfig = {
|
||||||
Restart = "on-failure";
|
# Restart = "on-failure";
|
||||||
RestartSec = "2s";
|
# RestartSec = "2s";
|
||||||
ExecStart = "${pkgs.nur.repos.mic92.vaultwarden_ldap}/bin/vaultwarden_ldap";
|
# ExecStart = "${pkgs.nur.repos.mic92.vaultwarden_ldap}/bin/vaultwarden_ldap";
|
||||||
Environment = "CONFIG_PATH=/run/vaultwarden_ldap/config.toml";
|
# Environment = "CONFIG_PATH=/run/vaultwarden_ldap/config.toml";
|
||||||
|
#
|
||||||
RuntimeDirectory = ["vaultwarden_ldap"];
|
# RuntimeDirectory = ["vaultwarden_ldap"];
|
||||||
User = "vaultwarden_ldap";
|
# User = "vaultwarden_ldap";
|
||||||
};
|
# };
|
||||||
};
|
# };
|
||||||
|
|
||||||
services.nginx.virtualHosts."bitwarden.cloonar.com" = {
|
services.nginx.virtualHosts."bitwarden.cloonar.com" = {
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user