tixie/nixcfg
1
0
Fork 0
forked from Deuxfleurs/nixcfg
Code Pull requests Activity

tiny progress on nextcloud but still bad

Browse source
This commit is contained in:
Alex 2022-02-27 20:21:55 +01:00
parent 02ed668286
commit 3b90fd15db
Signed by untrusted user: lx
GPG key ID: 0E496D15096376BE
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/bad.nextcloud/deploy/nextcloud.hcl
View file

@ -37,6 +37,7 @@ job "nextcloud" {
"secrets/litestream.yml:/etc/litestream.yml" "secrets/litestream.yml:/etc/litestream.yml"
] ]
} }
user = "33"
template { template {
data = file("../config/litestream.yml") data = file("../config/litestream.yml")
@ -54,19 +55,24 @@ job "nextcloud" {
config { config {
image = "nextcloud:22.2.3-apache" image = "nextcloud:22.2.3-apache"
ports = [ "http" ] ports = [ "http" ]
#entrypoint = [ "/bin/sh", "-c" ]
#command = "apache2-foreground"
volumes = [ volumes = [
"../alloc/data:/ephemeral", "../alloc/data:/var/www/html/data",
] ]
} }
user = "33"
template { template {
data = <<EOH data = <<EOH
SQLITE_DATABASE=/ephemeral/nextcloud.db SQLITE_DATABASE=nextcloud
NEXTCLOUD_ADMIN_USER={{ key "secrets/nextcloud/admin_user" }} NEXTCLOUD_ADMIN_USER={{ key "secrets/nextcloud/admin_user" }}
NEXTCLOUD_ADMIN_PASSWORD={{ key "secrets/nextcloud/admin_pass" }} NEXTCLOUD_ADMIN_PASSWORD={{ key "secrets/nextcloud/admin_pass" }}
NEXTCLOUD_TRUSTED_DOMAINS=cloud.home.adnab.me 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_PORT=3990
OBJECTSTORE_S3_BUCKET=nextcloud-data OBJECTSTORE_S3_BUCKET=nextcloud-data
OBJECTSTORE_S3_KEY={{ key "secrets/nextcloud/s3_access_key" }} OBJECTSTORE_S3_KEY={{ key "secrets/nextcloud/s3_access_key" }}
@ -90,10 +96,15 @@ EOH
"tricot cloud.home.adnab.me 100", "tricot cloud.home.adnab.me 100",
] ]
check { check {
type = "http" type = "tcp"
path = "/" port = "http"
interval = "10s" interval = "60s"
timeout = "2s" timeout = "5s"
check_restart {
limit = 3
grace = "90s"
ignore_warnings = false
}
} }
} }
} }
@ -110,6 +121,7 @@ EOH
"secrets/litestream.yml:/etc/litestream.yml" "secrets/litestream.yml:/etc/litestream.yml"
] ]
} }
user = "33"
template { template {
data = file("../config/litestream.yml") data = file("../config/litestream.yml")

4
app/frontend/deploy/frontend-tricot.hcl
View file

@ -13,7 +13,7 @@ job "frontend" {
driver = "docker" driver = "docker"
config { config {
image = "lxpz/amd64_tricot:34" image = "lxpz/amd64_tricot:36"
network_mode = "host" network_mode = "host"
readonly_rootfs = true readonly_rootfs = true
ports = [ "http_port", "https_port" ] 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_CA_CERT=/etc/tricot/consul-ca.crt
TRICOT_CONSUL_CLIENT_CERT=/etc/tricot/consul-client.crt TRICOT_CONSUL_CLIENT_CERT=/etc/tricot/consul-client.crt
TRICOT_CONSUL_CLIENT_KEY=/etc/tricot/consul-client.key TRICOT_CONSUL_CLIENT_KEY=/etc/tricot/consul-client.key
RUST_LOG=tricot=debug RUST_LOG=tricot=trace
EOH EOH
destination = "secrets/env" destination = "secrets/env"
env = true env = true