tiny progress on nextcloud but still bad
This commit is contained in:
parent
02ed668286
commit
3b90fd15db
2 changed files with 21 additions and 9 deletions
|
@ -37,6 +37,7 @@ job "nextcloud" {
|
|||
"secrets/litestream.yml:/etc/litestream.yml"
|
||||
]
|
||||
}
|
||||
user = "33"
|
||||
|
||||
template {
|
||||
data = file("../config/litestream.yml")
|
||||
|
@ -54,19 +55,24 @@ job "nextcloud" {
|
|||
config {
|
||||
image = "nextcloud:22.2.3-apache"
|
||||
ports = [ "http" ]
|
||||
#entrypoint = [ "/bin/sh", "-c" ]
|
||||
#command = "apache2-foreground"
|
||||
|
||||
volumes = [
|
||||
"../alloc/data:/ephemeral",
|
||||
"../alloc/data:/var/www/html/data",
|
||||
]
|
||||
}
|
||||
user = "33"
|
||||
|
||||
template {
|
||||
data = <<EOH
|
||||
SQLITE_DATABASE=/ephemeral/nextcloud.db
|
||||
SQLITE_DATABASE=nextcloud
|
||||
NEXTCLOUD_ADMIN_USER={{ key "secrets/nextcloud/admin_user" }}
|
||||
NEXTCLOUD_ADMIN_PASSWORD={{ key "secrets/nextcloud/admin_pass" }}
|
||||
NEXTCLOUD_TRUSTED_DOMAINS=cloud.home.adnab.me
|
||||
OBJECTSTORE_S3_HOST={{ env "node.unique.network.ip-address" }}
|
||||
OVERWRITEHOST=cloud.home.adnab.me
|
||||
OVERWRITEPROTOCOL=https
|
||||
OBJECTSTORE_S3_HOST={{ env "attr.unique.network.ip-address" }}
|
||||
OBJECTSTORE_S3_PORT=3990
|
||||
OBJECTSTORE_S3_BUCKET=nextcloud-data
|
||||
OBJECTSTORE_S3_KEY={{ key "secrets/nextcloud/s3_access_key" }}
|
||||
|
@ -90,10 +96,15 @@ EOH
|
|||
"tricot cloud.home.adnab.me 100",
|
||||
]
|
||||
check {
|
||||
type = "http"
|
||||
path = "/"
|
||||
interval = "10s"
|
||||
timeout = "2s"
|
||||
type = "tcp"
|
||||
port = "http"
|
||||
interval = "60s"
|
||||
timeout = "5s"
|
||||
check_restart {
|
||||
limit = 3
|
||||
grace = "90s"
|
||||
ignore_warnings = false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -110,6 +121,7 @@ EOH
|
|||
"secrets/litestream.yml:/etc/litestream.yml"
|
||||
]
|
||||
}
|
||||
user = "33"
|
||||
|
||||
template {
|
||||
data = file("../config/litestream.yml")
|
||||
|
|
|
@ -13,7 +13,7 @@ job "frontend" {
|
|||
driver = "docker"
|
||||
|
||||
config {
|
||||
image = "lxpz/amd64_tricot:34"
|
||||
image = "lxpz/amd64_tricot:36"
|
||||
network_mode = "host"
|
||||
readonly_rootfs = true
|
||||
ports = [ "http_port", "https_port" ]
|
||||
|
@ -58,7 +58,7 @@ TRICOT_CONSUL_HOST=https://localhost:8501
|
|||
TRICOT_CONSUL_CA_CERT=/etc/tricot/consul-ca.crt
|
||||
TRICOT_CONSUL_CLIENT_CERT=/etc/tricot/consul-client.crt
|
||||
TRICOT_CONSUL_CLIENT_KEY=/etc/tricot/consul-client.key
|
||||
RUST_LOG=tricot=debug
|
||||
RUST_LOG=tricot=trace
|
||||
EOH
|
||||
destination = "secrets/env"
|
||||
env = true
|
||||
|
|
Loading…
Reference in a new issue