chore(nginx): rename listenPorts

This commit is contained in:
arcnmx 2024-03-23 11:44:48 -07:00
parent 1d1dc64ef5
commit 8695e2cdb9
6 changed files with 10 additions and 13 deletions

View file

@ -62,9 +62,6 @@
in mapAttrs (_: mkAlmostOptionDefault) listenAttrs;
mkListens = listen: map (mkListen listen) listen.addresses;
in {
imports = [
(mkRenamedOptionModule [ "listenPorts" ] [ "listen'" ])
];
options = with lib.types; {
listen' = mkOption {
type = attrsOf (submoduleWith {

View file

@ -10,7 +10,7 @@
inherit (config.services) nginx;
access = nginx.access.freepbx;
freepbx = config.lib.access.systemFor "freepbx";
hasSsl = nginx.virtualHosts.freepbx'ucp.listenPorts.ucpSsl.enable;
hasSsl = nginx.virtualHosts.freepbx'ucp.listen'.ucpSsl.enable;
in {
options.services.nginx.access.freepbx = with lib.types; {
host = mkOption {
@ -80,7 +80,7 @@ in {
freepbx'ucp = {
serverName = mkDefault nginx.virtualHosts.freepbx.serverName;
ssl.cert.copyFromVhost = "freepbx";
listenPorts = {
listen' = {
ucp = {
port = access.ucpPort;
extraParameters = [ "default_server" ];
@ -100,7 +100,7 @@ in {
inherit extraConfig kTLS;
};
freepbx'local = {
listenPorts = {
listen' = {
http = { };
https.ssl = true;
ucp = {

View file

@ -6,7 +6,7 @@
inherit (lib.modules) mkIf mkDefault;
inherit (config.services) home-assistant nginx;
name.shortServer = mkDefault "home";
listenPorts = {
listen' = {
http = { };
https.ssl = true;
hass = {
@ -30,7 +30,7 @@ in {
};
};
home-assistant'local = {
inherit name listenPorts;
inherit name listen';
ssl.cert.copyFromVhost = "home-assistant";
local.enable = mkDefault true;
locations."/" = {

View file

@ -51,7 +51,7 @@ in {
inherit extraConfig;
};
};
listenPorts = {
listen' = {
http = { };
https.ssl = true;
stream.port = mkDefault access.streamPort;
@ -60,11 +60,11 @@ in {
kTLS = mkDefault true;
in {
kitchencam = {
inherit name locations listenPorts kTLS;
inherit name locations listen' kTLS;
vouch.enable = true;
};
kitchencam'local = {
inherit name locations listenPorts kTLS;
inherit name locations listen' kTLS;
ssl.cert.copyFromVhost = "kitchencam";
local.enable = true;
};

View file

@ -52,7 +52,7 @@ in {
in {
plex = {
inherit name locations extraConfig kTLS;
listenPorts = {
listen' = {
http = { };
https.ssl = true;
external = {

View file

@ -40,7 +40,7 @@ in {
kTLS = mkDefault true;
in {
unifi'management = mkIf access.global.management {
listenPorts.management = {
listen'.management = {
port = access.managementPort;
ssl = true;
extraParameters = [ "default_server" ];