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

Jump to bottom

Minor v4.1.0 azurerm bugfixes #387

Merged
merged 12 commits into from
Sep 13, 2024
Merged

Minor v4.1.0 azurerm bugfixes #387

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8240975
add subscription id
jcma-google Sep 12, 2024
d5df3f0
add application stack
jcma-google Sep 13, 2024
eb6264a
remove
jcma-google Sep 13, 2024
2718c07
static
jcma-google Sep 13, 2024
38d5325
commit
jcma-google Sep 13, 2024
148577c
try this
jcma-google Sep 13, 2024
a66889c
mofidy
jcma-google Sep 13, 2024
1cde95b
fmt
jcma-google Sep 13, 2024
e205435
remove
jcma-google Sep 13, 2024
a6a97bf
commit
jcma-google Sep 13, 2024
52bcbfb
remove
jcma-google Sep 13, 2024
8ce6c39
add issue comment
jcma-google Sep 13, 2024
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
2 changes: 0 additions & 2 deletions cloud/azure/modules/app/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ locals {
WEBSITES_ENABLE_APP_SERVICE_STORAGE = false
PORT = 9000

DOCKER_REGISTRY_SERVER_URL = "https://index.docker.io"

DB_USERNAME = "${azurerm_postgresql_flexible_server.civiform.administrator_login}@${azurerm_postgresql_flexible_server.civiform.name}"
DB_PASSWORD = data.azurerm_key_vault_secret.postgres_password.value
DB_JDBC_STRING = "jdbc:postgresql://${azurerm_postgresql_flexible_server.civiform.name}.postgres.database.azure.com:5432/postgres?user=${azurerm_postgresql_flexible_server.civiform.administrator_login}&password=${azurerm_postgresql_flexible_server.civiform.administrator_password}&sslmode=require"
Expand Down
3 changes: 2 additions & 1 deletion cloud/azure/modules/bastion/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ resource "azurerm_public_ip" "public_ip" {
name = "${var.resource_group_name}-ip"
location = var.resource_group_location
resource_group_name = var.resource_group_name
allocation_method = "Dynamic"
# Standard SKUs (like what staging uses) requires Static allocation
allocation_method = "Static"
}
# prevent all access to the bastion's public IP address, but then in script
# set it up so that the current machine can access the public ip
Expand Down
1 change: 1 addition & 0 deletions cloud/azure/templates/azure_saml_ses/providers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
provider "azurerm" {
features {}
subscription_id = "4ef4ae1b-c966-4ac4-9b7c-a837ea410821"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(question) Is there a reason not to get this from a terraform variable and the civiform*config.sh file. I'm concerned this will get forgotten about and cause issues down the road.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried using the config variable here and it works! I didn't realize that the providers.tf could access the variables but on retrospect it makes a lot of sense.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait actually it was because I forgot to push my changes

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay it looks like the providers.tf doesn't have access to the civiform config, but maybe I'm missing something?

}