From f5d402108bde8991ca2f1bc4668b50a171f8d9bb Mon Sep 17 00:00:00 2001 From: Kris Moore Date: Thu, 21 Apr 2016 11:34:06 -0400 Subject: [PATCH] Fix starting sysadm-server --- src/server/sysadm-server | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/server/sysadm-server b/src/server/sysadm-server index c272060..4d8b0cb 100644 --- a/src/server/sysadm-server +++ b/src/server/sysadm-server @@ -7,14 +7,21 @@ ssl_keygen() if [ ! -d "/usr/local/etc/sysadm" ] ; then mkdir -p /usr/local/etc/sysadm fi - openssl req -x509 -nodes -newkey rsa:2048 \ + if [ "$1" = "-rest" ] ; then + openssl req -x509 -nodes -newkey rsa:2048 \ -keyout /usr/local/etc/sysadm/restserver.key \ -out /usr/local/etc/sysadm/restserver.crt -days 1024 \ -subj "/C=US/ST=MY/L=NULL/O=SysAdm/OU=SysAdm/CN=SysAdm/emailAddress=none@example.org" 2>/dev/null + else + openssl req -x509 -nodes -newkey rsa:2048 \ + -keyout /usr/local/etc/sysadm/wsserver.key \ + -out /usr/local/etc/sysadm/wsserver.crt -days 1024 \ + -subj "/C=US/ST=MY/L=NULL/O=SysAdm/OU=SysAdm/CN=SysAdm/emailAddress=none@example.org" 2>/dev/null + fi } export PATH="${PATH}:/usr/local/bin:/usr/local/sbin" -ssl_keygen +ssl_keygen "$1" command="/usr/local/bin/sysadm-binary" flags=""