Merge

ls1intum · Feb 21, 2024 · d069591 · d069591
2 parents ec99eab + ae5497a
commit d069591
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 5 deletions.
diff --git a/roles/artemis/defaults/main.yml b/roles/artemis/defaults/main.yml
@@ -211,6 +211,13 @@ artemis_eureka_instance_id: "{{ node_id }}"
 #  url:
 #  secret:
 
+##############################################################################
+# Aeolus Configuration
+##############################################################################
+#aeolus:
+#  url:
+#  token:
+
 ##############################################################################
 # Auto-generated Variables - No not alter!
 ##############################################################################
@@ -226,9 +233,10 @@ artemis_spring_profile_apollon: "{% if apollon_url is defined and apollon_url is
 artemis_spring_profile_scheduling: "{% if node_id is defined and node_id == 1 %},scheduling{% endif %}"
 artemis_spring_profile_docker: "{% if use_docker %},docker{% endif %}"
 artemis_spring_profile_iris: "{% if iris is defined and iris is not none %},iris{% endif %}"
+artemis_spring_profile_aeolus: "{% if aeolus is defined and aeolus is not none %},aeolus{% endif %}"
 artemis_spring_profile_lti: "{% if lti.oauth_secret is defined and lti.oauth_secret is not none %},lti{% endif %}"
 
-artemis_spring_profile_core: "{% if not (continuous_integration.localci is defined and continuous_integration.localci is not none) or (continuous_integration.localci.is_core_node is defined and continuous_integration.localci.is_core_node) %},core{{ artemis_spring_profile_user_management }}{{ artemis_spring_profile_ldap }}{{ artemis_spring_profile_version_control }}{{ artemis_spring_profile_continuous_integration }}{{ artemis_spring_profile_athena }}{{ artemis_spring_profile_scheduling }}{{ artemis_spring_profile_docker }}{{ artemis_spring_profile_iris }}{{ artemis_spring_profile_lti }}{% endif %}"
+artemis_spring_profile_core: "{% if not (continuous_integration.localci is defined and continuous_integration.localci is not none) or (continuous_integration.localci.is_core_node is defined and continuous_integration.localci.is_core_node) %},core{{ artemis_spring_profile_user_management }}{{ artemis_spring_profile_ldap }}{{ artemis_spring_profile_version_control }}{{ artemis_spring_profile_continuous_integration }}{{ artemis_spring_profile_athena }}{{ artemis_spring_profile_scheduling }}{{ artemis_spring_profile_docker }}{{ artemis_spring_profile_iris }}{{ artemis_spring_profile_aeolus }}{{ artemis_spring_profile_lti }}{% endif %}"
 artemis_spring_profile_buildagent: "{% if continuous_integration.localci is defined and continuous_integration.localci is not none %}{% if continuous_integration.localci.is_build_agent is defined and continuous_integration.localci.is_build_agent is not none and continuous_integration.localci.is_build_agent %},buildagent{% endif %}{% endif %}"
 
 artemis_spring_profiles: "{{ artemis_spring_profile_env }}{{ artemis_spring_profile_core }}{{ artemis_spring_profile_buildagent }}"
diff --git a/roles/artemis/templates/application-prod.yml.j2 b/roles/artemis/templates/application-prod.yml.j2
@@ -247,6 +247,14 @@ artemis:
     secret-token: {{ iris.secret }}
 {% endif %}
 
+{% if aeolus.url is defined and aeolus.url is not none %}
+aeolus:
+  url: {{ aeolus.url }}
+{% if aeolus.token is defined and aeolus.token is not none %}
+  token: {{ aeolus.token }}
+{% endif %}
+{% endif %}
+
 jhipster:
 
 {% if artemis_jhipster_jwt is not none %}

diff --git a/roles/artemis/templates/artemis.env.j2 b/roles/artemis/templates/artemis.env.j2
@@ -181,6 +181,12 @@ ARTEMIS_APOLLON_CONVERSIONSERVICEURL='{{ apollon_url }}'
 ARTEMIS_IRIS_URL='{{ iris.url }}'
 ARTEMIS_IRIS_SECRETTOKEN='{{ iris.secret }}'
 {% endif %}
+{% if aeolus.url is defined and aeolus.url is not none %}
+AEOLUS_URL='{{ aeolus.url }}'
+{% if aeolus.token is defined and aeolus.token is not none %}
+AEOLUS_TOKEN='{{ aeolus.token }}'
+{% endif %}
+{% endif %}
 ARTEMIS_SCHEDULING_DATAEXPORTCREATIONTIME = '{{ artemis_scheduling_data_export_creation_time }}'
 ARTEMIS_SCHEDULING_PROGRAMMINGEXERCISESCLEANUPTIME = '{{ artemis_scheduling_programming_exercises_cleanup_time }}'
 ARTEMIS_SCHEDULING_CONTINUOUSPLAGIARISMCONTROLTRIGGERTIME = '{{ artemis_scheduling_continuous_plagiarism_control_trigger_time }}'

diff --git a/roles/db_backup/README.md b/roles/db_backup/README.md
@@ -1,6 +1,6 @@
 # DB Backup 
 
-This role adds an cron job to the db host which creates regular DB backups.
+This role adds a cron job to the db host which creates regular DB backups.
 
 ## Configuration 
 The default configuration will create a DB backup every day at 4:30: 

diff --git a/roles/gitlab/README.md b/roles/gitlab/README.md
@@ -1,7 +1,7 @@
 Role Name
 =========
 
-This role installes GitLab inside a Docker container for the use with artemis.
+This role installs GitLab inside a Docker container for the use with artemis.
 
 Role Variables
 --------------

diff --git a/roles/jenkins/README.md b/roles/jenkins/README.md
@@ -1,7 +1,7 @@
 Role Name
 =========
 
-This role installes Jenkins inside a Docker container for the use with artemis.
+This role installs Jenkins inside a Docker container for the use with artemis.
 
 Role Variables
 --------------

diff --git a/roles/wireguard/README.md b/roles/wireguard/README.md
@@ -1,7 +1,7 @@
 Role Name
 =========
 
-This role creates a wireguard VPN between a group of servers. Each server in the host group can connecto to each other node.
+This role creates a wireguard VPN between a group of servers. Each server in the host group can connect to each other node.
 
 Role Variables
 --------------