Merge pull request #89 from CVL-GitHub/slurmbranch5

Slurmbranch5

roles/openssh/templates/ssh.initd.centos.j2

@@ -35,7 +35,7 @@
 module load openssh
 RETVAL=0
 prog="ssh"
-lockfile=${SSH_HOME}/var/lock/subsys/${prog}
+lockfile=/var/lock/subsys/${prog}
 
 # Some functions to make the below more readable
 KEYGEN=${SSH_HOME}/bin/ssh-keygen
@@ -46,12 +46,10 @@ RSA_KEY=${SSH_HOME}/etc/ssh_host_rsa_key
 DSA_KEY=${SSH_HOME}/etc/ssh_host_dsa_key
 PID_FILE=/var/run/sshd.pid
 ##PID_FILE=${SSH_HOME}/var/run/sshd.pid
-SSHD_LOG="${SSH_HOME}/var/log/sshd.log"
-OPTIONS="-E ${SSHD_LOG} -f ${SSHD_CONFIG}"
+##SSHD_LOG="${SSH_HOME}/var/log/sshd.log"
+OPTIONS="-f ${SSHD_CONFIG}"
 runlevel=$(set -- $(runlevel); eval "echo \$$#" )
 
-[ -f ${SSHD_LOG} ] || touch ${SSHD_LOG}
-
 fips_enabled() {
 	if [ -r /proc/sys/crypto/fips_enabled ]; then
 		cat /proc/sys/crypto/fips_enabled