diff --git a/roles/dendrite/defaults/main.yml b/roles/dendrite/defaults/main.yml index 224228e..219a9c9 100644 --- a/roles/dendrite/defaults/main.yml +++ b/roles/dendrite/defaults/main.yml @@ -41,9 +41,9 @@ dendrite_vhost_letsencrypt_key: '{{ letsencrypt_keys[0] | default(omit) }}' # NOTE: version should be tests in gitlab pipeline # SEE https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/workhorse.gitlab-ci.yml#L30 # https://go.dev/dl/ -> linux-amd64.tar.gz -dendrite_go_version: '1.21.12' +dendrite_go_version: '1.22.5' # linux-arm64.tar.gz -dendrite_go_sha256_checksum: 94cb3ec4a1e08a00da55c33e63f725be91f10ba743907b5615ef34e54675ba2e +dendrite_go_sha256_checksum: 8d21325bfcf431be3660527c1a39d3d9ad71535fabdf5041c826e44e31642b5a dendrite_with_validation: true dendrite_remove: false diff --git a/roles/gitlab/defaults/main.yml b/roles/gitlab/defaults/main.yml index 12aa7a0..bd4b421 100644 --- a/roles/gitlab/defaults/main.yml +++ b/roles/gitlab/defaults/main.yml @@ -16,7 +16,7 @@ gitlab_with_zsh: true gitlab_omniauth_enabled: false gitlab_omniauth_providers: [] -gitlab_repository_version: '17-1-stable' +gitlab_repository_version: '17-2-stable' gitlab_ce_version: '{{ gitlab_repository_version }}' gitlab_ee_version: '{{ gitlab_repository_version }}-ee' gitlab_path: "{{ gitlab_home }}/gitlab" @@ -55,7 +55,7 @@ gitlab_node_env: production gitlab_node_options: '--max-old-space-size=6144' gitlab_node_prefix: "{{ npm_config_prefix | default('/usr/local/lib/npm') }}" -gitlab_nodejs_version: '18.x' +gitlab_nodejs_version: '20.x' gitlab_nodejs_install_npm_user: git gitlab_nodejs_npm_global_packages: - name: yarn @@ -175,8 +175,8 @@ gitlab_packages: # NOTE: version should be tests in gitlab pipeline # SEE https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/ci/workhorse.gitlab-ci.yml#L30 # https://go.dev/dl/ -> linux-amd64.tar.gz -gitlab_go_version: '1.21.12' -gitlab_go_sha256_checksum: 121ab58632787e18ae0caa8ae285b581f9470d0f6b3defde9e1600e211f583c5 +gitlab_go_version: '1.22.5' +gitlab_go_sha256_checksum: 904b924d435eaea086515bc63235b192ea441bd8c9b198c507e85009e6e4c7f0 gitlab_nginx_auth_realm: 'Code access is restricted' gitlab_nginx_client_max_body_size: '0' diff --git a/roles/gitlab/templates/gitlab/gitlab.yml.j2 b/roles/gitlab/templates/gitlab/gitlab.yml.j2 index 3070d14..18a4c49 100644 --- a/roles/gitlab/templates/gitlab/gitlab.yml.j2 +++ b/roles/gitlab/templates/gitlab/gitlab.yml.j2 @@ -115,6 +115,15 @@ production: &base # # + ## Custom html header tags + # In some cases some custom header tags are needed + # e.g., to add the EU cookie consent + # Tip: you must add the externals source to the content_security_policy as + # well, typically the script_src and style_src. + # custom_html_header_tags: | + # + # + ## Automatic issue closing # If a commit message matches this regular expression, all issues referenced from the matched text will be closed. # This happens when the commit is pushed or merged into the default branch of a project. @@ -528,6 +537,10 @@ production: &base ci_runners_stale_machines_cleanup_worker: cron: "36 * * * *" + # Periodically queue syncing of finished pipelines from p_ci_finished_pipeline_ch_sync_events to ClickHouse + ci_click_house_finished_pipelines_sync_worker: + cron: "*/4 * * * *" + registry: # enabled: true # host: registry.example.com