diff options
| author | cassio <cassiopc@gmail.com> | 2018-08-29 11:33:16 +0000 |
|---|---|---|
| committer | cassio <cassiopc@gmail.com> | 2018-08-29 11:33:16 +0000 |
| commit | 46ef517c23a4a9319bc64cdde3f2fd56ecbb9c45 (patch) | |
| tree | fa75409e23f5e7131f5b1f4059e6c56aed764659 | |
| parent | 49b7e82c34e8e47692b70467871d2191556d0efe (diff) | |
| download | boca-46ef517c23a4a9319bc64cdde3f2fd56ecbb9c45.tar.gz boca-46ef517c23a4a9319bc64cdde3f2fd56ecbb9c45.zip | |
some fixes to boca-fixssh and new updates
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | tools/boca-fixssh | 25 |
2 files changed, 23 insertions, 11 deletions
@@ -9,6 +9,9 @@ install-bocawww: mkdir -p $(DESTDIR)/var/www/boca/ cp -r src $(DESTDIR)/var/www/boca/ cp -r doc $(DESTDIR)/var/www/boca/ + install tools/boca-fixssh $(DESTDIR)/usr/sbin/ + install tools/cron-boca-fixssh $(DESTDIR)/etc/cron.d/ + chmod 700 $(DESTDIR)/usr/sbin/boca-fixssh install-bocaapache: mkdir -p $(DESTDIR)/etc/apache2/sites-enabled/ @@ -49,20 +52,20 @@ install: install-bocawww install-bocaapache install-bocadb install-bocacommon in 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-log $(DESTDIR)/usr/sbin/ install tools/cron-boca-submit $(DESTDIR)/etc/cron.d/ - install tools/cron-boca-fixssh $(DESTDIR)/etc/cron.d/ install tools/cron-boca-log $(DESTDIR)/etc/cron.d/ install tools/boca-submit-run-root-wrapper $(DESTDIR)/usr/bin/ install tools/boca-outmanage $(DESTDIR)/usr/sbin/ install tools/boca-checkinternet $(DESTDIR)/usr/sbin/ + install tools/boca-fixes $(DESTDIR)/usr/sbin/ + install tools/cron-boca-fixes $(DESTDIR)/etc/cron.d/ + chmod 700 $(DESTDIR)/usr/sbin/boca-fixes chmod 700 $(DESTDIR)/usr/sbin/boca-auth-runs - chmod 700 $(DESTDIR)/usr/sbin/boca-fixssh chmod 700 $(DESTDIR)/usr/sbin/boca-outmanage chmod 700 $(DESTDIR)/usr/sbin/boca-submit-log chmod 700 $(DESTDIR)/usr/bin/boca-submit-run-* diff --git a/tools/boca-fixssh b/tools/boca-fixssh index 6206a01..574de7c 100644 --- a/tools/boca-fixssh +++ b/tools/boca-fixssh @@ -1,18 +1,27 @@ #!/bin/bash + +if [ "`id -u`" != "0" ]; then + echo "Must be run as root" + exit 1 +fi + chown root.root /var/log/boca-fixssh.* 2>/dev/null chmod 600 /var/log/boca-fixssh.* 2>/dev/null 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 + wwwboca=/var/www/boca + casa=$wwwboca/home + if [ ! -d $casa/.ssh ]; then + mkdir -p $casa/.ssh + chown -R bocassh.bocassh $casa 2>/dev/null + chmod 700 $casa + chmod 700 $casa/.ssh + usermod -d $casa bocassh fi for i in 1 2 3 4 5 6; 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 + touch $casa/.ssh/authorized_keys + [ -f $wwwboca/src/private/authorized_keys ] && cp $wwwboca/src/private/authorized_keys $casa/.ssh/authorized_keys + chmod 600 $casa/.ssh/authorized_keys [ "$i" == "6" ] || sleep 10 done fi |