Merge branch 'main' into fix/ssh-private-key-folder-path-condition

ls1intum · Aug 8, 2024 · a059962 · a059962
2 parents 50cdad9 + cebdb06
commit a059962
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/roles/artemis/defaults/main.yml b/roles/artemis/defaults/main.yml
@@ -144,6 +144,7 @@ artemis_external_password_reset_link_de: "https://campus.tum.de/tumonline/ee/ui/
   # localvc:
   #   url:
   #   repo_storage_base_path:
+  #   use_version_control_access_token: false
   #   ssh_key_path: /opt/artemis/ssh-keys # Key path for the SSH host keys
   # # Build Agent specific configuration: The build agent needs some sort of authentication method in order to perform clone operations.
   # # This can either be: SSH, spearate credentails, or the artemis admin user

diff --git a/roles/artemis/templates/application-prod.yml.j2 b/roles/artemis/templates/application-prod.yml.j2
@@ -178,6 +178,9 @@ artemis:
     url: {{ version_control.localvc.url }}
     local-vcs-repo-path: {{ version_control.localvc.repo_storage_base_path }}
     default-branch: {{ artemis_version_control_default_branch_name }}
+{% if version_control.localvc.use_version_control_access_token is defined %}
+    use-version-control-access-token: {{ version_control.localvc.use_version_control_access_token | lower }}
+{% endif %}
 {% if artemis_computed_is_core_node or (version_control.localvc.build_agent_git_credentials is not defined and version_control.localvc.build_agent_use_ssh is not defined) %}
     user: {{ artemis_internal_admin_user }}
     password: {{ artemis_internal_admin_password }}

diff --git a/roles/artemis/templates/artemis.env.j2 b/roles/artemis/templates/artemis.env.j2
@@ -132,6 +132,9 @@ ARTEMIS_CONTINUOUSINTEGRATION_ARTEMISAUTHENTICATIONTOKENVALUE='{{ continuous_int
 {% if version_control.localvc is defined %}
 ARTEMIS_VERSIONCONTROL_URL='{{ version_control.localvc.url }}'
 ARTEMIS_VERSIONCONTROL_LOCALVCSREPOPATH='{{ artemis_repo_basepath }}/local-vcs-repos'
+{% if version_control.localvc.use_version_control_access_token is defined %}
+ARTEMIS_VERSIONCONTROL_USEVERSIONCONTROLACCESSTOKEN='{{ version_control.localvc.use_version_control_access_token | lower }}'
+{% endif %}
 {% if artemis_computed_is_core_node or (version_control.localvc.build_agent_git_credentials is not defined and version_control.localvc.build_agent_use_ssh is not defined) %}
 ARTEMIS_VERSIONCONTROL_USER='{{ artemis_internal_admin_user }}'
 ARTEMIS_VERSIONCONTROL_PASSWORD='{{ artemis_internal_admin_password }}'