From e5465f4e8c00ed8fc1dcf67cc4d87beed7c9339c Mon Sep 17 00:00:00 2001 From: Larissa Lane Date: Mon, 19 Oct 2020 19:33:55 +0000 Subject: [PATCH 1/5] New path for Workhorse socket --- doc/update/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/update/README.md b/doc/update/README.md index b5e99671278557..088f69453f72cd 100644 --- a/doc/update/README.md +++ b/doc/update/README.md @@ -222,6 +222,10 @@ possible. ## Version specific upgrading instructions +### 13.5.0 + +The path for the Workhorse socket changed in 13.5. If you have created a custom socket path you will need to reconfigure this to ... If you are using the SELinux distribution of GitLab with the default location for the Workhorse socket, run a `gitlab-ctl reconfigure` to automatically move the workhorse socket to the new location. + ### 13.3.0 The recommended Git version is Git v2.28. The minimum required version of Git -- GitLab From 05f66df17da5078c426ff3ff59b8070a31f42072 Mon Sep 17 00:00:00 2001 From: Larissa Lane Date: Mon, 19 Oct 2020 21:39:12 +0000 Subject: [PATCH 2/5] Apply 1 suggestion(s) to 1 file(s) --- doc/update/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/update/README.md b/doc/update/README.md index 088f69453f72cd..48637241decedb 100644 --- a/doc/update/README.md +++ b/doc/update/README.md @@ -224,7 +224,7 @@ possible. ### 13.5.0 -The path for the Workhorse socket changed in 13.5. If you have created a custom socket path you will need to reconfigure this to ... If you are using the SELinux distribution of GitLab with the default location for the Workhorse socket, run a `gitlab-ctl reconfigure` to automatically move the workhorse socket to the new location. +The path for the Workhorse socket changed in 13.5. Users who set a custom socket with `gitlab_workhorse['listen_addr']` will have that setting honored. Users with this customization who are using SELinux should also add `gitlab_workhorse['sockets_directory'] set to the directory containing hte customized socket. Running `gitlab-ctl reconfigure` will apply this setting and Omnibus will manage the SELinux contexts. SELinux users who have not customized their socket can just run `gitlab-ctl reconfigure` for Omnibus to move the socket and apply the proper SELinux context. ### 13.3.0 -- GitLab From 8ec12a09b057176bb95ab6d1454eec6c0bd389c6 Mon Sep 17 00:00:00 2001 From: Larissa Lane Date: Mon, 19 Oct 2020 22:24:38 +0000 Subject: [PATCH 3/5] Add further clarification --- doc/update/README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/update/README.md b/doc/update/README.md index 48637241decedb..ca64408ecf0841 100644 --- a/doc/update/README.md +++ b/doc/update/README.md @@ -224,7 +224,11 @@ possible. ### 13.5.0 -The path for the Workhorse socket changed in 13.5. Users who set a custom socket with `gitlab_workhorse['listen_addr']` will have that setting honored. Users with this customization who are using SELinux should also add `gitlab_workhorse['sockets_directory'] set to the directory containing hte customized socket. Running `gitlab-ctl reconfigure` will apply this setting and Omnibus will manage the SELinux contexts. SELinux users who have not customized their socket can just run `gitlab-ctl reconfigure` for Omnibus to move the socket and apply the proper SELinux context. +The path for the Workhorse socket changed from `/var/opt/gitlab/workhorse/socket` to `/var/opt/gitlab/workhorse/sockets/socket` in 13.5. This change will automatically get applied and Workhorse will be restarted during an upgrade, unless you have set your system to skip `reconfigure` (`/etc/gitlab/skip-auto-reconfigure`). + +If you use SELinux and you you have set `gitlab_workhorse['listen_addr']` to a custom socket path, you will need to take some manual steps. If you want Omnibus to manage SELinux Contexts, set `gitlab_workhorse['sockets_directory'] = /path/to/directory/with/socket"/var/opt/my_workhorse_socket_home"` and run `gitlab-ctl reconfigure`. Alternatively, if you want to manage the SELinux Context yourself, run `semanage fcontext -a -t gitlab_shell_t '/var/opt/my_workhorse_socket_home'` and then `restorecon -v '/var/opt/my_workhorse_socket_home'`. Note that if you are managing the SELinux Context yourself, you will need to repeat these steps if you move the directory. + +If you are using a custom listen address but you are not using SELinux, you will not be affected by this change. ### 13.3.0 -- GitLab From 32b6a89823850f08c18c9fd74c7ec2d438e84f80 Mon Sep 17 00:00:00 2001 From: Larissa Lane Date: Mon, 19 Oct 2020 22:31:20 +0000 Subject: [PATCH 4/5] Apply 1 suggestion(s) to 1 file(s) --- doc/update/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/update/README.md b/doc/update/README.md index ca64408ecf0841..15caf7bb7b733e 100644 --- a/doc/update/README.md +++ b/doc/update/README.md @@ -226,7 +226,7 @@ possible. The path for the Workhorse socket changed from `/var/opt/gitlab/workhorse/socket` to `/var/opt/gitlab/workhorse/sockets/socket` in 13.5. This change will automatically get applied and Workhorse will be restarted during an upgrade, unless you have set your system to skip `reconfigure` (`/etc/gitlab/skip-auto-reconfigure`). -If you use SELinux and you you have set `gitlab_workhorse['listen_addr']` to a custom socket path, you will need to take some manual steps. If you want Omnibus to manage SELinux Contexts, set `gitlab_workhorse['sockets_directory'] = /path/to/directory/with/socket"/var/opt/my_workhorse_socket_home"` and run `gitlab-ctl reconfigure`. Alternatively, if you want to manage the SELinux Context yourself, run `semanage fcontext -a -t gitlab_shell_t '/var/opt/my_workhorse_socket_home'` and then `restorecon -v '/var/opt/my_workhorse_socket_home'`. Note that if you are managing the SELinux Context yourself, you will need to repeat these steps if you move the directory. +If you use SELinux and you you have set `gitlab_workhorse['listen_addr']` to a custom socket path, you will need to take some manual steps. If you want Omnibus to manage SELinux Contexts, set `gitlab_workhorse['sockets_directory'] = "/var/opt/my_workhorse_socket_home"` and run `gitlab-ctl reconfigure`. Alternatively, if you want to manage the SELinux Context yourself, run `semanage fcontext -a -t gitlab_shell_t '/var/opt/my_workhorse_socket_home'` and then `restorecon -v '/var/opt/my_workhorse_socket_home'`. Note that if you are managing the SELinux Context yourself, you will need to repeat these steps if you move the directory. If you are using a custom listen address but you are not using SELinux, you will not be affected by this change. -- GitLab From f43908f92ef56526bb4355ce62012a2f89389009 Mon Sep 17 00:00:00 2001 From: Larissa Lane Date: Mon, 19 Oct 2020 23:30:30 +0000 Subject: [PATCH 5/5] Fix lint error --- doc/update/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/update/README.md b/doc/update/README.md index 15caf7bb7b733e..bc5620fbc7d86c 100644 --- a/doc/update/README.md +++ b/doc/update/README.md @@ -226,7 +226,7 @@ possible. The path for the Workhorse socket changed from `/var/opt/gitlab/workhorse/socket` to `/var/opt/gitlab/workhorse/sockets/socket` in 13.5. This change will automatically get applied and Workhorse will be restarted during an upgrade, unless you have set your system to skip `reconfigure` (`/etc/gitlab/skip-auto-reconfigure`). -If you use SELinux and you you have set `gitlab_workhorse['listen_addr']` to a custom socket path, you will need to take some manual steps. If you want Omnibus to manage SELinux Contexts, set `gitlab_workhorse['sockets_directory'] = "/var/opt/my_workhorse_socket_home"` and run `gitlab-ctl reconfigure`. Alternatively, if you want to manage the SELinux Context yourself, run `semanage fcontext -a -t gitlab_shell_t '/var/opt/my_workhorse_socket_home'` and then `restorecon -v '/var/opt/my_workhorse_socket_home'`. Note that if you are managing the SELinux Context yourself, you will need to repeat these steps if you move the directory. +If you use SELinux and have set `gitlab_workhorse['listen_addr']` to a custom socket path, some manual steps are required. If you want Omnibus to manage SELinux Contexts, set `gitlab_workhorse['sockets_directory'] = "/var/opt/my_workhorse_socket_home"` and run `gitlab-ctl reconfigure`. Alternatively, if you want to manage the SELinux Context yourself, run `semanage fcontext -a -t gitlab_shell_t '/var/opt/my_workhorse_socket_home'` and then `restorecon -v '/var/opt/my_workhorse_socket_home'`. Note that if you are managing the SELinux Context yourself, you will need to repeat these steps if you move the directory. If you are using a custom listen address but you are not using SELinux, you will not be affected by this change. -- GitLab