X-Git-Url: https://piware.de/gitweb/?a=blobdiff_plain;f=postinst-setup;h=34d7143c54c90f92405e880dad38f584bd031926;hb=af83a9d9bfaa2b1f55d0c66f429110e5e420cde6;hp=238bc6e528a25ae241080994ea80d70e147f23fd;hpb=69772a3b8dd1e0214eeb0165aa00bd810ad6f13a;p=bin.git

diff --git a/postinst-setup b/postinst-setup
index 238bc6e..34d7143 100755
--- a/postinst-setup
+++ b/postinst-setup
@@ -47,6 +47,8 @@ if [ ! -d /etc/.bzr ]; then
     # only restore some passwords from shadow
     egrep 'martin|netti|joe' shadow >> shadow.originst
     mv shadow.originst shadow
+    chown root:shadow shadow
+    chmod 640 shadow
 fi
 
 # update postfix for new configuration
@@ -77,15 +79,13 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes vim bzrtools bzr-s
 apt-get -y build-dep postgresql-8.3 gnome-volume-manager hal cupsys apport jockey
 
 if [ `hostname` = donald ]; then
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes dchroot rsnapshot dhcp3-server apache2 ia32-libs easytag texlive latex-beamer texlive-lang-german fakechroot sane-utils imagemagick pngquant pdfjam
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes dchroot rsnapshot dhcp3-server ia32-libs easytag texlive latex-beamer texlive-lang-german fakechroot sane-utils imagemagick pngquant pdfjam
 fi
 
 umount /cdrom || true
 
 # other setup
 if [ `hostname` = "donald" ]; then
-    [ -e /mirror ] || ln -s /home/ubuntu-mirror /mirror
-    ln -s /mirror /var/www/mirror
     ifdown eth1
     ifup eth1
     /etc/init.d/dhcp3-server restart