diff options
Diffstat (limited to 'instfiles/init.d')
| -rw-r--r-- | instfiles/init.d/Makefile.am | 6 | ||||
| -rw-r--r-- | instfiles/init.d/xrdp | 17 |
2 files changed, 4 insertions, 19 deletions
diff --git a/instfiles/init.d/Makefile.am b/instfiles/init.d/Makefile.am index ae411c20..2ffff4fe 100644 --- a/instfiles/init.d/Makefile.am +++ b/instfiles/init.d/Makefile.am @@ -1,4 +1,2 @@ -EXTRA_DIST = xrdp -startscriptdir=$(sysconfdir)/init.d -startscript_DATA = xrdp - +startscriptdir = $(sysconfdir)/init.d +dist_startscript_SCRIPTS = xrdp diff --git a/instfiles/init.d/xrdp b/instfiles/init.d/xrdp index dcdb01a4..f64e5965 100644 --- a/instfiles/init.d/xrdp +++ b/instfiles/init.d/xrdp @@ -18,12 +18,11 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin BASE=__BASE__ DAEMON=${BASE}/sbin/xrdp SDAEMON=${BASE}/sbin/xrdp-sesman -PIDDIR=/var/run/xrdp/ +PIDDIR=/var/run/ SESMAN_START=yes #USERID=xrdp # the X11rdp backend only works as root at the moment - GH 20/03/2013 USERID=root -RSAKEYS=/etc/xrdp/rsakeys.ini NAME=xrdp DESC="Remote Desktop Protocol server" @@ -67,18 +66,6 @@ if [ "$(id -u)" = "0" ]; then mkdir $PIDDIR fi chown $USERID:$USERID $PIDDIR - - # Check for rsa key - if [ ! -f $RSAKEYS ] ; then - log_action_begin_msg "Generating xrdp RSA keys..." - (umask 077 ; xrdp-keygen xrdp $RSAKEYS) - chown $USERID:$USERID $RSAKEYS - if [ ! -f $RSAKEYS ] ; then - log_action_end_msg 1 "could not create $RSAKEYS" - exit 1 - fi - log_action_end_msg 0 "done" - fi fi @@ -139,7 +126,7 @@ case "$1" in ;; force-stop) $0 stop - # because it doesn't allways die the right way + # because it doesn't always die the right way force_stop ;; restart|force-reload) |