From 3eebab046cb746bc2369e0a5f273fb007f6778fa Mon Sep 17 00:00:00 2001
From: matsuand <30614168+matsuand@users.noreply.github.com>
Date: Wed, 11 May 2022 21:14:07 +0900
Subject: [PATCH] =?utf8?q?=E3=82=B5=E3=83=BC=E3=83=90=E3=83=BC=E5=87=A6?=
 =?utf8?q?=E7=90=86=E6=94=B9=E4=BF=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

* サーバー上の各ファイルに対するグループ書き込み権限を維持するため
  umask 002 明示実行 (実行箇所移動)。

* Makefile, www/Makefile: rsync 処理におけるエラー、failed to set times
  on "dir": Operation not permitted (1) エラー解消のため、それまで
  rsync の --omit-dir-times オプションを追加していたが、これを元に戻す。
  本来的な解決として crontab の実行コマンドの頭に "newgrp linuxjm &&"
  をつけて対処する。

  ; m h  dom mon dow   command
  33 */6 * * * newgrp linuxjm && /home/groups/l/li/linuxjm/jm.git/admin/cron/webupdate.sh
  3 1 15 * * newgrp linuxjm && /home/groups/l/li/linuxjm/jm.git/admin/cron/webupdate-all.sh
---
 Makefile                    | 4 ++--
 admin/cron/webupdate-all.sh | 2 +-
 admin/cron/webupdate.sh     | 2 +-
 www/Makefile                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 593660c2..729130db 100644
--- a/Makefile
+++ b/Makefile
@@ -48,9 +48,9 @@ roff: stamp/www-roff-modified
 
 stamp/www-roff-modified: stamp/cvs-status-modified
 	@mkdir -p $(WWWROFF)
-	$(RSYNC) -a --delete --omit-dir-times -v $(ROFFSRC)/ $(WWWROFF)
+	$(RSYNC) -a --delete -v $(ROFFSRC)/ $(WWWROFF)
 	@mkdir -p $(WWWPOD)
-	$(RSYNC) -a --delete --omit-dir-times -v $(PODSRC)/ $(WWWPOD)
+	$(RSYNC) -a --delete -v $(PODSRC)/ $(WWWPOD)
 	touch $@
 
 #
diff --git a/admin/cron/webupdate-all.sh b/admin/cron/webupdate-all.sh
index e26b4e52..f470425d 100755
--- a/admin/cron/webupdate-all.sh
+++ b/admin/cron/webupdate-all.sh
@@ -7,13 +7,13 @@ JMHOME=/home/groups/l/li/linuxjm
 GITDIR=$JMHOME/jm.git
 LOGDIR=$JMHOME/log
 
+umask 002
 test -d $LOGDIR || mkdir -p $LOGDIR
 LOGFILE=$LOGDIR/log-$(/bin/date +%Y%m%d-%H%M%S).txt
 touch $LOGFILE
 
 cd $JMHOME/jm.git
 echo "===== git pull =====" >> $LOGFILE 2>&1
-umask 002
 git pull >> $LOGFILE 2>&1
 git submodule update --init --recursive >> $LOGFILE 2>&1
 
diff --git a/admin/cron/webupdate.sh b/admin/cron/webupdate.sh
index bdc069e4..a4526483 100755
--- a/admin/cron/webupdate.sh
+++ b/admin/cron/webupdate.sh
@@ -7,13 +7,13 @@ JMHOME=/home/groups/l/li/linuxjm
 GITDIR=$JMHOME/jm.git
 LOGDIR=$JMHOME/log
 
+umask 002
 test -d $LOGDIR || mkdir -p $LOGDIR
 LOGFILE=$LOGDIR/log-$(/bin/date +%Y%m%d-%H%M%S).txt
 touch $LOGFILE
 
 echo "===== git pull =====" >> $LOGFILE 2>&1
 cd $JMHOME/jm.git
-umask 002
 git pull >> $LOGFILE 2>&1
 git submodule update --init --recursive >> $LOGFILE 2>&1
 
diff --git a/www/Makefile b/www/Makefile
index a4f4bf59..9ce9bbdf 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -57,7 +57,7 @@ clean:
 	make -C announcement/ clean
 
 install: all
-	$(RSYNC) -a --delete --omit-dir-times -v \
+	$(RSYNC) -a --delete -v \
 	--exclude='bin' \
 	--exclude='*.m4' \
 	--exclude='*.perl' \
-- 
2.11.0