diff options
| author |   Eric Hameleers <alien@slackware.com> | 2008-12-30 22:25:21 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2008-12-30 22:25:21 +0000 |
| commit | 8e741cceef3fa5484da614b48044a979ee83eb2c (patch) | |
| tree | e25a36a38919ca7db8e2fd1b8e0c3d9746cdeff7 /freenx | |
| parent | 0caabee203512cf6daef3dc8b751fea3a0fbfc2e (diff) | |
| download | asb-8e741cceef3fa5484da614b48044a979ee83eb2c.tar.gz asb-8e741cceef3fa5484da614b48044a979ee83eb2c.tar.xz | |
Updated
Diffstat (limited to 'freenx')
| -rwxr-xr-x | freenx/build/doinst.sh.freenx | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/freenx/build/doinst.sh.freenx b/freenx/build/doinst.sh.freenx index 044c5042..be391bb5 100755 --- a/freenx/build/doinst.sh.freenx +++ b/freenx/build/doinst.sh.freenx @@ -16,6 +16,7 @@ config() { config etc/nxserver/node.conf.new config etc/rc.d/rc.freenx.new +config etc/logrotate.d/freenx-server.new chroot . <<EOCR 2>/dev/null export \$(grep ^NX_DIR usr/bin/nxloadconfig) @@ -47,13 +48,6 @@ if [ ! -e \${NX_ETC_DIR}/users.id_dsa ]; then ssh-keygen -f \${NX_ETC_DIR}/users.id_dsa -t dsa -N "" > /dev/null 2>&1 fi -if [ -e \${NX_HOME_DIR}/.ssh/client.id_dsa.key ] && \ - [ -e \${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key ]; then - mv -f \${NX_HOME_DIR}/.ssh/client.id_dsa.key \${NX_ETC_DIR}/client.id_dsa.key - mv -f \${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key \ - \${NX_ETC_DIR}/server.id_dsa.pub.key -fi - if ! getent passwd | egrep -q "^nx:"; then useradd -m -d \${NX_HOME_DIR} -s /usr/bin/nxserver nx passwd -u nx 1>/dev/null @@ -61,6 +55,16 @@ if ! getent passwd | egrep -q "^nx:"; then chmod 700 \${NX_HOME_DIR}/.ssh fi +if [ -e \${NX_HOME_DIR}/.ssh/client.id_dsa.key ] && \ + [ -e \${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key ]; then + # There is a pre-existing NX installation. We use the ~nx/.ssh files. + echo "Copying existing nx ssh keys to \${NX_ETC_DIR} ." + cp -af \${NX_HOME_DIR}/.ssh/client.id_dsa.key \ + \${NX_ETC_DIR}/client.id_dsa.key + cp -af \${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key \ + \${NX_ETC_DIR}/server.id_dsa.pub.key +fi + if [ ! -e \${NX_ETC_DIR}/client.id_dsa.key ] || \ [ ! -e \${NX_ETC_DIR}/server.id_dsa.pub.key ]; then # We are going to create a new SSH key for the FreeNX server. @@ -68,6 +72,7 @@ if [ ! -e \${NX_ETC_DIR}/client.id_dsa.key ] || \ # connect to the FreeNX server. # If you're security minded, use this key exclusively, and remove the # NoMachine key from ${NX_HOME_DIR}/.ssh/authorized_keys. + echo "Creating a new SSH key for the FreeNX server." rm -f \${NX_ETC_DIR}/client.id_dsa.key rm -f \${NX_ETC_DIR}/server.id_dsa.pub.key ssh-keygen -q -t dsa -N '' -f \${NX_ETC_DIR}/local.id_dsa @@ -75,10 +80,12 @@ if [ ! -e \${NX_ETC_DIR}/client.id_dsa.key ] || \ mv \${NX_ETC_DIR}/local.id_dsa.pub \${NX_ETC_DIR}/server.id_dsa.pub.key # Put our fresh key files in place. - cp -f \${NX_ETC_DIR}/client.id_dsa.key \${NX_HOME_DIR}/.ssh/client.id_dsa.key + cp -f \${NX_ETC_DIR}/client.id_dsa.key \ + \${NX_HOME_DIR}/.ssh/client.id_dsa.key cp -f \${NX_ETC_DIR}/server.id_dsa.pub.key \ \${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key - chmod 600 \${NX_ETC_DIR}/client.id_dsa.key \ + chmod 600 \ + \${NX_ETC_DIR}/client.id_dsa.key \ \${NX_ETC_DIR}/server.id_dsa.pub.key \ \${NX_HOME_DIR}/.ssh/client.id_dsa.key \ \${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key @@ -118,3 +125,4 @@ chown -R nx:root \${NX_HOME_DIR} chown nx:root \${NX_LOGFILE} EOCR + |