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

* Don't use ‘chown user.group’ since that syntax is not officially

Browse Source 
supported (you're supposed to say ‘chown user:group’).

svn path=/nixos/trunk/; revision=34161
This commit is contained in:
Eelco Dolstra 2012-05-17 19:43:32 +00:00
parent f889ebc488
commit 801cd7402c
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/installer/tools/nixos-install.sh
View File

@ -80,7 +80,7 @@ mkdir -m 0755 -p \
$mountPoint/nix/var/log/nix/drvs $mountPoint/nix/var/log/nix/drvs
mkdir -m 1775 -p $mountPoint/nix/store mkdir -m 1775 -p $mountPoint/nix/store
chown root.nixbld $mountPoint/nix/store chown root:nixbld $mountPoint/nix/store
# Get the store paths to copy from the references graph. # Get the store paths to copy from the references graph.

6
modules/security/policykit.nix
View File

@ -64,15 +64,15 @@ in
system.activationScripts.policyKit = stringAfter [ "users" ] system.activationScripts.policyKit = stringAfter [ "users" ]
'' ''
mkdir -m 0770 -p /var/run/PolicyKit mkdir -m 0770 -p /var/run/PolicyKit
chown root.polkituser /var/run/PolicyKit chown root:polkituser /var/run/PolicyKit
mkdir -m 0770 -p /var/lib/PolicyKit mkdir -m 0770 -p /var/lib/PolicyKit
chown root.polkituser /var/lib/PolicyKit chown root:polkituser /var/lib/PolicyKit
mkdir -p /var/lib/misc mkdir -p /var/lib/misc
touch /var/lib/misc/PolicyKit.reload touch /var/lib/misc/PolicyKit.reload
chmod 0664 /var/lib/misc/PolicyKit.reload chmod 0664 /var/lib/misc/PolicyKit.reload
chown polkituser.polkituser /var/lib/misc/PolicyKit.reload chown polkituser:polkituser /var/lib/misc/PolicyKit.reload
''; '';
}; };

2
modules/services/mail/dovecot.nix
View File

@ -119,7 +119,7 @@ in
preStart = preStart =
'' ''
${pkgs.coreutils}/bin/mkdir -p /var/run/dovecot /var/run/dovecot/login ${pkgs.coreutils}/bin/mkdir -p /var/run/dovecot /var/run/dovecot/login
${pkgs.coreutils}/bin/chown -R ${cfg.user}.${cfg.group} /var/run/dovecot ${pkgs.coreutils}/bin/chown -R ${cfg.user}:${cfg.group} /var/run/dovecot
''; '';
exec = "${pkgs.dovecot}/sbin/dovecot -F -c ${confFile}"; exec = "${pkgs.dovecot}/sbin/dovecot -F -c ${confFile}";

2
modules/services/mail/dovecot2.nix
View File

@ -128,7 +128,7 @@ in
preStart = preStart =
'' ''
${pkgs.coreutils}/bin/mkdir -p /var/run/dovecot2 /var/run/dovecot2/login ${pkgs.coreutils}/bin/mkdir -p /var/run/dovecot2 /var/run/dovecot2/login
${pkgs.coreutils}/bin/chown -R ${cfg.user}.${cfg.group} /var/run/dovecot2 ${pkgs.coreutils}/bin/chown -R ${cfg.user}:${cfg.group} /var/run/dovecot2
''; '';
exec = "${pkgs.dovecot_2_0}/sbin/dovecot -F -c ${confFile}"; exec = "${pkgs.dovecot_2_0}/sbin/dovecot -F -c ${confFile}";

6
modules/services/mail/postfix.nix
View File

@ -329,10 +329,10 @@ in
${pkgs.coreutils}/bin/mkdir -p /var/spool/mail /var/postfix/conf /var/postfix/queue ${pkgs.coreutils}/bin/mkdir -p /var/spool/mail /var/postfix/conf /var/postfix/queue
fi fi
${pkgs.coreutils}/bin/chown -R ${user}.${group} /var/postfix ${pkgs.coreutils}/bin/chown -R ${user}:${group} /var/postfix
${pkgs.coreutils}/bin/chown -R ${user}.${setgidGroup} /var/postfix/queue ${pkgs.coreutils}/bin/chown -R ${user}:${setgidGroup} /var/postfix/queue
${pkgs.coreutils}/bin/chmod -R ug+rwX /var/postfix/queue ${pkgs.coreutils}/bin/chmod -R ug+rwX /var/postfix/queue
${pkgs.coreutils}/bin/chown root.root /var/spool/mail ${pkgs.coreutils}/bin/chown root:root /var/spool/mail
${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail ${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail
ln -sf ${pkgs.postfix}/share/postfix/conf/* /var/postfix/conf ln -sf ${pkgs.postfix}/share/postfix/conf/* /var/postfix/conf

2
modules/services/misc/nix-daemon.nix
View File

@ -301,7 +301,7 @@ in
system.activationScripts.nix = stringAfter [ "etc" "users" ] system.activationScripts.nix = stringAfter [ "etc" "users" ]
'' ''
# Set up Nix. # Set up Nix.
chown root.nixbld /nix/store chown root:nixbld /nix/store
chmod 1775 /nix/store chmod 1775 /nix/store
# Nix initialisation. # Nix initialisation.

4
modules/services/monitoring/systemhealth.nix
View File

@ -80,7 +80,7 @@ in
system.activationScripts.systemhealth = stringAfter [ "var" ] system.activationScripts.systemhealth = stringAfter [ "var" ]
'' ''
mkdir -p ${rrdDir} ${htmlDir} mkdir -p ${rrdDir} ${htmlDir}
chown wwwrun.wwwrun ${rrdDir} ${htmlDir} chown wwwrun:wwwrun ${rrdDir} ${htmlDir}
cat >${configFile} << EOF cat >${configFile} << EOF
[paths] [paths]
@ -110,7 +110,7 @@ in
EOF EOF
chown wwwrun.wwwrun ${configFile} chown wwwrun:wwwrun ${configFile}
${pkgs.su}/bin/su -s "/bin/sh" -c "${command} --check" wwwrun ${pkgs.su}/bin/su -s "/bin/sh" -c "${command} --check" wwwrun
${pkgs.su}/bin/su -s "/bin/sh" -c "${command} --html" wwwrun ${pkgs.su}/bin/su -s "/bin/sh" -c "${command} --html" wwwrun