From 506a08384a28ff21eee618a2b41ed7d9b3fe278d Mon Sep 17 00:00:00 2001 From: Balasankar C Date: Sun, 24 Jul 2022 19:05:13 +0530 Subject: [PATCH 1/2] Install configuration file for ActionCable Starting with GitLab 14.5, ActionCable is mandatory, and cable.yml is a required configuration file. Signed-off-by: Balasankar C --- debian/README.Debian | 2 +- debian/changelog | 7 +++++++ debian/conf/cable.yml | 9 +++++++++ debian/gitlab.install | 1 + 4 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 debian/conf/cable.yml diff --git a/debian/README.Debian b/debian/README.Debian index b927867cb9..2ddeae45c6 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -6,7 +6,7 @@ and listens on tcp port 6379. So gitlab package in debian is configured to use tcp sockets. gitlab developers recommend using unix sockets. You can change to using unix sockets by changing the following configuration files. - /etc/redis/redis.conf and /etc/gitlab/resque.yml + /etc/redis/redis.conf, /etc/gitlab/resque.yml, and /etc/gitlab/cable.yml 2. wiki backend: debian package uses gollum-rugged_adapter whereas gitlab upstream still use gollum-grit_adapter. grit is no longer maintained and grit diff --git a/debian/changelog b/debian/changelog index e5884bcebf..31814dc995 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gitlab (15.0.4+ds1-2) UNRELEASED; urgency=medium + + [ Balasankar C] + * Install ActionCable configuration file (Closes: #1015303) + + -- Balasankar C Sun, 24 Jul 2022 19:12:07 +0530 + gitlab (15.0.4+ds1-1) experimental; urgency=medium [ Antoine Le Gonidec ] diff --git a/debian/conf/cable.yml b/debian/conf/cable.yml new file mode 100644 index 0000000000..e00fec4805 --- /dev/null +++ b/debian/conf/cable.yml @@ -0,0 +1,9 @@ +production: + adapter: redis + url: redis://localhost:6379 +development: + adapter: redis + url: redis://localhost:6379 +test: + adapter: redis + url: redis://localhost:6379 diff --git a/debian/gitlab.install b/debian/gitlab.install index 7a7935de8f..ffcc88ef68 100644 --- a/debian/gitlab.install +++ b/debian/gitlab.install @@ -3,6 +3,7 @@ debian/conf/puma.rb etc/gitlab debian/conf/database.yml etc/gitlab debian/conf/gitlab.yml.example usr/lib/gitlab/templates debian/conf/resque.yml etc/gitlab +debian/conf/cable.yml etc/gitlab debian/conf/gitlab-debian.conf.example usr/lib/gitlab/templates debian/conf/*.target lib/systemd/system debian/conf/smtp_settings.rb etc/gitlab/initializers From 215caf9bce6fe10c87b54be5dcda14511b6e3cfc Mon Sep 17 00:00:00 2001 From: Balasankar C Date: Sun, 24 Jul 2022 20:01:13 +0530 Subject: [PATCH 2/2] Change Balu's email ID Signed-off-by: Balasankar C --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index a248f3ab73..baace55097 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Ruby Team Uploaders: Cédric Boutillier , Pirate Praveen , - Balasankar C , + Balasankar C , Sruthi Chandran , Utkarsh Gupta Build-Depends: debhelper-compat (= 13),