feat: standardise acme to using `services.skynet."${name}";
` format
This commit is contained in:
parent
023b491d89
commit
449ada5cec
15 changed files with 24 additions and 24 deletions
|
@ -5,12 +5,12 @@
|
|||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.skynet_acme;
|
||||
name = "acme";
|
||||
cfg = config.services.skynet."${name}";
|
||||
in {
|
||||
imports = [];
|
||||
|
||||
options = {
|
||||
skynet_acme = {
|
||||
options.services.skynet."${name}" = {
|
||||
domains = lib.mkOption {
|
||||
default = [];
|
||||
type = lib.types.listOf lib.types.str;
|
||||
|
@ -19,7 +19,7 @@ in {
|
|||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
# group that will own the certificates
|
||||
users.groups.acme = {};
|
||||
|
|
|
@ -35,7 +35,7 @@ in {
|
|||
#backups = [ "/etc/silver_ul_ical/database.db" ];
|
||||
|
||||
# Website config
|
||||
skynet_acme.domains = [
|
||||
services.skynet.acme.domains = [
|
||||
domain
|
||||
];
|
||||
|
||||
|
|
|
@ -55,7 +55,7 @@ in {
|
|||
}
|
||||
];
|
||||
|
||||
skynet_acme.domains = [
|
||||
services.skynet.acme.domains = [
|
||||
"${cfg.domain.sub}.skynet.ie"
|
||||
];
|
||||
|
||||
|
|
|
@ -57,7 +57,7 @@ in {
|
|||
"ip daddr ${cfg.host.ip} tcp dport 25565 counter packets 0 bytes 0 accept"
|
||||
];
|
||||
|
||||
skynet_acme.domains = [
|
||||
services.skynet.acme.domains = [
|
||||
"${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"
|
||||
"*.${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"
|
||||
];
|
||||
|
|
|
@ -99,7 +99,7 @@ in {
|
|||
group = cfg.user;
|
||||
};
|
||||
|
||||
skynet_acme.domains = [
|
||||
services.skynet.acme.domains = [
|
||||
"${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"
|
||||
# Lets Encrypt seems to have a 4 levels limit for certs
|
||||
"*.pages.${cfg.domain.base}.${cfg.domain.tld}"
|
||||
|
|
|
@ -45,7 +45,7 @@ in {
|
|||
}
|
||||
];
|
||||
|
||||
skynet_acme.domains = [
|
||||
services.skynet.acme.domains = [
|
||||
"${name}.skynet.ie"
|
||||
];
|
||||
|
||||
|
|
|
@ -56,7 +56,7 @@ in {
|
|||
age.secrets.ldap_mail.file = ../../secrets/email/details.age;
|
||||
age.secrets.ldap_wolves.file = ../../secrets/wolves/details.age;
|
||||
|
||||
skynet_acme.domains = [
|
||||
services.skynet.acme.domains = [
|
||||
"${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"
|
||||
];
|
||||
|
||||
|
|
|
@ -79,7 +79,7 @@ in {
|
|||
group = "openldap";
|
||||
};
|
||||
|
||||
skynet_acme.domains = [
|
||||
services.skynet.acme.domains = [
|
||||
domain
|
||||
];
|
||||
|
||||
|
|
|
@ -54,7 +54,7 @@ in {
|
|||
group = "nextcloud";
|
||||
};
|
||||
|
||||
skynet_acme.domains = [
|
||||
services.skynet.acme.domains = [
|
||||
domain
|
||||
"onlyoffice.${domain}"
|
||||
];
|
||||
|
|
|
@ -40,7 +40,7 @@ in {
|
|||
};
|
||||
|
||||
config = {
|
||||
skynet_acme.domains = [
|
||||
services.skynet.acme.domains = [
|
||||
"${name}.skynet.ie"
|
||||
];
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@ in {
|
|||
};
|
||||
|
||||
config = {
|
||||
skynet_acme.domains = [
|
||||
services.skynet.acme.domains = [
|
||||
"${name}.skynet.ie"
|
||||
];
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@ in {
|
|||
};
|
||||
|
||||
config = {
|
||||
skynet_acme.domains = [
|
||||
services.skynet.acme.domains = [
|
||||
"${name}.skynet.ie"
|
||||
];
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@ in {
|
|||
};
|
||||
|
||||
config = {
|
||||
skynet_acme.domains = [
|
||||
services.skynet.acme.domains = [
|
||||
# the root one is already covered by teh certificate
|
||||
"2016.skynet.ie"
|
||||
"discord.skynet.ie"
|
||||
|
|
|
@ -38,7 +38,7 @@ in {
|
|||
};
|
||||
|
||||
# Website config
|
||||
skynet_acme.domains = [
|
||||
services.skynet.acme.domains = [
|
||||
"users.skynet.ie"
|
||||
"*.users.skynet.ie"
|
||||
];
|
||||
|
|
|
@ -53,7 +53,7 @@ in {
|
|||
8000
|
||||
];
|
||||
|
||||
skynet_acme.domains = [
|
||||
services.skynet.acme.domains = [
|
||||
"${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"
|
||||
];
|
||||
|
||||
|
|
Loading…
Reference in a new issue