From 06835f90303b2befd357ec790d74b309145576fc Mon Sep 17 00:00:00 2001
From: Matthew Baggett <matthew@baggett.me>
Date: Sun, 2 Feb 2025 03:53:22 +0100
Subject: [PATCH] Don't use opinionated.tf while inside opinionated.tf modules.

---
 docker/socket-proxy/socket-proxy.tf          | 4 ++--
 products/forgejo/forgejo/database.tf         | 2 +-
 products/forgejo/forgejo/forgejo.tf          | 5 +++--
 products/forgejo/forgejo/inputs.tf           | 5 +++++
 products/portainer/ui/docker-socket-proxy.tf | 2 +-
 products/portainer/ui/network.tf             | 2 +-
 products/portainer/ui/ui.tf                  | 4 ++--
 products/socket-proxy/proxy.tf               | 1 -
 8 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/docker/socket-proxy/socket-proxy.tf b/docker/socket-proxy/socket-proxy.tf
index 0c2fde5..dea56cf 100644
--- a/docker/socket-proxy/socket-proxy.tf
+++ b/docker/socket-proxy/socket-proxy.tf
@@ -1,10 +1,10 @@
 module "network" {
-  source       = "github.com/matthewbaggett/terraform_modules//docker/network"
+  source       = "../../docker/network"
   network_name = "docker-socket-proxy"
   stack_name   = var.stack_name
 }
 module "service" {
-  source                = "github.com/matthewbaggett/terraform_modules//docker/service"
+  source                = "../../docker/service"
   image                 = "${var.docker_socket_proxy_image}:${var.docker_socket_proxy_version}"
   stack_name            = var.stack_name
   service_name          = var.service_name
diff --git a/products/forgejo/forgejo/database.tf b/products/forgejo/forgejo/database.tf
index e384d67..722d588 100644
--- a/products/forgejo/forgejo/database.tf
+++ b/products/forgejo/forgejo/database.tf
@@ -4,7 +4,7 @@ module "postgres" {
   placement_constraints = var.placement_constraints
   postgres_version      = "15"
   networks              = [module.forgejo_network]
-  data_persist_path     = "/fast/gitea/db"
+  data_persist_path     = var.database_storage_path
   ports = [
     {
       host      = 62800
diff --git a/products/forgejo/forgejo/forgejo.tf b/products/forgejo/forgejo/forgejo.tf
index 99a265c..0e7ee77 100644
--- a/products/forgejo/forgejo/forgejo.tf
+++ b/products/forgejo/forgejo/forgejo.tf
@@ -21,8 +21,9 @@ module "forgejo" {
     }))
   }
   mounts = merge(var.mounts, {
-    "/etc/timezone"  = "/etc/timezone",
-    "/etc/localtime" = "/etc/localtime",
+    "${var.data_storage_path}" = "/data",
+    "/etc/timezone"            = "/etc/timezone",
+    "/etc/localtime"           = "/etc/localtime",
   })
   environment_variables = {
     USER_UID = 1000
diff --git a/products/forgejo/forgejo/inputs.tf b/products/forgejo/forgejo/inputs.tf
index 6b3fd1c..1c4b6d6 100644
--- a/products/forgejo/forgejo/inputs.tf
+++ b/products/forgejo/forgejo/inputs.tf
@@ -60,6 +60,11 @@ variable "mounts" {
   description = "A map of host paths to container paths to mount. Key is Host path, Value is Container path"
 }
 
+variable "data_storage_path" {
+  type        = string
+  description = "Specify path to store the data."
+  default     = null
+}
 variable "database_storage_path" {
   type        = string
   description = "Specify path to store the database data."
diff --git a/products/portainer/ui/docker-socket-proxy.tf b/products/portainer/ui/docker-socket-proxy.tf
index 1c72e0f..2d9a391 100644
--- a/products/portainer/ui/docker-socket-proxy.tf
+++ b/products/portainer/ui/docker-socket-proxy.tf
@@ -1,5 +1,5 @@
 module "docker_socket_proxy" {
-  source     = "github.com/matthewbaggett/terraform_modules//docker/socket-proxy"
+  source     = "../../../docker/socket-proxy"
   stack_name = var.stack_name
   enable_all = true
 }
\ No newline at end of file
diff --git a/products/portainer/ui/network.tf b/products/portainer/ui/network.tf
index 33176e3..0cc5afc 100644
--- a/products/portainer/ui/network.tf
+++ b/products/portainer/ui/network.tf
@@ -1,5 +1,5 @@
 module "portainer_network" {
-  source       = "github.com/matthewbaggett/terraform_modules//docker/network"
+  source       = "../../../docker/network"
   stack_name   = var.stack_name
   network_name = "portainer"
 }
\ No newline at end of file
diff --git a/products/portainer/ui/ui.tf b/products/portainer/ui/ui.tf
index 1ef16f4..940f932 100644
--- a/products/portainer/ui/ui.tf
+++ b/products/portainer/ui/ui.tf
@@ -9,12 +9,12 @@ resource "htpasswd_password" "hash" {
   salt     = random_password.salt.result
 }
 module "vol_portainer" {
-  source      = "github.com/matthewbaggett/terraform_modules//docker//volume"
+  source      = "../../../docker//volume"
   stack_name  = var.stack_name
   volume_name = "portainer"
 }
 module "portainer" {
-  source       = "github.com/matthewbaggett/terraform_modules//docker//service"
+  source       = "../../../docker//service"
   stack_name   = var.stack_name
   service_name = "portainer"
   image        = "portainer/portainer-ce:${var.portainer_version}"
diff --git a/products/socket-proxy/proxy.tf b/products/socket-proxy/proxy.tf
index c0b6ac4..6fccb65 100644
--- a/products/socket-proxy/proxy.tf
+++ b/products/socket-proxy/proxy.tf
@@ -4,7 +4,6 @@ locals {
   command = ["socat", local.listen, local.connect]
 }
 module "socat" {
-  #source               = "github.com/matthewbaggett/terraform_modules//docker/service"
   source                = "../../docker/service"
   stack_name            = var.stack_name
   service_name          = var.service_name