commit c284bca5ddbe0b525a315ad2aae9b76e924e9c94 · soopy.moe/gensokyo

+1

systems/kita/certificates/default.nix

···

       1
        
       {...}: {

     

       2
        
         imports = [

     

       3
        
           ./mail.nix

     

       0
        
       
     

       4
        
         ];

     

       5
        
       }

···

       1
        
       {...}: {

     

       2
        
         imports = [

     

       3
        
           ./mail.nix

     

       4
       +
           ./web.nix

     

       5
        
         ];

     

       6
        
       }

+1 -2

systems/kita/certificates/mail.nix

···

       1
        
       {...}: {

     

       2
       -
         security.acme.certs."mx-nbg.c.soopy.moe" = {

     

       3
        
           extraLegoRenewFlags = [

     

       4
        
             "--reuse-key"

     

       5
        
           ];

     

       6
        
           group = "nginx";

     

       7
        
           extraDomainNames = [

     

       8
        
             "mx2.soopy.moe"

     

       9
       -
             "dav.soopy.moe"

     

       10
        
           ];

     

       11
        
         };

     

       12
        
       }

···

       1
        
       {...}: {

     

       2
       +
         security.acme.certs."kita.c.soopy.moe" = {

     

       3
        
           extraLegoRenewFlags = [

     

       4
        
             "--reuse-key"

     

       5
        
           ];

     

       6
        
           group = "nginx";

     

       7
        
           extraDomainNames = [

     

       8
        
             "mx2.soopy.moe"

     

       0
        
       
     

       9
        
           ];

     

       10
        
         };

     

       11
        
       }

+10

systems/kita/certificates/web.nix

···

       1
       +
       {...}: {

     

       2
       +
         security.acme.certs."kita-web.c.soopy.moe" = {

     

       3
       +
           group = "nginx";

     

       4
       +
           extraDomainNames = [

     

       5
       +
             "kita.soopy.moe"

     

       6
       +
             "dav.soopy.moe"

     

       7
       +
             "webmail.soopy.moe"

     

       8
       +
           ];

     

       9
       +
         };

     

       10
       +
       }

+1 -1

systems/kita/services/fallback_page/default.nix

···

       4
        
         ...

     

       5
        
       }: {

     

       6
        
         services.nginx.virtualHosts."_" = _utils.mkVhost {

     

       7
       -
           useACMEHost = "mx-nbg.c.soopy.moe";

     

       8
        
           default = true;

     

       9
        
       

     

       10
        
           locations."/" = {

···

       4
        
         ...

     

       5
        
       }: {

     

       6
        
         services.nginx.virtualHosts."_" = _utils.mkVhost {

     

       7
       +
           useACMEHost = "kita-web.c.soopy.moe";

     

       8
        
           default = true;

     

       9
        
       

     

       10
        
           locations."/" = {