Merge branch 'main' into add-demo-etherpad

SURFscz · Feb 9, 2024 · b607d7e · b607d7e
2 parents 1454d7b + 48194a5
commit b607d7e
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 1 deletion.
diff --git a/environments/ci/group_vars/all.yml b/environments/ci/group_vars/all.yml
@@ -56,6 +56,7 @@ mail:
   domain: "{{base_domain}}"
   admin_name: "Root User"
   admin_address: "root@{{base_domain}}"
+  ticket_address: "root@{{base_domain}}"
   debug_address: "root@{{base_domain}}"
 
 org:

diff --git a/environments/docker/group_vars/all.yml b/environments/docker/group_vars/all.yml
@@ -56,6 +56,7 @@ mail:
     - "{{iprange.mgnt}}"
   domain: "{{base_domain}}"
   admin_address: "root@{{base_domain}}"
+  ticket_address: "root@{{base_domain}}"
   admin_name: "Root User"
   debug_address: "root@{{base_domain}}"
 

diff --git a/environments/vm/group_vars/all.yml b/environments/vm/group_vars/all.yml
@@ -56,6 +56,7 @@ mail:
   domain: "{{base_domain}}"
   admin_address: "root@{{base_domain}}"
   admin_name: "Root User"
+  ticket_address: "root@{{base_domain}}"
   debug_address: "root@{{base_domain}}"
 
 org:

diff --git a/roles/docker_sbs/defaults/main.yml b/roles/docker_sbs/defaults/main.yml
@@ -51,6 +51,7 @@ sbs_exceptions_mail: "root@localhost"
 
 sbs_support_email: "sram-support@localhost"
 sbs_admin_email: "sram-beheer@localhost"
+sbs_ticket_email: "sram-support@surf.nl"
 sbs_eduteams_email: "eduteams@localhost"
 
 sbs_wiki_link: "https://www.example.org/wiki"

diff --git a/roles/docker_sbs/templates/config.yml.j2 b/roles/docker_sbs/templates/config.yml.j2
@@ -80,6 +80,7 @@ mail:
   suppress_sending_mails: False
   info_email: {{ sbs_support_email }}
   beheer_email: {{ sbs_admin_email }}
+  ticket_email: {{ sbs_ticket_email }}
   eduteams_email: {{ sbs_eduteams_email }}
   # Do we mail a summary of new Organizations and Services to the beheer_email?
   audit_trail_notifications_enabled: {{ sbs_audit_trail_notifications_enabled }}

diff --git a/roles/sbs/defaults/main.yml b/roles/sbs/defaults/main.yml
@@ -27,6 +27,8 @@ sbs_mail_port: "{{ mail.relay_port }}"
 sbs_file_owner: "root"
 sbs_group: "sram-sbs"
 
+sbs_backend_timeout: 30
+
 sbs_session_lifetime: 1440
 sbs_secret_key_suffix: ""
 
@@ -46,6 +48,7 @@ sbs_exceptions_mail: "root@localhost"
 
 sbs_support_email: "sram-support@localhost"
 sbs_admin_email: "sram-beheer@localhost"
+sbs_ticket_email: "sram-support@surf.nl"
 sbs_eduteams_email: "eduteams@localhost"
 
 sbs_wiki_link: "https://www.example.org/wiki"

diff --git a/roles/sbs/templates/config.yml.j2 b/roles/sbs/templates/config.yml.j2
@@ -76,6 +76,7 @@ mail:
   suppress_sending_mails: False
   info_email: {{ sbs_support_email }}
   beheer_email: {{ sbs_admin_email }}
+  ticket_email: {{ sbs_ticket_email }}
   eduteams_email: {{ sbs_eduteams_email }}
   # Do we mail a summary of new Organizations and Services to the beheer_email?
   audit_trail_notifications_enabled: {{ sbs_audit_trail_notifications_enabled }}

diff --git a/roles/sbs/templates/sbs.service.j2 b/roles/sbs/templates/sbs.service.j2
@@ -26,7 +26,7 @@ Environment="PROFILE=log_to_stdout"
 Environment="REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt"
 
 Type=notify
-ExecStart={{sbs_env_dir}}/bin/gunicorn --worker-class eventlet --workers {{sbs_num_workers}} --bind 127.0.0.1:8080 server.__main__:app
+ExecStart={{sbs_env_dir}}/bin/gunicorn --worker-class eventlet --workers {{sbs_num_workers}} --timeout {{sbs_backend_timeout}} --bind 127.0.0.1:8080 server.__main__:app
 
 Restart=on-failure
 RestartSec=10