X-Git-Url: https://piware.de/gitweb/?a=blobdiff_plain;f=postinst-setup;h=5b72c5d0280b790260e962ef4dc6dc9d417ca461;hb=80076fd3b218a594e248aab049372953b256ecf3;hp=9d0dab97d31feca6f41445e952421fb4ad6cb205;hpb=280533f244b61302f6a3b9bb5344afe6f1918c19;p=bin.git diff --git a/postinst-setup b/postinst-setup index 9d0dab9..5b72c5d 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 +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 @@ -26,28 +26,35 @@ fi cd /etc if [ ! -d /etc/.bzr ]; then for i in passwd group shadow fstab; do - [ -e $i.originst] || cp $i $i.originst + [ -e $i.originst ] || cp $i $i.originst done - bzr get bzr+ssh://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 -fi - -# only restore dchroot part into fstab -grep -A 200 "^# dchroots" fstab >> fstab.originst || true -mv fstab.originst fstab - -# only restore the human users from passwd/group -for i in passwd group; do - perl -naF: -e 'print if $F[2] > 1000 && $F[2] < 60000' $i >> $i.originst - mv $i.originst $i -done + chmod 640 /etc/shadow + chown root:shadow /etc/shadow + chmod 700 /etc/ssl/private + chmod 640 /etc/ssl/private/ssl-cert-* + chown root:ssl-cert /etc/ssl/private/ssl-cert* + + # only restore dchroot part into fstab + grep -A 200 "^# sid chroot" fstab >> fstab.originst || true + mv fstab.originst fstab + + # only restore the human users from passwd/group + for i in passwd group; do + perl -naF: -e 'print if $F[2] > 1000 && $F[2] < 60000' $i >> $i.originst + mv $i.originst $i + done -# only restore some passwords from shadow -egrep 'martin|netti|joe' shadow >> shadow.originst -mv shadow.originst shadow + # 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 newaliases @@ -65,35 +72,25 @@ 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 /etc/rcS.d/*pcmcia* /etc/rcS.d/*ppp* +rm -f /etc/rcS.d/*pcmcia* /etc/rcS.d/*ppp* # install packages from network sources 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 python-paramiko 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 -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 -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 dchroot fakechroot imagemagick pngquant pdfjam easytag rsnapshot texlive-lang-german texlive-latex-extra python-coverage powertop sane-utils vim-scripts libtemplate-perl kvm bzr-buildpackage git-core +apt-get -y build-dep postgresql-8.4 hal cups apport jockey calibre gvfs 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 - </dev/null EOF + +if [ -x /usr/bin/gtimelog ]; then + patch /usr/bin/gtimelog ~martin/archiv/gtimelog.tuesday.patch fi