colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #198298 from yorickvP/int-rm-leading-zeroes

Browse Source
This commit is contained in:
Martin Weinelt 2022-10-29 12:37:51 +02:00 committed by GitHub
commit f3c660e95b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/security/acme/default.nix
View File

@ -26,8 +26,8 @@ let
Type = "oneshot";
User = user;
Group = mkDefault "acme";
UMask = 0022;
StateDirectoryMode = 750;
UMask = "0022";
StateDirectoryMode = "750";
ProtectSystem = "strict";
ReadWritePaths = [
"/var/lib/acme"
@ -85,7 +85,7 @@ let
serviceConfig = commonServiceConfig // {
StateDirectory = "acme/.minica";
BindPaths = "/var/lib/acme/.minica:/tmp/ca";
UMask = 0077;
UMask = "0077";
};
# Working directory will be /tmp
@ -243,7 +243,7 @@ let
serviceConfig = commonServiceConfig // {
Group = data.group;
UMask = 0027;
UMask = "0027";
StateDirectory = "acme/${cert}";

2
nixos/modules/services/logging/journalwatch.nix
View File

@ -239,7 +239,7 @@ in {
Type = "oneshot";
# requires a relative directory name to create beneath /var/lib
StateDirectory = user;
StateDirectoryMode = 0750;
StateDirectoryMode = "0750";
ExecStart = "${pkgs.python3Packages.journalwatch}/bin/journalwatch mail";
# lowest CPU and IO priority, but both still in best-effort class to prevent starvation
Nice=19;

2
nixos/modules/services/matrix/appservice-discord.nix
View File

@ -137,7 +137,7 @@ in {
PrivateTmp = true;
WorkingDirectory = appDir;
StateDirectory = baseNameOf dataDir;
UMask = 0027;
UMask = "0027";
EnvironmentFile = cfg.environmentFile;
ExecStart = ''

2
nixos/modules/services/matrix/mautrix-telegram.nix
View File

@ -162,7 +162,7 @@ in {
PrivateTmp = true;
WorkingDirectory = pkgs.mautrix-telegram; # necessary for the database migration scripts to be found
StateDirectory = baseNameOf dataDir;
UMask = 0027;
UMask = "0027";
EnvironmentFile = cfg.environmentFile;
ExecStart = ''

2
nixos/modules/services/misc/geoipupdate.nix
View File

@ -183,7 +183,7 @@ in
DynamicUser = true;
ReadWritePaths = cfg.settings.DatabaseDirectory;
RuntimeDirectory = "geoipupdate";
RuntimeDirectoryMode = 0700;
RuntimeDirectoryMode = "0700";
CapabilityBoundingSet = "";
PrivateDevices = true;
PrivateMounts = true;

2
nixos/modules/services/misc/mx-puppet-discord.nix
View File

@ -107,7 +107,7 @@ in {
PrivateTmp = true;
WorkingDirectory = pkgs.mx-puppet-discord;
StateDirectory = baseNameOf dataDir;
UMask = 0027;
UMask = "0027";
ExecStart = ''
${pkgs.mx-puppet-discord}/bin/mx-puppet-discord \

2
nixos/modules/services/misc/rmfakecloud.nix
View File

@ -138,7 +138,7 @@ in {
SystemCallArchitectures = "native";
WorkingDirectory = serviceDataDir;
StateDirectory = baseNameOf serviceDataDir;
UMask = 0027;
UMask = "0027";
};
};
};

2
nixos/modules/services/monitoring/parsedmarc.nix
View File

@ -494,7 +494,7 @@ in
Group = "parsedmarc";
DynamicUser = true;
RuntimeDirectory = "parsedmarc";
RuntimeDirectoryMode = 0700;
RuntimeDirectoryMode = "0700";
CapabilityBoundingSet = "";
PrivateDevices = true;
PrivateMounts = true;

2
nixos/modules/services/web-apps/bookstack.nix
View File

@ -372,7 +372,7 @@ in {
User = user;
WorkingDirectory = "${bookstack}";
RuntimeDirectory = "bookstack/cache";
RuntimeDirectoryMode = 0700;
RuntimeDirectoryMode = "0700";
};
path = [ pkgs.replace-secret ];
script =

4
nixos/modules/services/web-apps/discourse.nix
View File

@ -798,13 +798,13 @@ in
"public"
"sockets"
];
RuntimeDirectoryMode = 0750;
RuntimeDirectoryMode = "0750";
StateDirectory = map (p: "discourse/" + p) [
"uploads"
"backups"
"tmp"
];
StateDirectoryMode = 0750;
StateDirectoryMode = "0750";
LogsDirectory = "discourse";
TimeoutSec = "infinity";
Restart = "on-failure";

2
nixos/modules/services/web-apps/keycloak.nix
View File

@ -616,7 +616,7 @@ in
Group = "keycloak";
DynamicUser = true;
RuntimeDirectory = "keycloak";
RuntimeDirectoryMode = 0700;
RuntimeDirectoryMode = "0700";
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
};
script = ''

2
nixos/modules/services/web-apps/snipe-it.nix
View File

@ -394,7 +394,7 @@ in {
User = user;
WorkingDirectory = snipe-it;
RuntimeDirectory = "snipe-it/cache";
RuntimeDirectoryMode = 0700;
RuntimeDirectoryMode = "0700";
};
path = [ pkgs.replace-secret ];
script =