Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5df0e4affd989a4e4f75cf64786875fed80cbfe9
commit 5df0e4affd989a4e4f75cf64786875fed80cbfe9
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Wed Nov 11 01:33:23 2009 +0100
freenx-server-0.7.3-2-i686
- handle the case when key are already there
diff --git a/source/xapps-extra/freenx-server/FrugalBuild
b/source/xapps-extra/freenx-server/FrugalBuild
index 93f1f6c..8996794 100644
--- a/source/xapps-extra/freenx-server/FrugalBuild
+++ b/source/xapps-extra/freenx-server/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=freenx-server
pkgver=0.7.3
-pkgrel=1
+pkgrel=2
pkgdesc="Free Software (GPL) Implementation of the NX Server"
_F_berlios_dirname="freenx"
Finclude berlios
@@ -35,3 +35,5 @@ build()
Fmkdir /var/log/nx
chmod 0700 $Fdestdir/var/log/nx
}
+
+# optimization OK
diff --git a/source/xapps-extra/freenx-server/freenx-server.install
b/source/xapps-extra/freenx-server/freenx-server.install
index 8c7229b..e3e86d6 100644
--- a/source/xapps-extra/freenx-server/freenx-server.install
+++ b/source/xapps-extra/freenx-server/freenx-server.install
@@ -1,10 +1,14 @@
post_install()
{
/usr/sbin/useradd -r -d /var/lib/nxserver/home -s /usr/libexec/nx/nxserver nx
- ssh-keygen -q -t dsa -N "" -f /etc/nxserver/users.id_dsa
- ssh-keygen -q -t dsa -N "" -f /etc/nxserver/local.id_dsa
- mv -f /etc/nxserver/local.id_dsa /etc/nxserver/client.id_dsa.key
- mv -f /etc/nxserver/local.id_dsa.pub /etc/nxserver/server.id_dsa.pub.key
+ if [ ! -e /etc/nxserver/users.id_dsa ]; then
+ ssh-keygen -q -t dsa -N "" -f /etc/nxserver/users.id_dsa
+ fi
+ if [ ! -e /etc/nxserver/client.id_dsa.key -o ! -e
/etc/nxserver/server.id_dsa.pub.key ]; then
+ ssh-keygen -q -t dsa -N "" -f /etc/nxserver/local.id_dsa
+ mv -f /etc/nxserver/local.id_dsa /etc/nxserver/client.id_dsa.key
+ mv -f /etc/nxserver/local.id_dsa.pub
/etc/nxserver/server.id_dsa.pub.key
+ fi
echo -n "127.0.0.1 " > /var/lib/nxserver/home/.ssh/known_hosts
cat /etc/ssh/ssh_host_rsa_key.pub >> /var/lib/nxserver/home/.ssh/known_hosts
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
