postinst-setup: do not set up mirror and apache any more

[bin.git] / postinst-setup

diff --git a/postinst-setup b/postinst-setup
index a8dc63049c0b2d2142b34ff04550ab96af0785d2..34d7143c54c90f92405e880dad38f584bd031926 100755 (executable)
--- 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 latex-beamer texlive-lang-german fakechroot sane-utils imagemagick
+    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