X-Git-Url: https://piware.de/gitweb/?p=bin.git;a=blobdiff_plain;f=postinst-setup;h=a2afae01a8842ad24ceade844e398ca6fb74f6f8;hp=6c06516babf7d29d56909f33daaff7022f4130aa;hb=69789764b97df9fdb76f6f29c491c1ac2083e552;hpb=ebafa551e0062e36be409d22018650b9a76024d9 diff --git a/postinst-setup b/postinst-setup index 6c06516..a2afae0 100755 --- a/postinst-setup +++ b/postinst-setup @@ -6,19 +6,14 @@ if [ -d /home/martin/backup ] && [ ! -d /var/backups/martin ]; then rm -rf /home/martin/backup fi -# install already shipped debs -UBUNTU_CD="/home/martin/download/ubuntu/`lsb_release -c`-alternate-`dpkg --print-architecture`.iso" -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 +# need bzr and postfix for the setup below +DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends 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 +23,19 @@ 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 + 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 "^# dchroots" fstab >> fstab.originst || true + grep -A 200 "^#.*chroot" fstab >> fstab.originst || true mv fstab.originst fstab # only restore the human users from passwd/group @@ -55,47 +55,30 @@ fi newaliases /etc/init.d/postfix restart -# copy apt cache -if [ -d /home/aptcache ]; then - find /home/aptcache/ -name "*.deb" -exec cp '{}' /var/cache/apt/archives/ \; - rm -rf /home/aptcache -fi - # other setup dpkg -i /home/martin/download/libdvdcss2_*deb || true 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 hplip-data hpijs brltty bluez-cups gnome-accessibility-themes gnome-mag gnome-orca onboard tomboy ttf-lao ttf-thai-tlwg || true 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 +apt-get update -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 +DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y --force-yes vim bzrtools patchutils offlineimap wipe diffstat gtimelog libtool devhelp python-doc manpages-dev gstreamer0.10-fluendo-mp3 gstreamer0.10-ffmpeg weechat weechat-plugins weechat-scripts dpatch wdiff ccache listadmin quilt cryptsetup mutt editmoin lintian fakechroot ubuntu-dev-tools dput dchroot easytag rsnapshot texlive-lang-german texlive-latex-extra powertop qemu-kvm bzr-buildpackage git-core build-essential fakeroot devscripts libglib2.0-doc libgtk-3-doc git-buildpackage d-feet germinate debootstrap seahorse-plugins wmctrl mumble qemu-kvm flashplugin-installer -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 -fi +apt-get -y build-dep postgresql-8.4 cups apport calibre gvfs udisks upower gnome-disk-utility udev python-gobject -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 --no-backup-if-mismatch /usr/share/pyshared/gtimelog/main.py ~martin/archiv/gtimelog.tuesday.patch fi