diff --git a/hosts/web-01.cloonar.com/sites/paraclub.cloonar.dev.nix b/hosts/web-01.cloonar.com/sites/paraclub.cloonar.dev.nix index aeb156c..61d862e 100644 --- a/hosts/web-01.cloonar.com/sites/paraclub.cloonar.dev.nix +++ b/hosts/web-01.cloonar.com/sites/paraclub.cloonar.dev.nix @@ -3,7 +3,7 @@ let domain = "paraclub.cloonar.dev"; dataDir = "/var/www/${domain}"; in { - # systemd.services."phpfpm-${domain}".serviceConfig.ProtectHome = lib.mkForce false; + systemd.services."phpfpm-${domain}".serviceConfig.ProtectHome = lib.mkForce false; services.phpfpm.pools."${domain}" = { user = domain; diff --git a/utils/modules/bitwarden/default.nix b/utils/modules/bitwarden/default.nix index 782dc29..7e65f3a 100644 --- a/utils/modules/bitwarden/default.nix +++ b/utils/modules/bitwarden/default.nix @@ -30,9 +30,9 @@ in { ../nur.nix ]; - environment.systemPackages = with pkgs; [ - nur.repos.mic92.vaultwarden_ldap - ]; + # environment.systemPackages = with pkgs; [ + # nur.repos.mic92.vaultwarden_ldap + # ]; services.vaultwarden = { enable = true; @@ -53,27 +53,27 @@ in { EnvironmentFile = [config.sops.secrets.bitwarden-smtp-password.path]; }; - systemd.services.vaultwarden_ldap = { - wantedBy = ["multi-user.target"]; - - preStart = '' - sed \ - -e "s=@LDAP_PASSWORD@=$(<${config.sops.secrets.bitwarden-ldap-password.path})=" \ - -e "s=@ADMIN_TOKEN@=$(<${config.sops.secrets.bitwarden-admin-token.path})=" \ - ${ldapConfigFile} \ - > /run/vaultwarden_ldap/config.toml - ''; - - serviceConfig = { - Restart = "on-failure"; - RestartSec = "2s"; - ExecStart = "${pkgs.nur.repos.mic92.vaultwarden_ldap}/bin/vaultwarden_ldap"; - Environment = "CONFIG_PATH=/run/vaultwarden_ldap/config.toml"; - - RuntimeDirectory = ["vaultwarden_ldap"]; - User = "vaultwarden_ldap"; - }; - }; + # systemd.services.vaultwarden_ldap = { + # wantedBy = ["multi-user.target"]; + # + # preStart = '' + # sed \ + # -e "s=@LDAP_PASSWORD@=$(<${config.sops.secrets.bitwarden-ldap-password.path})=" \ + # -e "s=@ADMIN_TOKEN@=$(<${config.sops.secrets.bitwarden-admin-token.path})=" \ + # ${ldapConfigFile} \ + # > /run/vaultwarden_ldap/config.toml + # ''; + # + # serviceConfig = { + # Restart = "on-failure"; + # RestartSec = "2s"; + # ExecStart = "${pkgs.nur.repos.mic92.vaultwarden_ldap}/bin/vaultwarden_ldap"; + # Environment = "CONFIG_PATH=/run/vaultwarden_ldap/config.toml"; + # + # RuntimeDirectory = ["vaultwarden_ldap"]; + # User = "vaultwarden_ldap"; + # }; + # }; services.nginx.virtualHosts."bitwarden.cloonar.com" = { forceSSL = true;