From 4e06e6278bb4f82c87acbbbcf511f05a76b7bc12 Mon Sep 17 00:00:00 2001 From: tim Date: Fri, 18 Apr 2025 13:36:53 +0300 Subject: [PATCH 1/4] r72110-gitlab-custom-ssh-url --- roles/debian/gitlab/templates/gitlab.rb.j2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/debian/gitlab/templates/gitlab.rb.j2 b/roles/debian/gitlab/templates/gitlab.rb.j2 index 18714deaf..b31c6f6d3 100644 --- a/roles/debian/gitlab/templates/gitlab.rb.j2 +++ b/roles/debian/gitlab/templates/gitlab.rb.j2 @@ -47,7 +47,11 @@ external_url 'https://{{ gitlab.server_name }}' ## gitlab.yml configuration ##! Docs: https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/settings/gitlab.yml.md ################################################################################ +{% if (gitlab.ssh_url | length > 0) %} +gitlab_rails['gitlab_ssh_host'] = {{ gitlab.ssh_url }}" +{% else %} # gitlab_rails['gitlab_ssh_host'] = 'ssh.host_example.com' +{% endif %} # gitlab_rails['time_zone'] = 'UTC' ### Email Settings From 1c2460047c021318641faefb5317f6cf066c3c7c Mon Sep 17 00:00:00 2001 From: tim Date: Fri, 18 Apr 2025 13:46:22 +0300 Subject: [PATCH 2/4] r72110-gitlab-custom-ssh-url --- roles/debian/gitlab/defaults/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/debian/gitlab/defaults/main.yml b/roles/debian/gitlab/defaults/main.yml index ba7d1b4e5..225d7a2cf 100644 --- a/roles/debian/gitlab/defaults/main.yml +++ b/roles/debian/gitlab/defaults/main.yml @@ -11,6 +11,7 @@ gitlab: apt_origin: "origin=packages.gitlab.com/gitlab/gitlab-ce,codename=${distro_codename},label=gitlab-ce" # used by apt_unattended_upgrades apt_signed_by: https://packages.gitlab.com/gitlab/gitlab-ce/gpgkey server_name: "gitlab.{{ _domain_name }}" + ssh_url: "" # custom SSH URL. Similar to https one if empty. force_stop: true # whether to stop GitLab to reconfigure or not # Add a record for GitLab in AWS Route 53 # If you use the aws_ec2_with_eip role to create your server this will not be necessary From f863d3efda6ee72f0c97671908c6d221d51dc809 Mon Sep 17 00:00:00 2001 From: tim Date: Tue, 22 Apr 2025 01:42:38 +0300 Subject: [PATCH 3/4] ACLs must be OPTIONAL --- roles/_meta/aws_region/meta/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/_meta/aws_region/meta/main.yml b/roles/_meta/aws_region/meta/main.yml index a11491c0e..53343de06 100644 --- a/roles/_meta/aws_region/meta/main.yml +++ b/roles/_meta/aws_region/meta/main.yml @@ -4,7 +4,7 @@ dependencies: - role: aws/aws_vpc - role: aws/aws_vpc_subnet - role: aws/aws_iam_role - - role: aws/aws_acl + # - role: aws/aws_acl - role: aws/aws_cloudwatch_log_group - role: aws/aws_backup - role: aws/aws_backup_sns From ac3b80bc5d76a6b871bab0b5923e29f500f8e1e0 Mon Sep 17 00:00:00 2001 From: tim Date: Tue, 22 Apr 2025 04:50:41 +0300 Subject: [PATCH 4/4] fix typo --- roles/debian/gitlab/templates/gitlab.rb.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/debian/gitlab/templates/gitlab.rb.j2 b/roles/debian/gitlab/templates/gitlab.rb.j2 index b31c6f6d3..4740d2639 100644 --- a/roles/debian/gitlab/templates/gitlab.rb.j2 +++ b/roles/debian/gitlab/templates/gitlab.rb.j2 @@ -48,7 +48,7 @@ external_url 'https://{{ gitlab.server_name }}' ##! Docs: https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/settings/gitlab.yml.md ################################################################################ {% if (gitlab.ssh_url | length > 0) %} -gitlab_rails['gitlab_ssh_host'] = {{ gitlab.ssh_url }}" +gitlab_rails['gitlab_ssh_host'] = '{{ gitlab.ssh_url }}' {% else %} # gitlab_rails['gitlab_ssh_host'] = 'ssh.host_example.com' {% endif %}