Skip to content

Make module work again #34

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

Open
frank-bee wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Make module work again #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4d686b2
Update main.tf
frank-bee Feb 28, 2025
c9fd361
Update main.tf
frank-bee Feb 28, 2025
5fe2a66
Update main.tf
frank-bee Feb 28, 2025
3927a1f
Update locals.tf
frank-bee Feb 28, 2025
37e20eb
Update locals.tf
frank-bee Feb 28, 2025
dcdd199
download modules from github
frank-bee Mar 19, 2025
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
3 changes: 1 addition & 2 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ module "atlantis_repo_config" {
}

module "azure_container_group" {
source = "getindata/container-group/azurerm"
version = "3.1.1"
source = "../terraform-azurerm-container-group"

context = module.this.context

Expand Down
8 changes: 5 additions & 3 deletions modules/caddy-automatic-https/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ locals {

atlantis_port = try(var.atlantis_container.ports[0].port, 4141)

/*
caddy_persistence_storage_account = {
name = (var.caddy_persistence_storage_account == null
? module.caddy_persistence_storage_account.storage_account_name
Expand All @@ -38,6 +39,7 @@ locals {
)
share_name = var.caddy_persistence_storage_account == null ? "caddy" : var.caddy_persistence_storage_account.share_name
}
*/

caddyfile_base64_encoded = coalesce(
var.caddyfile.base64_encoded,
Expand All @@ -54,9 +56,9 @@ locals {
volumes = merge({
caddy-data = {
mount_path = "/data/caddy"
storage_account_name = local.caddy_persistence_storage_account.name
storage_account_key = local.caddy_persistence_storage_account.key
share_name = local.caddy_persistence_storage_account.share_name
storage_account_name = null // local.caddy_persistence_storage_account.name
storage_account_key = null //local.caddy_persistence_storage_account.key
share_name = null //local.caddy_persistence_storage_account.share_name
}
caddy-config = {
mount_path = "/etc/caddy"
Expand Down
4 changes: 3 additions & 1 deletion modules/caddy-automatic-https/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ data "azurerm_resource_group" "this" {
name = var.resource_group_name
}

/*
module "caddy_persistence_storage_account" {
source = "getindata/storage-account/azurerm"
version = "1.7.0"
version = "1.7.1"
context = module.this.context

enabled = var.caddy_persistence_storage_account == null
Expand All @@ -19,6 +20,7 @@ module "caddy_persistence_storage_account" {
quota = 1
}]
}
*/

module "this_atlantis" {
source = "../../"
Expand Down
Loading