X-Git-Url: https://piware.de/gitweb/?a=blobdiff_plain;f=postinst-setup;h=8fe457e33c45b7fea72268f5a8c70dfa1b355d27;hb=201f99610db357a7ad6c6fa6482fc3923407ce44;hp=a8dc63049c0b2d2142b34ff04550ab96af0785d2;hpb=1497be0f71e210bdfef0e56895aa2884fdf355cc;p=bin.git

diff --git a/postinst-setup b/postinst-setup
index a8dc630..8fe457e 100755
--- a/postinst-setup
+++ b/postinst-setup
@@ -12,13 +12,13 @@ if [ -r "$UBUNTU_CD" ]; then
     mount -o loop "$UBUNTU_CD" /cdrom
     apt-cdrom -m add
 fi
-DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential fakeroot devscripts postfix openssh-server bzr python-paramiko 
+DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends build-essential fakeroot devscripts postfix openssh-server bzr python-paramiko 
 
 # root's ssh stuff
 if [ ! -d /root/.ssh ] && [ -d /home/martin/.ssh ]; then
     mkdir -p /root/.ssh
     chmod 700 /root/.ssh
-    cp /home/martin/.ssh/id_dsa* /home/martin/.ssh/known_hosts /home/martin/.ssh/config /root/.ssh/
+    cp /home/martin/.ssh/id_rsa* /home/martin/.ssh/known_hosts /home/martin/.ssh/config /root/.ssh/
 fi
 
 # restore /etc bzr branch, rescue the files we do not want to restore
@@ -28,14 +28,14 @@ if [ ! -d /etc/.bzr ]; then
     for i in passwd group shadow fstab; do
         [ -e $i.originst ] || cp $i $i.originst
     done
-    bzr get sftp://martin@piware.de/home/martin/backup/`hostname`-etc /backup-etc
+    [ -e /backup-etc ] || bzr get bzr+ssh://martin@piware.de/home/martin/backup/`hostname`-etc /backup-etc
     cp -av /backup-etc/* /etc/
     cp -av /backup-etc/.bzr/ /etc/
     rm -rf /backup-etc
     chmod 600 /etc/ssh/ssh_*_key
 
     # only restore dchroot part into fstab
-    grep -A 200 "^# dchroots" fstab >> fstab.originst || true
+    grep -A 200 "^# sid chroot" fstab >> fstab.originst || true
     mv fstab.originst fstab
 
     # only restore the human users from passwd/group
@@ -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
@@ -65,7 +67,7 @@ locale-gen ru_RU ru_RU.UTF-8
 
 # remove packages that we do not need
 killall apt-get || true # cronjob goo
-apt-get purge -y --auto-remove hplip brltty bluez-cups gnome-accessibility-themes gnome-mag gnome-orca onboard tomboy ttf-arabeyes ttf-arphic-uming ttf-baekmuk ttf-gentium ttf-kochi-gothic ttf-kochi-mincho ttf-lao ttf-malayalam-fonts ttf-mgopen ttf-thai-tlwg || true
+apt-get purge -y --auto-remove hplip brltty bluez-cups gnome-accessibility-themes gnome-mag gnome-orca onboard tomboy ttf-arabeyes ttf-arphic-uming ttf-lao ttf-thai-tlwg update-motd || true
 
 rm -f /etc/rcS.d/*pcmcia* /etc/rcS.d/*ppp*
 
@@ -73,27 +75,17 @@ rm -f /etc/rcS.d/*pcmcia* /etc/rcS.d/*ppp*
 killall apt-get || true
 apt-get update -o Acquire::Http::No-Cache=true
 
-DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes vim bzrtools bzr-svn patchutils offlineimap wipe diffstat gtimelog jigdo-file libtool devhelp python-doc manpages-dev gstreamer0.10-plugins-ugly gstreamer0.10-plugins-bad gstreamer0.10-plugins-bad-multiverse gstreamer0.10-plugins-ugly-multiverse gstreamer0.10-ffmpeg weechat weechat-plugins weechat-scripts dpatch wdiff grep-dctrl ccache subversion listadmin quilt python-dev cryptsetup mutt editmoin lintian python-gtk2-doc fakechroot ubuntu-dev-tools dput gnome-blog
-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
-fi
+DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y --force-yes vim bzrtools bzr-svn patchutils offlineimap wipe diffstat gtimelog jigdo-file libtool devhelp python-doc manpages-dev gstreamer0.10-plugins-ugly gstreamer0.10-plugins-bad gstreamer0.10-plugins-bad-multiverse gstreamer0.10-plugins-ugly-multiverse gstreamer0.10-ffmpeg weechat weechat-plugins weechat-scripts dpatch wdiff debian-goodies ccache subversion listadmin quilt python-dev cryptsetup mutt editmoin lintian python-gtk2-doc fakechroot ubuntu-dev-tools dput gnome-blog dchroot fakechroot imagemagick pngquant pdfjam easytag rsnapshot texlive-lang-german python-coverage powertop sane-utils vim-scripts libtemplate-perl kvm bzr-buildpackage git-core
+apt-get -y build-dep postgresql-8.3 gnome-mount hal cups apport jockey calibre
 
 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
-    patch /usr/bin/gtimelog ~martin/archiv/gtimelog.wednesday.patch
-
-    # crontabs
-    crontab -u martin - <<EOF
+# crontabs
+crontab -u martin - <<EOF
 # m h  dom mon dow   command
 05 * * * * \$HOME/bin/backup >/dev/null
 EOF
+
+if [ -x /usr/bin/gtimelog ]; then
+    patch /usr/bin/gtimelog ~martin/archiv/gtimelog.tuesday.patch
 fi