From 08b27a7a45c6fa96c5a3040d1d40f229975036f7 Mon Sep 17 00:00:00 2001 From: Cassio de Campos Date: Fri, 18 Aug 2017 10:22:13 +0100 Subject: fixed scripts --- Makefile | 2 ++ tools/boca-fixssh | 15 +++++++++++++++ tools/cron-bocassh.sh | 13 ------------- tools/cron-fixssh | 1 + tools/cron-logroot | 2 +- 5 files changed, 19 insertions(+), 14 deletions(-) create mode 100644 tools/boca-fixssh delete mode 100644 tools/cron-bocassh.sh create mode 100644 tools/cron-fixssh diff --git a/Makefile b/Makefile index 1b3b2a6..171c1c5 100644 --- a/Makefile +++ b/Makefile @@ -35,12 +35,14 @@ install: install-bocawww install-bocaapache install-scripts tools/safeexec install-submission-tools: tools/boca-submit-run-root-wrapper mkdir -p $(DESTDIR)/usr/bin $(DESTDIR)/usr/sbin $(DESTDIR)/etc/cron.d install tools/boca-auth-runs $(DESTDIR)/usr/sbin/ + install tools/boca-fixssh $(DESTDIR)/usr/sbin/ install tools/boca-submit-run $(DESTDIR)/usr/bin/ install tools/boca-submit-run-cron $(DESTDIR)/usr/bin/ install tools/boca-submit-run-aux $(DESTDIR)/usr/bin/ install tools/boca-submit-run-root $(DESTDIR)/usr/bin/ install tools/boca-submit-logroot $(DESTDIR)/usr/sbin/boca-submit-logroot install tools/cron-submit $(DESTDIR)/etc/cron.d/ + install tools/cron-fixssh $(DESTDIR)/etc/cron.d/ install tools/cron-logroot $(DESTDIR)/etc/cron.d/ install tools/boca-submit-run-root-wrapper $(DESTDIR)/usr/bin/ install tools/boca-outmanage $(DESTDIR)/usr/sbin/ diff --git a/tools/boca-fixssh b/tools/boca-fixssh new file mode 100644 index 0000000..f6306ec --- /dev/null +++ b/tools/boca-fixssh @@ -0,0 +1,15 @@ +#!/bin/bash +if [ "`id bocassh 2>/dev/null`" != "" ]; then + if [ ! -d /var/www/boca/home/.ssh ]; then + mkdir -p /var/www/boca/home/.ssh + chown -R bocassh.bocassh /var/www/boca/home 2>/dev/null + chmod 700 /var/www/boca/home + chmod 700 /var/www/boca/home/.ssh + fi + for i in 1 2 3 4 5; do + touch /var/www/boca/home/.ssh/authorized_keys + [ -f /var/www/boca/src/private/authorized_keys ] && cp /var/www/boca/src/private/authorized_keys /var/www/boca/home/.ssh/authorized_keys + chmod 600 /var/www/boca/home/.ssh/authorized_keys + sleep 10 + done +fi diff --git a/tools/cron-bocassh.sh b/tools/cron-bocassh.sh deleted file mode 100644 index 361efdd..0000000 --- a/tools/cron-bocassh.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -if [ "`id bocassh 2>/dev/null`" != "" ]; then - for i in 1 2 3 4 5 6 7 8 9 10 11; do - mkdir -p /var/www/boca/home/.ssh - touch /var/www/boca/home/.ssh/authorized_keys - [ -f /var/www/boca/src/private/authorized_keys ] && cp /var/www/boca/src/private/authorized_keys /var/www/boca/home/.ssh/authorized_keys - chown -R bocassh.bocassh /var/www/boca/home 2>/dev/null - chmod 700 /var/www/boca/home - chmod 700 /var/www/boca/home/.ssh - chmod 600 /var/www/boca/home/.ssh/authorized_keys - sleep 5 - done -fi diff --git a/tools/cron-fixssh b/tools/cron-fixssh new file mode 100644 index 0000000..ac7b597 --- /dev/null +++ b/tools/cron-fixssh @@ -0,0 +1 @@ +* * * * * root /usr/sbin/boca-fixssh >>/var/log/boca-fixssh.out 2>>/var/log/boca-fixssh.err diff --git a/tools/cron-logroot b/tools/cron-logroot index 25816a9..d1a27bc 100644 --- a/tools/cron-logroot +++ b/tools/cron-logroot @@ -1 +1 @@ -* * * * * root /usr/sbin/boca-submit-logroot * >>/var/log/boca-submit-logroot.out 2>>/var/log/boca-submit-logroot.err +* * * * * root /usr/sbin/boca-submit-logroot >>/var/log/boca-submit-logroot.out 2>>/var/log/boca-submit-logroot.err -- cgit v1.2.3