diff options
| author | Cassio de Campos <cassiopc@gmail.com> | 2017-08-18 09:22:13 +0000 |
|---|---|---|
| committer | Cassio de Campos <cassiopc@gmail.com> | 2017-08-18 09:22:13 +0000 |
| commit | 08b27a7a45c6fa96c5a3040d1d40f229975036f7 (patch) | |
| tree | e704cde1e5bc63adabd4315ff065e8d06a0208df | |
| parent | 66072f61b873b91afe1740765d91d441fcfd1e97 (diff) | |
| download | boca-08b27a7a45c6fa96c5a3040d1d40f229975036f7.tar.gz boca-08b27a7a45c6fa96c5a3040d1d40f229975036f7.zip | |
fixed scripts
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | tools/boca-fixssh (renamed from tools/cron-bocassh.sh) | 10 | ||||
| -rw-r--r-- | tools/cron-fixssh | 1 | ||||
| -rw-r--r-- | tools/cron-logroot | 2 |
4 files changed, 10 insertions, 5 deletions
@@ -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/cron-bocassh.sh b/tools/boca-fixssh index 361efdd..f6306ec 100644 --- a/tools/cron-bocassh.sh +++ b/tools/boca-fixssh @@ -1,13 +1,15 @@ #!/bin/bash if [ "`id bocassh 2>/dev/null`" != "" ]; then - for i in 1 2 3 4 5 6 7 8 9 10 11; do + if [ ! -d /var/www/boca/home/.ssh ]; then 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 + 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 5 + sleep 10 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 |