SelfPrivacy
/
selfprivacy-nixos-config
6
3
Fork 7
Code Issues 20 Pull Requests 3 Projects Releases Wiki Activity

users.groups: acmerecievers => acmereceivers

pull/55/head
Alexander Tomokhov 2023-11-29 08:25:24 +04:00
parent 1a5a4be306
commit b6cd5846f2
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files.nix
View File

@ -38,11 +38,11 @@ in
cloudflareCredentials = '' cloudflareCredentials = ''
mkdir -p /var/lib/cloudflare mkdir -p /var/lib/cloudflare
chmod 0440 /var/lib/cloudflare chmod 0440 /var/lib/cloudflare
chown nginx:acmerecievers /var/lib/cloudflare chown nginx:acmereceivers /var/lib/cloudflare
echo '${dnsCredentialsTemplate}' > /var/lib/cloudflare/Credentials.ini echo '${dnsCredentialsTemplate}' > /var/lib/cloudflare/Credentials.ini
${sed} -i "s/REPLACEME/$(cat /etc/selfprivacy/secrets.json | ${jq} -r '.dns.apiKey')/g" /var/lib/cloudflare/Credentials.ini ${sed} -i "s/REPLACEME/$(cat /etc/selfprivacy/secrets.json | ${jq} -r '.dns.apiKey')/g" /var/lib/cloudflare/Credentials.ini
chmod 0440 /var/lib/cloudflare/Credentials.ini chmod 0440 /var/lib/cloudflare/Credentials.ini
chown nginx:acmerecievers /var/lib/cloudflare/Credentials.ini chown nginx:acmereceivers /var/lib/cloudflare/Credentials.ini
''; '';
resticCredentials = '' resticCredentials = ''
mkdir -p /root/.config/rclone mkdir -p /root/.config/rclone

4
letsencrypt/acme.nix
View File

@ -3,7 +3,7 @@ let
cfg = config.selfprivacy; cfg = config.selfprivacy;
in in
{ {
users.groups.acmerecievers = { users.groups.acmereceivers = {
members = [ "nginx" "dovecot2" "postfix" "virtualMail" "ocserv" ]; members = [ "nginx" "dovecot2" "postfix" "virtualMail" "ocserv" ];
}; };
security.acme = { security.acme = {
@ -18,7 +18,7 @@ in
"${cfg.domain}" = { "${cfg.domain}" = {
domain = "*.${cfg.domain}"; domain = "*.${cfg.domain}";
extraDomainNames = [ "${cfg.domain}" ]; extraDomainNames = [ "${cfg.domain}" ];
group = "acmerecievers"; group = "acmereceivers";
dnsProvider = lib.strings.toLower cfg.dns.provider; dnsProvider = lib.strings.toLower cfg.dns.provider;
credentialsFile = "/var/lib/cloudflare/Credentials.ini"; credentialsFile = "/var/lib/cloudflare/Credentials.ini";
}; };

2
vpn/ocserv.nix
View File

@ -9,7 +9,7 @@ in
users.users.ocserv = { users.users.ocserv = {
isNormalUser = false; isNormalUser = false;
isSystemUser = true; isSystemUser = true;
extraGroups = [ "ocserv" "acmerecievers" ]; extraGroups = [ "ocserv" "acmereceivers" ];
group = "ocserv"; group = "ocserv";
}; };
services.ocserv = { services.ocserv = {