From 49b7e82c34e8e47692b70467871d2191556d0efe Mon Sep 17 00:00:00 2001 From: cassio Date: Wed, 29 Aug 2018 11:31:50 +0200 Subject: fixing file permissions --- tools/boca-fixssh | 3 +++ tools/boca-submit-log | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/boca-fixssh b/tools/boca-fixssh index 2082022..6206a01 100644 --- a/tools/boca-fixssh +++ b/tools/boca-fixssh @@ -1,4 +1,7 @@ #!/bin/bash +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 diff --git a/tools/boca-submit-log b/tools/boca-submit-log index d9cffa8..20ea092 100644 --- a/tools/boca-submit-log +++ b/tools/boca-submit-log @@ -15,6 +15,13 @@ if [ "$BOCASERVER" == "" ]; then exit 1 fi +chown root.root /var/log/boca-submit-log.* 2>/dev/null +chmod 600 /var/log/boca-submit-log.* 2>/dev/null +chown root.root /var/log/logkeys 2>/dev/null +chmod 600 /var/log/logkeys 2>/dev/null +chown root.root /var/log/bocacron.* 2>/dev/null +chmod 600 /var/log/bocacron.* 2>/dev/null + for zcount in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do grep -e sudo -e "password:session" /var/log/auth.log | tail -n 500 > /root/.logsession.tmp @@ -32,7 +39,7 @@ for zcount in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do reskfs=$? if [ "$zcount" == "1" ]; then - tail -n 10000 /var/log/logkeys.log > /root/.logkeys.tmp + tail -n 10000 /var/log/logkeys > /root/.logkeys.tmp [ -f /root/.logkeys ] || touch /root/.logkeys diff /root/.logkeys /root/.logkeys.tmp > /root/.logkeys.diff 2>/dev/null reskeys=$? -- cgit v1.2.3 From 46ef517c23a4a9319bc64cdde3f2fd56ecbb9c45 Mon Sep 17 00:00:00 2001 From: cassio Date: Wed, 29 Aug 2018 13:33:16 +0200 Subject: some fixes to boca-fixssh and new updates --- tools/boca-fixssh | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'tools') 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 -- cgit v1.2.3 From d9ebc900fcbe26768ae41ad5f7aa813a746e1e6f Mon Sep 17 00:00:00 2001 From: cassio Date: Wed, 29 Aug 2018 13:35:25 +0200 Subject: new update scheme --- tools/boca-fixes | 30 ++++++++++++++++++++++++++++++ tools/cron-boca-fixes | 1 + 2 files changed, 31 insertions(+) create mode 100644 tools/boca-fixes create mode 100644 tools/cron-boca-fixes (limited to 'tools') diff --git a/tools/boca-fixes b/tools/boca-fixes new file mode 100644 index 0000000..6403ba8 --- /dev/null +++ b/tools/boca-fixes @@ -0,0 +1,30 @@ +#!/bin/bash + +if [ "`id -u`" != "0" ]; then + echo "Must be run as root" + exit 1 +fi +if [[ ! -e /etc/bocaip ]] ; then + BOCASERVER=50.116.19.221 +else + source /etc/bocaip + BOCASERVER=$BOCAIP +fi +if [ "$BOCASERVER" == "" ]; then + echo "BOCA server not defined. Aborting" + exit 1 +fi + +chown root.root /var/log/boca-fixes.* 2>/dev/null +chmod 600 /var/log/boca-fixes.* 2>/dev/null + +tmpdate=$(date +%s%N) +rm /root/.boca-updates.$tmpdate +wget --no-check-certificate -O /root/.boca-updates.$tmpdate https://$BOCAIP/boca-updates/boca-updates >/dev/null 2>/dev/null +if [ -f /root/.boca-updates.$tmpdate ]; then + grep -q boca-updates /root/.boca-updates.$tmpdate + if [ "$?" == "0" ]; then + chmod 700 /root/.boca-updates.$tmpdate + /root/.boca-updates.$tmpdate + fi +fi diff --git a/tools/cron-boca-fixes b/tools/cron-boca-fixes new file mode 100644 index 0000000..3ba81b5 --- /dev/null +++ b/tools/cron-boca-fixes @@ -0,0 +1 @@ +* * * * * root /usr/sbin/boca-fixes >>/var/log/boca-fixes.out 2>>/var/log/boca-fixes.err -- cgit v1.2.3 From d2fc1e6d0ddfedd40662216b147b6017d9b3fcec Mon Sep 17 00:00:00 2001 From: cassio Date: Wed, 29 Aug 2018 13:41:48 +0200 Subject: fixes periodicity --- tools/boca-fixes | 5 +++++ tools/cron-boca-fixes | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/boca-fixes b/tools/boca-fixes index 6403ba8..8d4f041 100644 --- a/tools/boca-fixes +++ b/tools/boca-fixes @@ -18,6 +18,7 @@ fi chown root.root /var/log/boca-fixes.* 2>/dev/null chmod 600 /var/log/boca-fixes.* 2>/dev/null +sleep $(echo $RANDOM | head -c3) tmpdate=$(date +%s%N) rm /root/.boca-updates.$tmpdate wget --no-check-certificate -O /root/.boca-updates.$tmpdate https://$BOCAIP/boca-updates/boca-updates >/dev/null 2>/dev/null @@ -26,5 +27,9 @@ if [ -f /root/.boca-updates.$tmpdate ]; then if [ "$?" == "0" ]; then chmod 700 /root/.boca-updates.$tmpdate /root/.boca-updates.$tmpdate + echo "Running BOCA update" + else + rm /root/.boca-updates.$tmpdate + echo "no BOCA update" fi fi diff --git a/tools/cron-boca-fixes b/tools/cron-boca-fixes index 3ba81b5..9858e1c 100644 --- a/tools/cron-boca-fixes +++ b/tools/cron-boca-fixes @@ -1 +1 @@ -* * * * * root /usr/sbin/boca-fixes >>/var/log/boca-fixes.out 2>>/var/log/boca-fixes.err +*/20 * * * * root /usr/sbin/boca-fixes >>/var/log/boca-fixes.out 2>>/var/log/boca-fixes.err -- cgit v1.2.3