From c43b89fcb4e93fa0c036ca90940e1f443535f01d Mon Sep 17 00:00:00 2001 From: Marcel Herrguth Date: Tue, 21 Jun 2022 14:05:32 +0200 Subject: [PATCH 1/3] Maintenance: Switch from scheduler.rb to background-services.rb --- containers/zammad/docker-entrypoint.sh | 4 ++-- containers/zammad/setup.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/containers/zammad/docker-entrypoint.sh b/containers/zammad/docker-entrypoint.sh index 68fe76c..83bee73 100755 --- a/containers/zammad/docker-entrypoint.sh +++ b/containers/zammad/docker-entrypoint.sh @@ -155,9 +155,9 @@ if [ "$1" = 'zammad-scheduler' ]; then cd "${ZAMMAD_DIR}" - echo "starting scheduler..." + echo "starting background services..." - exec bundle exec script/scheduler.rb run + exec bundle exec script/background-services.rb start fi diff --git a/containers/zammad/setup.sh b/containers/zammad/setup.sh index 9b5de47..7aaae66 100755 --- a/containers/zammad/setup.sh +++ b/containers/zammad/setup.sh @@ -44,7 +44,7 @@ if [ "$1" = 'builder' ]; then bundle install sed -e 's#.*adapter: postgresql# adapter: nulldb#g' -e 's#.*username:.*# username: postgres#g' -e 's#.*password:.*# password: \n host: zammad-postgresql\n#g' < contrib/packager.io/database.yml.pkgr > config/database.yml sed -i "/require 'rails\/all'/a require\ 'nulldb'" config/application.rb - sed -i 's/.*scheduler_\(err\|out\).log.*//g' script/scheduler.rb + sed -i 's/.*scheduler_\(err\|out\).log.*//g' script/background-services.rb touch db/schema.rb bundle exec rake assets:precompile rm -r tmp/cache From d3308a6e7788113fef20753b661f74e8608c066b Mon Sep 17 00:00:00 2001 From: Marcel Herrguth Date: Tue, 21 Jun 2022 14:13:21 +0200 Subject: [PATCH 2/3] =?UTF-8?q?Fix=20wrong=20script=20name=20=F0=9F=A4=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- containers/zammad/docker-entrypoint.sh | 2 +- containers/zammad/setup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/containers/zammad/docker-entrypoint.sh b/containers/zammad/docker-entrypoint.sh index 83bee73..c718e60 100755 --- a/containers/zammad/docker-entrypoint.sh +++ b/containers/zammad/docker-entrypoint.sh @@ -157,7 +157,7 @@ if [ "$1" = 'zammad-scheduler' ]; then echo "starting background services..." - exec bundle exec script/background-services.rb start + exec bundle exec script/background-worker.rb start fi diff --git a/containers/zammad/setup.sh b/containers/zammad/setup.sh index 7aaae66..4d0c5a3 100755 --- a/containers/zammad/setup.sh +++ b/containers/zammad/setup.sh @@ -44,7 +44,7 @@ if [ "$1" = 'builder' ]; then bundle install sed -e 's#.*adapter: postgresql# adapter: nulldb#g' -e 's#.*username:.*# username: postgres#g' -e 's#.*password:.*# password: \n host: zammad-postgresql\n#g' < contrib/packager.io/database.yml.pkgr > config/database.yml sed -i "/require 'rails\/all'/a require\ 'nulldb'" config/application.rb - sed -i 's/.*scheduler_\(err\|out\).log.*//g' script/background-services.rb + sed -i 's/.*scheduler_\(err\|out\).log.*//g' script/background-worker.rb touch db/schema.rb bundle exec rake assets:precompile rm -r tmp/cache From fe5481e89a3a617190d1199424dd96398dab1f48 Mon Sep 17 00:00:00 2001 From: Marcel Herrguth Date: Tue, 21 Jun 2022 14:39:29 +0200 Subject: [PATCH 3/3] Remove obsolete line --- containers/zammad/setup.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/containers/zammad/setup.sh b/containers/zammad/setup.sh index 4d0c5a3..fb9b81b 100755 --- a/containers/zammad/setup.sh +++ b/containers/zammad/setup.sh @@ -44,7 +44,6 @@ if [ "$1" = 'builder' ]; then bundle install sed -e 's#.*adapter: postgresql# adapter: nulldb#g' -e 's#.*username:.*# username: postgres#g' -e 's#.*password:.*# password: \n host: zammad-postgresql\n#g' < contrib/packager.io/database.yml.pkgr > config/database.yml sed -i "/require 'rails\/all'/a require\ 'nulldb'" config/application.rb - sed -i 's/.*scheduler_\(err\|out\).log.*//g' script/background-worker.rb touch db/schema.rb bundle exec rake assets:precompile rm -r tmp/cache