🏡 index : github.com/captn3m0/nebula.git

c066e62ee0a5ee1cd3f2cfd2f07dba3f170cc7e9 [patch]

ef2bd5f8916d73d19e302ac7dc9af3b04e2ccc66

c152ec65df571babac778a27932bf5bc26efa480

c066e62ee0a5ee1cd3f2cfd2f07dba3f170cc7e9.tar.gz

Fix radicale

Diff

 gitea/data.tf             |  2 +-
 radicale/main.tf          | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------
 modules/container/main.tf |  2 ++
 modules/container/vars.tf |  4 ++++
 4 files changed, 79 insertions(+), 21 deletions(-)

diff --git a/gitea/data.tf b/gitea/data.tf
index 2035345..aa45624 100644
--- a/gitea/data.tf
+++ a/gitea/data.tf
@@ -1,7 +1,7 @@
# https://github.com/go-gitea/gitea/releases
data "docker_registry_image" "gitea" {

  # not bleeding, this is hemorrhaging edge
  name = "gitea/gitea:1.7"
  name = "gitea/gitea:1.8"
}

data "docker_registry_image" "redis" {

diff --git a/radicale/main.tf b/radicale/main.tf
index cd54c1b..1f6a6c4 100644
--- a/radicale/main.tf
+++ a/radicale/main.tf
@@ -1,12 +1,7 @@
module "image" {

  source = "../modules/image"
  image  = "tomsquest/docker-radicale:latest"
}

module "container" {

  name   = "radicale"
  source = "../modules/container"
  image  = "${module.image.image}"
  image  = "tomsquest/docker-radicale:amd64"

  web {

    expose = true
@@ -24,19 +19,76 @@
      container_path = "/config"
    },
  ]

  uploads = [

    {
      content = <<EOT

# See radicale.org/configuration/
[server]
hosts = 0.0.0.0:5232

# Max parallel connections
max_connections = 10

# Message displayed in the client when a password is needed
realm = Authentication required

[auth]

# Authentication method
# Value: none | htpasswd | remote_user | http_x_remote_user
type = htpasswd
htpasswd_filename = /config/users

[storage]
filesystem_folder = /data/collections

[logging]

# For more information about the syntax of the configuration file, see:
# http://docs.python.org/library/logging.config.html
# config = /config/logging

[headers]

# Additional HTTP headers
X-Powered-By: Allomancy
Server: Blackbox
EOT

  # uploads = [
  #   {
  #     content = "${file("${path.module}/config")}"
  #     file    = "/config/config"
  #   },
  #   {
  #     content = "${file("${path.module}/logging.conf")}"
  #     file    = "/config/logging"
  #   },
  #   {
  #     content = "${file("${path.module}/users")}"
  #     file    = "/config/users"
  #   },
  # ]
      file = "/config/config"
    },
    {
      content = <<EOT

[loggers]
keys = root

[handlers]
keys = file

[formatters]
keys = full

[logger_root]
# Change this to DEBUG or INFO for higher verbosity.
level = WARNING
handlers = file

[handler_file]
class = FileHandler
# Specify the output file here.
args = ('/var/log/radicale/log',)

formatter = full

[formatter_full]
format = %(asctime)s - [%(thread)x] %(levelname)s: %(message)s
EOT

      file = "/config/logging"
    },
    {
      content = "nemo:$2y$05$vC1WTAuKn2xuDYZ6I3ucxuPnCrtZrVKzdDHSYhqCegi97RM/pdzXW"
      file    = "/config/users"
    },
  ]
}
diff --git a/modules/container/main.tf b/modules/container/main.tf
index 6646d42..f65f864 100644
--- a/modules/container/main.tf
+++ a/modules/container/main.tf
@@ -40,6 +40,8 @@

  dns = ["${var.dns}"]

  upload = ["${var.uploads}"]

  # Look at this monstrosity
  # And then https://github.com/hashicorp/terraform/issues/12453#issuecomment-365569618
  # for why this is needed
diff --git a/modules/container/vars.tf b/modules/container/vars.tf
index 773f8d9..ac0455f 100644
--- a/modules/container/vars.tf
+++ a/modules/container/vars.tf
@@ -121,3 +121,7 @@
  description = "keep image, don't delete"
  default     = false
}

variable "uploads" {

  default = []
}