Fix radicale
This commit is contained in:
parent
c152ec65df
commit
c066e62ee0
|
@ -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" {
|
||||
|
|
|
@ -40,6 +40,8 @@ resource "docker_container" "container" {
|
|||
|
||||
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
|
||||
|
|
|
@ -121,3 +121,7 @@ variable "keep_image" {
|
|||
description = "keep image, don't delete"
|
||||
default = false
|
||||
}
|
||||
|
||||
variable "uploads" {
|
||||
default = []
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
@ -25,18 +20,75 @@ module "container" {
|
|||
},
|
||||
]
|
||||
|
||||
# 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"
|
||||
# },
|
||||
# ]
|
||||
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
|
||||
|
||||
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"
|
||||
},
|
||||
]
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue