merge upstream

zengxs · Jan 21, 2024 · f4403af · f4403af
1 parent 7210099
commit f4403af
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/assets/update-permissions b/assets/update-permissions
@@ -91,7 +91,11 @@ fi
 
 # Fix registry storage
 if id -u registry; then
-    chown_if_exists -R registry:git /var/opt/gitlab/gitlab-rails/shared/registry
+	if [ -e "/var/opt/gitlab/gitlab-rails/shared/registry" ]; then
+		find /var/opt/gitlab/gitlab-rails/shared/registry -type d -exec chmod 755 {} \;
+		find /var/opt/gitlab/gitlab-rails/shared/registry -type f -exec chmod 744 {} \;
+	fi
+	chown_if_exists -R registry:git /var/opt/gitlab/gitlab-rails/shared/registry
 fi
 
 # Fix mattermost storage

diff --git a/assets/wrapper b/assets/wrapper
@@ -105,6 +105,7 @@ if [[ ! -f /etc/gitlab/ssh_host_rsa_key ]]; then
 fi
 # sshd loads the keys from /etc/gitlab, but the GitLab backend looks for keys
 # from within /etc/ssh
+ln -fs /etc/gitlab/ssh_host_rsa_key /etc/ssh/ssh_host_rsa_key
 ln -fs /etc/gitlab/ssh_host_rsa_key.pub /etc/ssh/ssh_host_rsa_key.pub
 
 if [[ ! -f /etc/gitlab/ssh_host_ecdsa_key ]]; then
@@ -114,6 +115,7 @@ if [[ ! -f /etc/gitlab/ssh_host_ecdsa_key ]]; then
 fi
 # sshd loads the keys from /etc/gitlab, but the GitLab backend looks for keys
 # from within /etc/ssh
+ln -fs /etc/gitlab/ssh_host_ecdsa_key /etc/ssh/ssh_host_ecdsa_key
 ln -fs /etc/gitlab/ssh_host_ecdsa_key.pub /etc/ssh/ssh_host_ecdsa_key.pub
 
 if [[ ! -f /etc/gitlab/ssh_host_ed25519_key ]]; then
@@ -123,6 +125,7 @@ if [[ ! -f /etc/gitlab/ssh_host_ed25519_key ]]; then
 fi
 # sshd loads the keys from /etc/gitlab, but the GitLab backend looks for keys
 # from within /etc/ssh
+ln -fs /etc/gitlab/ssh_host_ed25519_key /etc/ssh/ssh_host_ed25519_key
 ln -fs /etc/gitlab/ssh_host_ed25519_key.pub /etc/ssh/ssh_host_ed25519_key.pub