From 104fb3379f344ec975465c8b9adb97ac3eb8ba73 Mon Sep 17 00:00:00 2001 From: Ronard <87770895+ronardcaktus@users.noreply.github.com> Date: Thu, 2 Nov 2023 09:38:03 -0400 Subject: [PATCH 1/5] Merge pull request #275 from caktus/max-requests Avoid Memory Leaks [No ClickUp ticket] --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 5132f141..8ebfe481 100644 --- a/Dockerfile +++ b/Dockerfile @@ -85,6 +85,9 @@ ENV UWSGI_HTTP=:8000 UWSGI_MASTER=1 UWSGI_HTTP_AUTO_CHUNKED=1 UWSGI_HTTP_KEEPALI # Number of uWSGI workers and threads per worker (customize as needed): ENV UWSGI_WORKERS=2 UWSGI_THREADS=4 +# Reload workers after the specified amount of managed requests (avoid memory leaks) +ENV UWSGI_MAX_REQUESTS=1000 + # uWSGI static file serving configuration (customize or comment out if not needed): ENV UWSGI_STATIC_MAP="/static/=/code/static/" UWSGI_STATIC_EXPIRES_URI="/static/.*\.[a-f0-9]{12,}\.(css|js|png|jpg|jpeg|gif|ico|woff|ttf|otf|svg|scss|map|txt) 315360000" From b4de33a96be409cd5031403755d343d58cc07343 Mon Sep 17 00:00:00 2001 From: ronardcaktus Date: Thu, 24 Oct 2024 11:51:02 -0400 Subject: [PATCH 2/5] Update Azure SSO client secret --- deploy/group_vars/all.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/deploy/group_vars/all.yml b/deploy/group_vars/all.yml index 9c483ae7..d072bd67 100644 --- a/deploy/group_vars/all.yml +++ b/deploy/group_vars/all.yml @@ -171,13 +171,13 @@ env_email_host_pass: !vault | azure_client_id: "f0629cf8-f6f4-4142-94c3-11b8beaaa510" azure_tenant_id: "2046864f-68ea-497d-af34-a6629a6cd700" azure_client_secret: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 34653665623939373232343266393962386662373738363135313965636461303362656235353739 - 3833373532646436326463663233616238316431306633330a333664363061313630646565613465 - 34393634623231333964346166306639613438623330343865663066643239383634633538613130 - 3234326436376638370a353262656662656334653234666565313032333237353135336132636136 - 33613062323365303165663261356138616634656331373037363031326161383832333662333266 - 6339636266626239303165666261353362626564363636346665 + $ANSIBLE_VAULT;1.1;AES256 + 33333338343036366530346164376430303132653031376264346232383330373730303633623461 + 6662636633373131333362623766346361383533303936340a323336626262653465303733363539 + 35333463623633663836303831663935346234356466626430346639623766383133336664346436 + 3038646535623434390a393965643933373536316264373264303561653063656662373962626136 + 31363866616161303761353436323864383965393763616565626162653936616638626166323738 + 6164633165343265323665336532303538613133653764366231 k8s_environment_variables: DATABASE_URL: "{{ env_database_url }}" From ab9428cc10209bfba04585de3122c8fa10e847b7 Mon Sep 17 00:00:00 2001 From: ronardcaktus Date: Thu, 24 Oct 2024 17:11:30 -0400 Subject: [PATCH 3/5] Add updated secret to production.yml --- deploy/group_vars/all.yml | 14 +++++++------- deploy/host_vars/production.yml | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/deploy/group_vars/all.yml b/deploy/group_vars/all.yml index d072bd67..d566699b 100644 --- a/deploy/group_vars/all.yml +++ b/deploy/group_vars/all.yml @@ -171,13 +171,13 @@ env_email_host_pass: !vault | azure_client_id: "f0629cf8-f6f4-4142-94c3-11b8beaaa510" azure_tenant_id: "2046864f-68ea-497d-af34-a6629a6cd700" azure_client_secret: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 33333338343036366530346164376430303132653031376264346232383330373730303633623461 - 6662636633373131333362623766346361383533303936340a323336626262653465303733363539 - 35333463623633663836303831663935346234356466626430346639623766383133336664346436 - 3038646535623434390a393965643933373536316264373264303561653063656662373962626136 - 31363866616161303761353436323864383965393763616565626162653936616638626166323738 - 6164633165343265323665336532303538613133653764366231 + $ANSIBLE_VAULT;1.1;AES256 + 33333338343036366530346164376430303132653031376264346232383330373730303633623461 + 6662636633373131333362623766346361383533303936340a323336626262653465303733363539 + 35333463623633663836303831663935346234356466626430346639623766383133336664346436 + 3038646535623434390a393965643933373536316264373264303561653063656662373962626136 + 31363866616161303761353436323864383965393763616565626162653936616638626166323738 + 6164633165343265323665336532303538613133653764366231 k8s_environment_variables: DATABASE_URL: "{{ env_database_url }}" diff --git a/deploy/host_vars/production.yml b/deploy/host_vars/production.yml index ae1de58d..b208a233 100644 --- a/deploy/host_vars/production.yml +++ b/deploy/host_vars/production.yml @@ -70,12 +70,12 @@ database_password: !vault | azure_client_id: "39459c9f-77b3-4fae-942c-7ef9fbf1332c" azure_client_secret: !vault | $ANSIBLE_VAULT;1.1;AES256 - 62383037633362323633303630383031306666613239653333353735653662633265316635346135 - 3439326633363038333432666238396364386165383932320a653231323632393839313966306165 - 66633866646436366264336462636264383232386366636132343337363163343236306661316138 - 3664656261353362630a613966313138373630333935323863376565386364353733343566646639 - 38363430336432343538616536643963613434663734626565626563343764373231653561636364 - 6465343637323033386364356634356132353364336235663264 + 33333338343036366530346164376430303132653031376264346232383330373730303633623461 + 6662636633373131333362623766346361383533303936340a323336626262653465303733363539 + 35333463623633663836303831663935346234356466626430346639623766383133336664346436 + 3038646535623434390a393965643933373536316264373264303561653063656662373962626136 + 31363866616161303761353436323864383965393763616565626162653936616638626166323738 + 6164633165343265323665336532303538613133653764366231 env_django_secret_key: !vault | $ANSIBLE_VAULT;1.1;AES256 From 57d6bcbf93b2a6b1b6c414b7c16b99901ca237f4 Mon Sep 17 00:00:00 2001 From: ronardcaktus Date: Tue, 29 Oct 2024 14:37:39 -0400 Subject: [PATCH 4/5] Update azure_client_id --- deploy/group_vars/all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/group_vars/all.yml b/deploy/group_vars/all.yml index d566699b..a8784c7e 100644 --- a/deploy/group_vars/all.yml +++ b/deploy/group_vars/all.yml @@ -168,7 +168,7 @@ env_email_host_pass: !vault | 3561616461636134373033316665613035303736646133613630 # Azure SSO settings -azure_client_id: "f0629cf8-f6f4-4142-94c3-11b8beaaa510" +azure_client_id: "39459c9f-77b3-4fae-942c-7ef9fbf1332c" azure_tenant_id: "2046864f-68ea-497d-af34-a6629a6cd700" azure_client_secret: !vault | $ANSIBLE_VAULT;1.1;AES256 From 6027f817785c077c346e9616c5d3bf0a6a958f82 Mon Sep 17 00:00:00 2001 From: ronardcaktus Date: Mon, 4 Nov 2024 15:28:29 -0500 Subject: [PATCH 5/5] Update with valid secret --- deploy/group_vars/all.yml | 12 ++++++------ deploy/host_vars/production.yml | 10 ---------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/deploy/group_vars/all.yml b/deploy/group_vars/all.yml index a8784c7e..bcdc7365 100644 --- a/deploy/group_vars/all.yml +++ b/deploy/group_vars/all.yml @@ -172,12 +172,12 @@ azure_client_id: "39459c9f-77b3-4fae-942c-7ef9fbf1332c" azure_tenant_id: "2046864f-68ea-497d-af34-a6629a6cd700" azure_client_secret: !vault | $ANSIBLE_VAULT;1.1;AES256 - 33333338343036366530346164376430303132653031376264346232383330373730303633623461 - 6662636633373131333362623766346361383533303936340a323336626262653465303733363539 - 35333463623633663836303831663935346234356466626430346639623766383133336664346436 - 3038646535623434390a393965643933373536316264373264303561653063656662373962626136 - 31363866616161303761353436323864383965393763616565626162653936616638626166323738 - 6164633165343265323665336532303538613133653764366231 + 66326536666564323330643461346239313738623566666633303934376132393739373862313463 + 6331336437353664366661316631626262643031343736300a313963366537353861633330646463 + 34396633643138313063326434323732343934383535636530646164323930356433666431396362 + 3638303539323239380a333865663734336261343066313361343435376163326661366630633463 + 31343965633836653436653465323438626262333565303034336237646665393661626362333766 + 3130326232336638373737356261616530373138666465653137 k8s_environment_variables: DATABASE_URL: "{{ env_database_url }}" diff --git a/deploy/host_vars/production.yml b/deploy/host_vars/production.yml index b208a233..d68abe14 100644 --- a/deploy/host_vars/production.yml +++ b/deploy/host_vars/production.yml @@ -67,16 +67,6 @@ database_password: !vault | 38653066646362323434626564333166653433663261643465356538386265353239336131633061 3236316135343961646363316531383661623336623564336637 -azure_client_id: "39459c9f-77b3-4fae-942c-7ef9fbf1332c" -azure_client_secret: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 33333338343036366530346164376430303132653031376264346232383330373730303633623461 - 6662636633373131333362623766346361383533303936340a323336626262653465303733363539 - 35333463623633663836303831663935346234356466626430346639623766383133336664346436 - 3038646535623434390a393965643933373536316264373264303561653063656662373962626136 - 31363866616161303761353436323864383965393763616565626162653936616638626166323738 - 6164633165343265323665336532303538613133653764366231 - env_django_secret_key: !vault | $ANSIBLE_VAULT;1.1;AES256 63323239653538366637613837333237633038383531396663616236663436363431306234623962