diff --git a/configuration.nix b/configuration.nix index 82e7c08..fbb1675 100644 --- a/configuration.nix +++ b/configuration.nix @@ -32,6 +32,12 @@ autoUpgrade = { enable = true; allowReboot = true; + flags = [ + "--max-jobs" + "1" + "--builders" + "''" + ]; }; }; diff --git a/services/enabled.nix b/services/enabled.nix index 6564a05..0eaefa5 100644 --- a/services/enabled.nix +++ b/services/enabled.nix @@ -12,12 +12,12 @@ ./nextcloud.nix # ./news2kindle.nix ./resilio.nix - ./sks.nix +# ./sks.nix ./gitea.nix ./nexus.nix - ./wireguard.nix +# ./wireguard.nix #./mqtt.nix - ./jitsi.nix +# ./jitsi.nix ./docker.nix ./mailcow.nix ]; diff --git a/services/mailcow.nix b/services/mailcow.nix index 6f89d01..ea0a159 100644 --- a/services/mailcow.nix +++ b/services/mailcow.nix @@ -4,11 +4,13 @@ services.nginx.virtualHosts."mailcow.stubbe.rocks" = { enableACME = true; forceSSL = true; + default = true; locations."/".proxyPass = "http://localhost:7080"; serverName = "v22017115146555724.happysrv.de"; serverAliases = [ "testmail.stubbe.rocks" "mailcow.stubbe.rocks" + "stubbe.rocks" # "autodiscover.testmail.stubbe.rocks" # "autoconfig.testmail.stubbe.rocks" # "autodiscover.mailcow.stubbe.rocks" @@ -22,11 +24,11 @@ security.acme.certs."v22017115146555724.happysrv.de".postRun = '' cp chain.pem /opt/mailcow-dockerized/data/assets/ssl/chain.pem ''; -# services.nginx.virtualHosts."testmail.stubbe.rocks" = { -# enableACME = true; -# forceSSL = true; -# locations."/".proxyPass = "http://localhost:7080"; -# }; +#services.nginx.virtualHosts."webmail.stubbe.rocks" = { +# enableACME = true; +# forceSSL = true; +# locations."/".proxyPass = "http://localhost:7080/SOGo/"; +#}; systemd = { timers.mailcow-update = { @@ -46,6 +48,7 @@ security.acme.certs."v22017115146555724.happysrv.de".postRun = '' pkgs.coreutils-full pkgs.unixtools.ping pkgs.iptables + pkgs.openssl ]; serviceConfig.Type = "oneshot"; script = '' diff --git a/users.nix b/users.nix index c36f91b..328dd8c 100644 --- a/users.nix +++ b/users.nix @@ -16,10 +16,10 @@ in users = { defaultUserShell = pkgs.zsh; - extraUsers.etherpad = myPublicSshKeys // { isNormalUser = true; home = "/home/etherpad";}; +# extraUsers.etherpad = myPublicSshKeys // { isNormalUser = true; home = "/home/etherpad";}; extraUsers.sshuser = myPublicSshKeys // { isNormalUser = true; home = "/home/sshuser";}; extraUsers.nextcloud = myPublicSshKeys // { isSystemUser = true; home = "/home/nextcloud"; createHome= true; group = "nextcloud";}; - extraUsers.ledebuild = myPublicSshKeys // { isNormalUser = true; home = "/home/ledebuild"; extraGroups = [ "docker" ];}; +# extraUsers.ledebuild = myPublicSshKeys // { isNormalUser = true; home = "/home/ledebuild"; extraGroups = [ "docker" ];}; # extraUsers.gitea = myPublicSshKeys // { isNormalUser = true; home = "/home/gitea"; }; extraGroups.nexdcloud.name = "nextcloud"; };