pr_27504.patch-abs 5.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117
  1. diff --git a/usr/local/bin/grunt b/usr/local/bin/grunt
  2. index 462c68df4d52..8595d67109ae 100755
  3. --- a/usr/local/bin/grunt
  4. +++ b/usr/local/bin/grunt
  5. @@ -11,22 +11,22 @@ cd /overleaf/services/web
  6. case "$TASK" in
  7. user:create-admin)
  8. echo "The grunt command is deprecated, run the create-user script using node instead"
  9. - node modules/server-ce-scripts/scripts/create-user.mjs --admin "$@"
  10. + exec /sbin/setuser www-data node modules/server-ce-scripts/scripts/create-user.mjs --admin "$@"
  11. ;;
  12. user:delete)
  13. echo "The grunt command is deprecated, run the delete-user script using node instead"
  14. - node modules/server-ce-scripts/scripts/delete-user.mjs "$@"
  15. + exec /sbin/setuser www-data node modules/server-ce-scripts/scripts/delete-user.mjs "$@"
  16. ;;
  17. check:mongo)
  18. echo "The grunt command is deprecated, run the check-mongodb script using node instead"
  19. - node modules/server-ce-scripts/scripts/check-mongodb.mjs
  20. + exec /sbin/setuser www-data node modules/server-ce-scripts/scripts/check-mongodb.mjs
  21. ;;
  22. check:redis)
  23. echo "The grunt command is deprecated, run the check-redis script using node instead"
  24. - node modules/server-ce-scripts/scripts/check-redis.mjs
  25. + exec /sbin/setuser www-data node modules/server-ce-scripts/scripts/check-redis.mjs
  26. ;;
  27. *)
  28. diff --git a/etc/my_init.pre_shutdown.d/00_close_site b/etc/my_init.pre_shutdown.d/00_close_site
  29. index ed5404f8172f..ac579f4b10ff 100755
  30. --- a/etc/my_init.pre_shutdown.d/00_close_site
  31. +++ b/etc/my_init.pre_shutdown.d/00_close_site
  32. @@ -12,7 +12,7 @@ echo "closed" > "${SITE_MAINTENANCE_FILE}"
  33. sleep 5
  34. # giving a grace period of 5 seconds for users before disconnecting them and start shutting down
  35. -cd /overleaf/services/web && node scripts/disconnect_all_users.mjs --delay-in-seconds=5 >> /var/log/overleaf/web.log 2>&1
  36. +cd /overleaf/services/web && /sbin/setuser www-data node scripts/disconnect_all_users.mjs --delay-in-seconds=5 >> /var/log/overleaf/web.log 2>&1
  37. EXIT_CODE="$?"
  38. if [ $EXIT_CODE -ne 0 ]
  39. diff --git a/etc/my_init.pre_shutdown.d/01_flush_document_updater b/etc/my_init.pre_shutdown.d/01_flush_document_updater
  40. index 0900fe5fac04..b4529f856b1e 100755
  41. --- a/etc/my_init.pre_shutdown.d/01_flush_document_updater
  42. +++ b/etc/my_init.pre_shutdown.d/01_flush_document_updater
  43. @@ -3,7 +3,7 @@
  44. . /etc/container_environment.sh
  45. . /etc/overleaf/env.sh
  46. -cd /overleaf/services/document-updater && node scripts/flush_all.js >> /var/log/overleaf/document-updater.log 2>&1
  47. +cd /overleaf/services/document-updater && /sbin/setuser www-data node scripts/flush_all.js >> /var/log/overleaf/document-updater.log 2>&1
  48. EXIT_CODE="$?"
  49. if [ $EXIT_CODE -ne 0 ]
  50. diff --git a/etc/my_init.pre_shutdown.d/02_flush_project_history b/etc/my_init.pre_shutdown.d/02_flush_project_history
  51. index f8ac51600c98..2844379cebc1 100755
  52. --- a/etc/my_init.pre_shutdown.d/02_flush_project_history
  53. +++ b/etc/my_init.pre_shutdown.d/02_flush_project_history
  54. @@ -3,7 +3,7 @@
  55. . /etc/container_environment.sh
  56. . /etc/overleaf/env.sh
  57. -cd /overleaf/services/project-history && node scripts/flush_all.js >> /var/log/overleaf/project-history.log 2>&1
  58. +cd /overleaf/services/project-history && /sbin/setuser www-data node scripts/flush_all.js >> /var/log/overleaf/project-history.log 2>&1
  59. EXIT_CODE="$?"
  60. if [ $EXIT_CODE -ne 0 ]
  61. diff --git a/etc/my_init.d/500_check_db_access.sh b/etc/my_init.d/500_check_db_access.sh
  62. index bbf2b9ec267d..f71acc8e011e 100755
  63. --- a/etc/my_init.d/500_check_db_access.sh
  64. +++ b/etc/my_init.d/500_check_db_access.sh
  65. @@ -3,6 +3,6 @@ set -e
  66. echo "Checking can connect to mongo and redis"
  67. cd /overleaf/services/web
  68. -node modules/server-ce-scripts/scripts/check-mongodb.mjs
  69. -node modules/server-ce-scripts/scripts/check-redis.mjs
  70. +/sbin/setuser www-data node modules/server-ce-scripts/scripts/check-mongodb.mjs
  71. +/sbin/setuser www-data node modules/server-ce-scripts/scripts/check-redis.mjs
  72. echo "All checks passed"
  73. diff --git a/etc/my_init.d/900_run_web_migrations.sh b/etc/my_init.d/900_run_web_migrations.sh
  74. index 59b7d23ea07f..cc206a528bb6 100755
  75. --- a/etc/my_init.d/900_run_web_migrations.sh
  76. +++ b/etc/my_init.d/900_run_web_migrations.sh
  77. @@ -9,5 +9,5 @@ fi
  78. echo "Running migrations for $environment"
  79. cd /overleaf/services/web
  80. -npm run migrations -- migrate -t "$environment"
  81. +/sbin/setuser www-data npm run migrations -- migrate -t "$environment"
  82. echo "Finished migrations"
  83. diff --git a/etc/my_init.d/910_check_texlive_images b/etc/my_init.d/910_check_texlive_images
  84. index 90dec0061f19..047dea5b603f 100755
  85. --- a/etc/my_init.d/910_check_texlive_images
  86. +++ b/etc/my_init.d/910_check_texlive_images
  87. @@ -3,4 +3,4 @@ set -e
  88. echo "Checking texlive images"
  89. cd /overleaf/services/web
  90. -node modules/server-ce-scripts/scripts/check-texlive-images.mjs
  91. +/sbin/setuser www-data node modules/server-ce-scripts/scripts/check-texlive-images.mjs
  92. diff --git a/etc/my_init.d/910_initiate_doc_version_recovery b/etc/my_init.d/910_initiate_doc_version_recovery
  93. index 1daecd3c2fcd..0602e19872dc 100755
  94. --- a/etc/my_init.d/910_initiate_doc_version_recovery
  95. +++ b/etc/my_init.d/910_initiate_doc_version_recovery
  96. @@ -10,7 +10,7 @@ RESYNCS_NEEDED_FILE=/var/lib/overleaf/data/history/doc-version-recovery-resyncs-
  97. echo "Checking for doc version recovery. This can take a while if needed. Logs are in $LOG_FILE"
  98. cd /overleaf/services/history-v1
  99. -LOG_LEVEL=info DOC_VERSION_RECOVERY_RESYNCS_NEEDED_FILE="$RESYNCS_NEEDED_FILE" node storage/scripts/recover_doc_versions.js 2>&1 | tee -a "$LOG_FILE"
  100. +LOG_LEVEL=info DOC_VERSION_RECOVERY_RESYNCS_NEEDED_FILE="$RESYNCS_NEEDED_FILE" /sbin/setuser www-data node storage/scripts/recover_doc_versions.js 2>&1 | tee -a "$LOG_FILE"
  101. function resyncAllProjectsInBackground() {
  102. waitForService docstore 3016