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 --no-install-recommends 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
# completely
cd /etc
if [ ! -d /etc/.bzr ]; then
- #for i in passwd group shadow fstab; do
- for i in fstab; do
+ for i in passwd group shadow fstab; do
[ -e $i.originst ] || cp $i $i.originst
done
[ -e /backup-etc ] || bzr get bzr+ssh://martin@piware.de/home/martin/backup/`hostname`-etc /backup-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 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*
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
+ 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
- #chown root:shadow shadow
- #chmod 640 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
# 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-lao ttf-thai-tlwg update-motd || 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 --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 greasemonkey
-apt-get -y build-dep postgresql-8.4 hal cups apport jockey calibre gvfs devicekit-disks devicekit-power
+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 greasemonkey build-essential fakeroot devscripts libglib2.0-doc libgtk3.0-doc git-buildpackage d-feet germinate debootstrap seahorse-plugins wmctrl mumble qemu-kvm flashplugin-installer
-umount /cdrom || true
+apt-get -y build-dep postgresql-8.4 cups apport calibre gvfs udisks upower gnome-disk-utility
# crontabs
crontab -u martin - <<EOF
EOF
if [ -x /usr/bin/gtimelog ]; then
- patch /usr/bin/gtimelog ~martin/archiv/gtimelog.tuesday.patch
+ patch --no-backup-if-mismatch /usr/share/pyshared/gtimelog/main.py ~martin/archiv/gtimelog.tuesday.patch
fi