X-Git-Url: https://piware.de/gitweb/?a=blobdiff_plain;f=postinst-setup;h=079cc5d086da69d6e95774e2e5ff0c7eecfecd7c;hb=4aecaff49cc512735e95ae06d29c674bc753fdd8;hp=78132bbf3d975d69f6528416f6559140b36e480a;hpb=550f62afa91d7124f4a51a94b989888747740522;p=bin.git

diff --git a/postinst-setup b/postinst-setup
index 78132bb..079cc5d 100755
--- a/postinst-setup
+++ b/postinst-setup
@@ -25,30 +25,36 @@ fi
 # completely
 cd /etc
 if [ ! -d /etc/.bzr ]; then
-    for i in passwd group shadow fstab; do
+    #for i in passwd group shadow fstab; do
+    for i in fstab; do
         [ -e $i.originst ] || cp $i $i.originst
     done
-    [ -e /backup-etc ] || 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
-    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
@@ -67,7 +73,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-kochi-gothic ttf-kochi-mincho ttf-lao ttf-malayalam-fonts ttf-thai-tlwg landscape-common update-motd tracker|| 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*
 
@@ -75,15 +81,8 @@ 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 --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 grep-dctrl 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 openvpn texlive-lang-german python-coverage
-apt-get -y build-dep postgresql-8.3 gnome-mount hal cups apport jockey
-
-if [ `hostname` = donald ]; then
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes dhcp3-server ia32-libs latex-beamer sane-utils
-fi
-if [ `hostname` = tick ]; then
-    DEBIAN_FRONTEND=noninteractive apt-get install -y powertop 
-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 greasemonkey
+apt-get -y build-dep postgresql-8.4 hal cups apport jockey calibre gvfs devicekit-disks devicekit-power
 
 umount /cdrom || true
 
@@ -93,13 +92,6 @@ crontab -u martin - <<EOF
 05 * * * * \$HOME/bin/backup >/dev/null
 EOF
 
-# other setup
-if [ `hostname` = "donald" ]; then
-    ifdown eth1
-    ifup eth1
-    /etc/init.d/dhcp3-server restart
-
-fi
 if [ -x /usr/bin/gtimelog ]; then
-    patch /usr/bin/gtimelog ~martin/archiv/gtimelog.wednesday.patch
+    patch /usr/bin/gtimelog ~martin/archiv/gtimelog.tuesday.patch
 fi