Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix DJANGO_DISABLE_SERVER_SIDE_CURSORS env var evaluation #320

Merged
merged 1 commit into from
Nov 13, 2024
Merged

Fix DJANGO_DISABLE_SERVER_SIDE_CURSORS env var evaluation #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions {{cookiecutter.project_dirname}}/terraform/digitalocean-k8s/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,21 +65,22 @@ module "deployment" {

media_storage = var.media_storage

cache_url = var.cache_url
django_additional_allowed_hosts = var.django_additional_allowed_hosts
django_admins = var.django_admins
django_default_from_email = var.django_default_from_email
django_server_email = var.django_server_email
email_url = var.email_url
s3_access_id = var.s3_access_id
s3_bucket_name = var.s3_bucket_name
s3_file_overwrite = var.s3_file_overwrite
s3_host = var.s3_host
s3_region = var.s3_region
s3_secret_key = var.s3_secret_key
sentry_dsn = var.sentry_dsn
use_redis = var.use_redis
web_concurrency = var.web_concurrency
cache_url = var.cache_url
django_additional_allowed_hosts = var.django_additional_allowed_hosts
django_admins = var.django_admins
django_default_from_email = var.django_default_from_email
django_disable_server_side_cursors = var.django_disable_server_side_cursors
django_server_email = var.django_server_email
email_url = var.email_url
s3_access_id = var.s3_access_id
s3_bucket_name = var.s3_bucket_name
s3_file_overwrite = var.s3_file_overwrite
s3_host = var.s3_host
s3_region = var.s3_region
s3_secret_key = var.s3_secret_key
sentry_dsn = var.sentry_dsn
use_redis = var.use_redis
web_concurrency = var.web_concurrency

extra_config_values = var.extra_config_values
extra_secret_values = var.extra_secret_values
Expand Down
6 changes: 6 additions & 0 deletions {{cookiecutter.project_dirname}}/terraform/digitalocean-k8s/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ variable "django_default_from_email" {
default = ""
}

variable "django_disable_server_side_cursors" {
type = string
description = "The value of the DJANGO_DISABLE_SERVER_SIDE_CURSORS environment variable."
default = "False"
}

variable "django_server_email" {
type = string
description = "The value of the DJANGO_SERVER_EMAIL environment variable."
Expand Down
1 change: 0 additions & 1 deletion {{cookiecutter.project_dirname}}/terraform/modules/kubernetes/deployment/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ variable "django_default_from_email" {
variable "django_disable_server_side_cursors" {
type = string
description = "The value of the DJANGO_DISABLE_SERVER_SIDE_CURSORS environment variable."
default = "False"
}

variable "django_server_email" {
Expand Down
31 changes: 16 additions & 15 deletions {{cookiecutter.project_dirname}}/terraform/other-k8s/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,21 +93,22 @@ module "deployment" {

media_persistent_volume_claim_name = var.media_storage == "local" ? kubernetes_persistent_volume_claim_v1.media[0].metadata[0].name : ""

cache_url = var.cache_url
django_additional_allowed_hosts = var.django_additional_allowed_hosts
django_admins = var.django_admins
django_default_from_email = var.django_default_from_email
django_server_email = var.django_server_email
email_url = var.email_url
s3_access_id = var.s3_access_id
s3_bucket_name = var.s3_bucket_name
s3_file_overwrite = var.s3_file_overwrite
s3_host = var.s3_host
s3_region = var.s3_region
s3_secret_key = var.s3_secret_key
sentry_dsn = var.sentry_dsn
use_redis = var.use_redis
web_concurrency = var.web_concurrency
cache_url = var.cache_url
django_additional_allowed_hosts = var.django_additional_allowed_hosts
django_admins = var.django_admins
django_default_from_email = var.django_default_from_email
django_disable_server_side_cursors = var.django_disable_server_side_cursors
django_server_email = var.django_server_email
email_url = var.email_url
s3_access_id = var.s3_access_id
s3_bucket_name = var.s3_bucket_name
s3_file_overwrite = var.s3_file_overwrite
s3_host = var.s3_host
s3_region = var.s3_region
s3_secret_key = var.s3_secret_key
sentry_dsn = var.sentry_dsn
use_redis = var.use_redis
web_concurrency = var.web_concurrency

extra_config_values = var.extra_config_values
extra_secret_values = var.extra_secret_values
Expand Down
6 changes: 6 additions & 0 deletions {{cookiecutter.project_dirname}}/terraform/other-k8s/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ variable "django_default_from_email" {
default = ""
}

variable "django_disable_server_side_cursors" {
type = string
description = "The value of the DJANGO_DISABLE_SERVER_SIDE_CURSORS environment variable."
default = "False"
}

variable "django_server_email" {
type = string
description = "The value of the DJANGO_SERVER_EMAIL environment variable."
Expand Down